Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-29 | 19 | -11/+255 |
|\ | |||||
| * | Sqlite adapter's copy_table incorrectly attempts to recreate a primary key ↵ | Jacob Dunphy | 2009-01-29 | 3 | -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" Slagter | 2009-01-28 | 2 | -1/+11 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add array id support to Model.update_counters. [#1254 state:resolved] ↵ | Pratik Naik | 2009-01-28 | 2 | -2/+24 |
| | | | | | | | | [Carlos Júnior] | ||||
| * | Mysql#reconnect is set according to the 'reconnect' key in the connection spec. | Dov Murik | 2009-01-27 | 2 | -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 connections | Stephen Bannasch | 2009-01-26 | 7 | -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 ones | Pratik Naik | 2009-01-24 | 4 | -2/+34 |
| | | |||||
| * | Minor refactoring of validates_associated to replace #inject with #collect + ↵ | Josh Susser | 2009-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | #all? [#1686 state:committed] | ||||
| * | Merge docrails | Pratik Naik | 2009-01-18 | 6 | -61/+95 |
| | | |||||
* | | Clarified the difference between `:foreign_key` and ↵ | Karel Minarik | 2009-01-23 | 1 | -5/+7 |
| | | | | | | | | `:association_foreign_key` options in HABTM association | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-18 | 15 | -18/+112 |
|\| | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 2 | -2/+2 |
| | | |||||
| * | Fix has_and_belongs_to_many_associations tests. #1738 | Pratik Naik | 2009-01-18 | 2 | -3/+3 |
| | | |||||
| * | Cache columns for has_and_belongs_to_many associations | lukeludwig | 2009-01-17 | 3 | -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 Kozuszko | 2009-01-16 | 2 | -0/+25 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | Make belongs_to :dependent => :destroy destroy self before associated ↵ | Ben VandenBos | 2009-01-16 | 2 | -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 Koziarski | 2009-01-16 | 1 | -1/+1 |
| | | | | | | | | quote keys correctly | ||||
| * | Fixed broken after_save callback; was being called when before_create was ↵ | Michael Lovitt | 2009-01-16 | 3 | -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 Kozuszko | 2009-01-16 | 2 | -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_descendant | Xavier Noria | 2009-01-15 | 1 | -1/+2 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-14 | 11 | -87/+421 |
|\| | |||||
| * | Fix PostgreSQL unit test failures that only occur when using the old ↵ | Hongli Lai (Phusion) | 2009-01-13 | 3 | -12/+13 |
| | | | | | | | | | | | | | | | | 'postgres' driver. [#1748 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 ↵ | Cody Fauser | 2009-01-13 | 1 | -5/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Introduce transaction_joinable flag to mark that the fixtures transaction ↵ | Jeremy Kemper | 2009-01-10 | 6 | -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 savepoints | Jeremy Kemper | 2009-01-10 | 47 | -729/+1585 |
| |\ | |||||
| * \ | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-09 | 10 | -32/+88 |
| |\ \ | |||||
| * \ \ | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-03 | 49 | -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-03 | 3 | -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-03 | 2 | -7/+62 |
| | | | | | | | | | | | | | | | | | | | | documentation for nested transactions. | ||||
| * | | | | Make SQLite3 pass the unit tests for savepoints. | Hongli Lai (Phusion) | 2008-11-03 | 4 | -4/+18 |
| | | | | | |||||
| * | | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵ | Hongli Lai (Phusion) | 2008-11-03 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | transaction_test. | ||||
| * | | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵ | Hongli Lai (Phusion) | 2008-11-03 | 1 | -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-03 | 1 | -28/+39 |
| | | | | | |||||
| * | | | | Improve documentation for DatabaseStatements#transactions and ↵ | Hongli Lai (Phusion) | 2008-11-03 | 3 | -6/+74 |
| | | | | | | | | | | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions. | ||||
| * | | | | Fix assert_queries failures by ignoring savepoint sql. | Jonathan Viney | 2008-11-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix what looks like a Mysql bug with transactions, savepoints, and create table. | Jonathan Viney | 2008-11-03 | 1 | -21/+26 |
| | | | | | |||||
| * | | | | Implement savepoints. | Jonathan Viney | 2008-11-03 | 7 | -14/+185 |
| | | | | | |||||
* | | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the ↵ | Chris Kampmeier | 2009-01-11 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | adjective | ||||
* | | | | | A little copyediting of 73db43527d162fdf95665d88589f7ab6d17a17fa | Chris Kampmeier | 2009-01-11 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Add better docs for ActiveRecord::Base#attribute_for_inspect | Chris Kampmeier | 2009-01-11 | 1 | -1/+12 |
| | | | | | |||||
* | | | | | Minor changes to AR#delete/destroy docs | Pratik Naik | 2009-01-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-10 | 11 | -10/+124 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | | | | Merge commit 'fred/pullable' | Pratik Naik | 2008-12-30 | 5 | -5/+47 |
| |\ \ \ \ | |||||
| | * | | | | Fix to_sentence being used with options removed by 273c77 | Frederick Cheung | 2008-12-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵ | Roman Shterenzon | 2008-12-27 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| | * | | | | Fix :include of has_one with :primary_key option | Frederick Cheung | 2008-12-26 | 2 | -1/+17 |
| | | | | | | |||||
| | * | | | | Fix :include of has_many associations with :primary_key option | Frederick Cheung | 2008-12-26 | 3 | -2/+19 |
| | | | | | | |||||
| * | | | | | Fix named scope tests for sqlite3 [#1667 state:resolved] | Mike Gunderloy | 2008-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | | | | Add transaction check to SQLite2 adapter to fix ↵ | Mike Gunderloy | 2008-12-30 | 1 | -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/rails | David Heinemeier Hansson | 2008-12-28 | 7 | -68/+116 |
| |\ \ \ \ \ |