Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 1 | -1/+1 |
|\ | |||||
| * | Changed ActiveRecord to use new callbacks and speed up observers by only ↵ | José Valim | 2009-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 1 | -2/+14 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Revert "Assert primary key does not exist in habtm when the association is ↵ | Jeremy Kemper | 2009-09-02 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-01 | 1 | -14/+2 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Assert primary key does not exist in habtm when the association is defined, ↵ | José Valim | 2009-09-01 | 1 | -14/+2 |
| | | | | | | | | | | | | | | | | instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Use finder options as relation method names to provide more familiar | Emilio Tagua | 2009-08-18 | 1 | -5/+5 |
| | | | | | | | | | | naming. Use bang methods convention in methods that alter the relation. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-17 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb | ||||
| * | Fix test_has_many_through_polymorphic_has_one on sqlite2 [#3054 state:resolved] | Jay Pignata | 2009-08-15 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-11 | 1 | -0/+18 |
|\| | |||||
| * | Add tests for hm:t#push failures | Pratik Naik | 2009-08-11 | 1 | -0/+18 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 1 | -12/+8 |
|\| | |||||
| * | Rewrite hm:t#create tests using assert_no_difference and assert_difference | Pratik Naik | 2009-08-10 | 1 | -12/+8 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 6 | -25/+171 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | raises an exception on habtm join table inserts if join table contains a ↵ | Jaime Bellmyer | 2009-08-09 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | primary key. Caches this check to save time on subsequent inserts. [#2086 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | raises exception (ActiveRecord::ConfigurationError with message) on habtm ↵ | Jaime Bellmyer | 2009-08-09 | 1 | -0/+45 |
| | | | | | | | | | | | | association creation if join table contains a primary key Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix test dependency on taggings | Jeremy Kemper | 2009-08-09 | 1 | -1/+2 |
| | | |||||
| * | Fix that counter_cache breaks with has_many :dependent => :nullify. | Gabe da Silveira | 2009-08-09 | 2 | -3/+28 |
| | | | | | | | | | | | | [#1196 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | has_many :through create should not raise validation errors | railsbob | 2009-08-09 | 1 | -1/+28 |
| | | | | | | | | | | | | [#2934 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Allow ho:through#build when the owner is a new record [#1749 state:resolved] | Tristan Dunn | 2009-08-10 | 1 | -0/+10 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Enable has_many :through for going through a has_one association on the join ↵ | Gabe da Silveira | 2009-08-10 | 3 | -2/+14 |
| | | | | | | | | | | | | model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Removed duplicated tests [#3026 state:resolved] | Arthur Zapparoli | 2009-08-10 | 1 | -18/+0 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Make sure association conditions work with :include and :joins [#358 ↵ | Vladimir Meremyanin | 2009-08-09 | 1 | -0/+6 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Added back support for destroying an association's object by id. [#2306 ↵ | Joshua Nichols | 2009-08-09 | 1 | -0/+22 |
| | | | | | | | | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Ensure hm:t#find does not assign nil to :include [#1845 state:resolved] | railsbob | 2009-08-09 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 1 | -0/+7 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/migration.rb | ||||
| * | Ensure hm:t#create/create! throws ActiveRecord::RecordNotSaved when the ↵ | Pratik Naik | 2009-08-08 | 1 | -0/+7 |
| | | | | | | | | owner is new | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-08 | 5 | -46/+63 |
|\| | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb activerecord/test/cases/method_scoping_test.rb | ||||
| * | added :order option to find :first methods and associations as otherwise ↵ | Raimonds Simanovskis | 2009-08-06 | 5 | -46/+63 |
| | | | | | | | | | | | | | | | | Oracle tests were failing Oracle stores '' string as NULL Oracle cannot have identifiers larger than 30 characters added missing fixtures to test setup method | ||||
* | | More work on removing plain SQL from associations and use ARel instead. | Emilio Tagua | 2009-08-07 | 1 | -4/+4 |
| | | |||||
* | | Don't use local vars before testing its conditional. | Emilio Tagua | 2009-08-03 | 1 | -2/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 1 | -0/+98 |
|\| | |||||
| * | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 1 | -0/+98 |
| | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 1 | -2/+6 |
|\| | |||||
| * | Optimize <association>_ids for hm:t with belongs_to source | Pratik Naik | 2009-07-13 | 1 | -2/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 2 | -0/+12 |
|\| | |||||
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵ | Pratik Naik | 2009-07-01 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 1 | -0/+6 |
|\| | |||||
| * | Revert "Generate proper :counter_sql from :finder_sql when there is a ↵ | Yehuda Katz + Carl Lerche | 2009-06-22 | 2 | -10/+0 |
| | | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql. | ||||
| * | Generate proper :counter_sql from :finder_sql when there is a newline ↵ | Patrick Joyce | 2009-06-21 | 2 | -0/+10 |
| | | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure hm:t#create respects source associations hash conditions [#2090 ↵ | mattbauer | 2009-06-21 | 1 | -0/+6 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 2 | -3/+3 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Merge branch 'master' into active_model | Joshua Peek | 2009-05-29 | 7 | -38/+420 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb | ||||
| | * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
| * | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 2 | -0/+11 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | ||||
| * | | | Deprecate Error#on(attribute) in favour of Errors#[attribute] | Pratik Naik | 2009-03-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-26 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix eager association test related to different ordering on sqlite | Chad Woolley | 2009-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-19 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Add missing models and fixtures [#2673 state:resolved] | Emilio Tagua | 2009-05-19 | 1 | -23/+23 |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> |