aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| * Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-271-1/+1
| |
* | Sqlite adapter's copy_table incorrectly attempts to recreate a primary key ↵Jacob Dunphy2009-01-293-1/+17
| | | | | | | | | | | | | | | | | | id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key. This fix sets :id => false if there is an :id column, but it's not the primary_key. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1766 state:committed]
* | Ensure whitespaces are stripped when merging string joins. [#1297 ↵Filip H.F. "FiXato" Slagter2009-01-282-1/+11
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Add array id support to Model.update_counters. [#1254 state:resolved] ↵Pratik Naik2009-01-282-2/+24
| | | | | | | | [Carlos Júnior]
* | Mysql#reconnect is set according to the 'reconnect' key in the connection spec.Dov Murik2009-01-272-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | The 'reconenct' boolean option is read from the connection specification and is used to set the reconnect attribute of Mysql. The default is false in order not to change existing application behaviour. Also, reconnect is set AFTER real_connect is called, so its value sticks (the mysql gem sets reconnect to false inside real_connect). Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1797 state:committed]
* | Adding AR tests for JDBC connectionsStephen Bannasch2009-01-267-2/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New connections: jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb jdbcpostgresql To test you will need the native database installed (if one is required), activerecord-jdbc-adapter and the specific activerecord-jdbc<database>-adapter for the database you are testing. Run the tests like this: jruby -S rake test_jdbcmysql Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1685 state:committed]
* | Make sure inner scope conditions get a preference over the outer onesPratik Naik2009-01-244-2/+34
|/
* Minor refactoring of validates_associated to replace #inject with #collect + ↵Josh Susser2009-01-221-1/+1
| | | | | | #all? [#1686 state:committed]
* Merge docrailsPratik Naik2009-01-186-61/+95
|
* Bump up the year in MIT license filesPratik Naik2009-01-182-2/+2
|
* Fix has_and_belongs_to_many_associations tests. #1738Pratik Naik2009-01-182-3/+3
|
* Cache columns for has_and_belongs_to_many associationslukeludwig2009-01-173-3/+28
| | | | | This avoids repeatedly calling SHOW COLUMNS when the association is queried [#1738 state:committed]
* Fix dirty handling of nullable non-integer numeric columns [#1692 ↵Carlos Kozuszko2009-01-162-0/+25
| | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* Make belongs_to :dependent => :destroy destroy self before associated ↵Ben VandenBos2009-01-162-3/+4
| | | | | | | | object [#1079 state:resolved] If foreign key constraints are in place then deleteing the associated object first will cause a foreign key violation Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* Fix the AR json serialization tests to comply with the earlier change to ↵Michael Koziarski2009-01-161-1/+1
| | | | quote keys correctly
* Fixed broken after_save callback; was being called when before_create was ↵Michael Lovitt2009-01-163-5/+48
| | | | | | | canceled or before_update was canceled Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1735 state:committed]
* Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric ↵Carlos Kozuszko2009-01-162-3/+3
| | | | | | | columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1692 state:committed]
* Fix PostgreSQL unit test failures that only occur when using the old ↵Hongli Lai (Phusion)2009-01-133-12/+13
| | | | | | | | 'postgres' driver. [#1748 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 ↵Cody Fauser2009-01-131-5/+0
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Introduce transaction_joinable flag to mark that the fixtures transaction ↵Jeremy Kemper2009-01-106-47/+45
| | | | | | can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog. [#383 state:committed]
* Merge branch 'master' into savepointsJeremy Kemper2009-01-1047-729/+1585
|\
| * Merge commit 'fred/pullable'Pratik Naik2008-12-305-5/+47
| |\
| | * Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | |
| | * Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2008-12-272-1/+10
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | * Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-262-1/+17
| | |
| | * Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-263-2/+19
| | |
| * | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2008-12-301-1/+1
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2008-12-301-0/+4
| | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-287-68/+116
| |\ \
| | * | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-287-68/+116
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵Yaroslav Markin2008-12-285-1/+72
| |/ / | | | | | | | | | | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | Refactor ActiveRecord::Base#new_record? [#1647 state:committed]Yaroslav Markin2008-12-271-1/+1
| | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | ActiveRecord::Base#new_record? now returns false for existing records (was ↵Yaroslav Markin2008-12-273-2/+9
| |/ | | | | | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Preload uses exclusive scope [#643 state:resolved]Frederick Cheung2008-12-265-16/+53
| | | | | | | | | | | | | | | | | | With self referential associations, the scope for the the top level should not affect fetching of associations, for example when doing Person.male.find :all, :include => :friends we should load all of the friends for each male, not just the male friends.
| * Association preloading no longer stops if it hits a nil object [#1630 ↵Pivotal Labs2008-12-262-2/+10
| | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * ActiveRecord::QueryCache middlewareJoshua Peek2008-12-222-14/+26
| |
| * Ensure of Model#create support custom updated_at and updated_on attributes ↵Luis Hurtado2008-12-222-2/+12
| | | | | | | | | | | | [#1612 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure Model#last doesn't affects order for another finders inside the same ↵Daniel Luz2008-12-212-3/+26
| | | | | | | | | | | | scope [#1499 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix configure_dependency_for_has_many not quoting conditions properly [#1461 ↵Frederick Cheung2008-12-213-3/+17
| | | | | | | | state:resolved]
| * Use explicit order to stop test failing randomlyFrederick Cheung2008-12-211-2/+2
| |
| * Remove dead commented out code [#1467 state:resolved]Yaroslav Markin2008-12-211-1/+0
| | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Fix has many through not quoting table names [#1163 state:resolved]Karthik Krishnan2008-12-203-4/+8
| | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Add missing fixture to allow reload models test to run isolated [#1609 ↵Emilio Tagua2008-12-201-1/+3
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Merge docrailsPratik Naik2008-12-195-11/+13
| |
| * Add repair_helper.rb file I forgot in previous commit 8a92cdPratik Naik2008-12-191-0/+50
| |
| * Add a repair_helper to repair changes to the validations inside ↵Murray Steele2008-12-192-160/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | validations_test.rb [#674 state:resolved] Many of the tests in validations_test would add a new validation to models. However, only Topic was being reset with a fairly aggressive clearing of all validations. None of the other models being used however were recieving the same treatment. Now we use repair_validations(Topic) for the whole test case because most test cases use Topic and then the block form of repair_validations(<other_models>) inside any tests that use other models. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix preloading of has_one :through associations on belongs_to [#1507 ↵Matt Jones2008-12-189-6/+52
| | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Free MySQL::Result objects after a call to execute [#1416 state:resolved]Manfred Stienstra2008-12-181-4/+13
| | | | | | | | | | | | | | | | No freeing Result objects causes the MySQL driver to free result sets at undefined times, this can lead to erratic performance in your application. Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * Don't include table_name twiceFrederick Cheung2008-12-181-1/+1
| |