Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed API of NestedAttributes to take an array, or hash with index keys, ↵ | Lance Ivy | 2009-02-13 | 4 | -179/+361 |
| | | | | | | | | of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids. Signed-off-by: Michael Koziarski <michael@koziarski.com> Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> [#1892 state:committed] | ||||
* | Test jdbc adapters by default on jruby | Jeremy Kemper | 2009-02-06 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-02-05 | 14 | -14/+123 |
|\ | |||||
| * | Merge docrails along with the new guides and guides generation code | Pratik Naik | 2009-02-06 | 1 | -0/+16 |
| | | |||||
| * | Don't use weird attribute_condition methods in AR Session Store | Michael Koziarski | 2009-02-06 | 1 | -1/+1 |
| | | | | | | | | Use the hash condition for find instead. | ||||
| * | support end-exclusive ... Ranges in SQL hash condition sanitization properly | Will Bryant | 2009-02-06 | 3 | -7/+17 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1865 state:committed] | ||||
| * | Support true/false in query_attribute for calculated columns | Max Lapshin | 2009-02-06 | 3 | -0/+14 |
| | | | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fixed tests of postgresql money insertion when non-C locale | Max Lapshin | 2009-02-06 | 1 | -0/+1 |
| | | | | | | | | | | Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Also save :autosave enabled associations when #save! is used. | Eloy Duran | 2009-02-06 | 2 | -1/+35 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1877 state:committed] | ||||
| * | Nested attribute accessors should ignore new records with truthy _delete key. | Pascal Ehlert | 2009-02-06 | 2 | -2/+20 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1861 state:committed] | ||||
| * | Add ActiveRecord::Base.exists? with no args [#1817 state:committed] | Scott Taylor | 2009-02-05 | 3 | -3/+19 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Migrations: make default database connection overridable | Jeremy Kemper | 2009-02-04 | 1 | -1/+5 |
|/ | |||||
* | Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha. | Jeremy Kemper | 2009-02-03 | 12 | -613/+570 |
| | |||||
* | Mark CHANGELOGs for release | David Heinemeier Hansson | 2009-02-01 | 1 | -1/+1 |
| | |||||
* | Merge docrails | Pratik Naik | 2009-02-01 | 1 | -4/+5 |
| | |||||
* | Don't rely on the order in these tests | Michael Koziarski | 2009-02-01 | 1 | -2/+2 |
| | |||||
* | validate_length_of should use custom message if given when using in or within. | miloops | 2009-02-01 | 2 | -5/+17 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1057 state:committed] | ||||
* | Add support for nested object forms to ActiveRecord and the helpers in ↵ | Eloy Duran | 2009-02-01 | 18 | -44/+1352 |
| | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed] | ||||
* | 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 |
| | |||||
* | 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] | ||||
* | 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 '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 |
| |\ \ | |||||
| | * | | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 7 | -68/+116 |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵ | Yaroslav Markin | 2008-12-28 | 5 | -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 Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵ | Yaroslav Markin | 2008-12-27 | 3 | -2/+9 |
| |/ | | | | | | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> |