Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #6250 from iGEL/dont_destroy_readonly_models | Aaron Patterson | 2012-05-17 | 3 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't destroy readonly models | Johannes Barre | 2012-05-17 | 3 | -0/+7 | |
* | | | | | | Fix warning: ambiguous first argument. | kennyj | 2012-05-18 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6058 from RStankov/relation-from-to-accept-other-relation... | Jon Leighton | 2012-05-17 | 5 | -7/+51 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Relation#from to accept other Relation objects | Radoslav Stankov | 2012-05-17 | 5 | -7/+51 | |
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 3 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Update docs in sqlite3 adapter" | Vijay Dev | 2012-05-17 | 1 | -12/+12 | |
| * | | | | | Fix typos in docs for ActiveRecord::Core::arel_table [ci skip] | Mark Rushakoff | 2012-05-16 | 1 | -3/+1 | |
| * | | | | | Update AR has_one association example | Alexey Vakhov | 2012-05-16 | 1 | -1/+1 | |
| * | | | | | Update docs in sqlite3 adapter | Oscar Del Ben | 2012-05-15 | 1 | -12/+12 | |
| * | | | | | Revert "corrected some misspelling" | Vijay Dev | 2012-05-15 | 1 | -3/+3 | |
| * | | | | | Merge pull request #99 from GRoguelon/master | Vijay Dev | 2012-05-15 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix an error in example in methods of instanciated fixtures. | Geoffrey Roguelon | 2012-05-15 | 1 | -1/+1 | |
| * | | | | | | corrected some misspelling | Angelo capilleri | 2012-05-15 | 1 | -3/+3 | |
| * | | | | | | Fix typo [ci skip] | Peter Suschlik | 2012-05-15 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when... | Aaron Patterson | 2012-05-16 | 2 | -2/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | when using a preloaded array and the uniq flag is set then return the size of... | Jon Rowe | 2012-03-15 | 2 | -2/+12 | |
* | | | | | | | | Merge pull request #6358 from jfirebaugh/schema_define | Aaron Patterson | 2012-05-16 | 2 | -7/+17 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Call methods on the correct instance in AR::Schema.define | John Firebaugh | 2012-05-16 | 2 | -7/+17 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Fix CollectionAssociation#replace to return new target (closes #6231) | Piotr Sarnacki | 2012-05-16 | 2 | -0/+14 | |
* | | | | | | | | Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq... | Aaron Patterson | 2012-05-16 | 5 | -15/+97 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Removes NetAddr dependency | Dan McClain | 2012-05-08 | 3 | -10/+11 | |
| * | | | | | | | | Converts inet and cidr columns to NetAddr::CIDR | Dan Seaver | 2012-05-07 | 5 | -7/+48 | |
| * | | | | | | | | Adds migration and schema dump support for INET, CIDR, and MACADDR | Dan Seaver | 2012-05-05 | 3 | -7/+47 | |
* | | | | | | | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacks | Aaron Patterson | 2012-05-16 | 2 | -1/+46 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Allow manual rollbacks in after_save to reset object correctly | Mark McSpadden | 2012-03-21 | 2 | -1/+46 | |
* | | | | | | | | | assuming there is only one column, we can simplify the type cast loop | Aaron Patterson | 2012-05-16 | 1 | -7/+6 | |
* | | | | | | | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless | Aaron Patterson | 2012-05-16 | 2 | -5/+16 | |
* | | | | | | | | | Merge pull request #6136 from mhfs/sqlbypass_fixes | Aaron Patterson | 2012-05-16 | 2 | -5/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Rename test file so that the test suite matches it, implement `persisted?` fo... | Marcelo Silveira | 2012-05-16 | 2 | -5/+15 | |
* | | | | | | | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errors | Aaron Patterson | 2012-05-16 | 4 | -7/+34 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | Erich Menge | 2012-05-16 | 4 | -7/+34 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6336 from erichmenge/patch-pluck-fragment | Carlos Antonio da Silva | 2012-05-16 | 2 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column type. | Erich Menge | 2012-05-16 | 2 | -8/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Remove unneeded tests | Piotr Sarnacki | 2012-05-16 | 1 | -12/+0 | |
* | | | | | | | | | | Merge pull request #6347 from avakhov/ar-changelog-misprint | Vijay Dev | 2012-05-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix misprint in AR changelog | Alexey Vakhov | 2012-05-16 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_type | Piotr Sarnacki | 2012-05-15 | 4 | -4/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | SQLite3 doesn't actually support the 'time' type. | Erich Menge | 2012-05-15 | 4 | -4/+16 | |
| |/ / / / / / / / / | ||||||
* / / / / / / / / / | Remove useless check of adapter | Oscar Del Ben | 2012-05-15 | 1 | -4/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Remove unnecessary calls to primary_key on sqlite3_adapter | Carlos Galdino | 2012-05-15 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #6325 from kennyj/fix_5832-3 | Carlos Antonio da Silva | 2012-05-15 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove unnecessary assertions. We should only test the before_seq isn't same ... | kennyj | 2012-05-16 | 1 | -5/+1 | |
* | | | | | | | | | | Expand and improve #pluck docs | Jeremy Kemper | 2012-05-15 | 1 | -6/+27 | |
* | | | | | | | | | | Restore support for Model.pluck('sql fragment') | Jeremy Kemper | 2012-05-15 | 2 | -1/+10 | |
* | | | | | | | | | | corrected some misspelling | Angelo capilleri | 2012-05-15 | 1 | -3/+3 | |
|/ / / / / / / / / | ||||||
* | | | / / / / / | Remove extra `end` in arel_table docs. [ci skip] | Carlos Antonio da Silva | 2012-05-15 | 1 | -8/+6 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Add documentation for arel_table | Oscar Del Ben | 2012-05-14 | 1 | -0/+8 | |
* | | | | | | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 2 | -1/+13 |