aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-01-2919-11/+255
|\
| * 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
| |
* | Clarified the difference between `:foreign_key` and ↵Karel Minarik2009-01-231-5/+7
| | | | | | | | `:association_foreign_key` options in HABTM association
* | Merge commit 'mainstream/master'Pratik Naik2009-01-1815-18/+112
|\|
| * 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]
* | revised rdoc of class_of_active_record_descendantXavier Noria2009-01-151-1/+2
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-01-1411-87/+421
|\|
| * 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 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0910-32/+88
| |\ \
| * \ \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0349-481/+631
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb
| * | | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.Hongli Lai (Phusion)2008-11-033-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed compatibility with the old 'postgres' driver which doesn't support transaction state introspection. - Added unit tests for it.
| * | | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve ↵Hongli Lai (Phusion)2008-11-032-7/+62
| | | | | | | | | | | | | | | | | | | | documentation for nested transactions.
| * | | | Make SQLite3 pass the unit tests for savepoints.Hongli Lai (Phusion)2008-11-034-4/+18
| | | | |
| * | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵Hongli Lai (Phusion)2008-11-032-2/+1
| | | | | | | | | | | | | | | | | | | | transaction_test.
| * | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵Hongli Lai (Phusion)2008-11-031-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity ourselves" This commit conflicts with savepoint support. This reverts commit 045713ee240fff815edb5962b25d668512649478. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | | | Fix the final MySQL unit test failure that's related to savepoint support.Hongli Lai (Phusion)2008-11-031-28/+39
| | | | |
| * | | | Improve documentation for DatabaseStatements#transactions and ↵Hongli Lai (Phusion)2008-11-033-6/+74
| | | | | | | | | | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions.
| * | | | Fix assert_queries failures by ignoring savepoint sql.Jonathan Viney2008-11-031-1/+1
| | | | |
| * | | | Fix what looks like a Mysql bug with transactions, savepoints, and create table.Jonathan Viney2008-11-031-21/+26
| | | | |
| * | | | Implement savepoints.Jonathan Viney2008-11-037-14/+185
| | | | |
* | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the ↵Chris Kampmeier2009-01-114-7/+7
| | | | | | | | | | | | | | | | | | | | adjective
* | | | | A little copyediting of 73db43527d162fdf95665d88589f7ab6d17a17faChris Kampmeier2009-01-111-4/+5
| | | | |
* | | | | Add better docs for ActiveRecord::Base#attribute_for_inspectChris Kampmeier2009-01-111-1/+12
| | | | |
* | | | | Minor changes to AR#delete/destroy docsPratik Naik2009-01-101-2/+2
| | | | |
* | | | | Merge commit 'mainstream/master'Pratik Naik2009-01-1011-10/+124
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * | | | 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
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 03:58:27 +0000