Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix changelog conflict | rick | 2008-05-31 | 2 | -0/+26 |
|\ | |||||
| * | revert mysql test credential change | Jeremy Kemper | 2008-05-31 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-31 | 1 | -0/+6 |
| |\ | |||||
| | * | Substitute value into validates_format_of message | John D. Hume | 2008-05-31 | 1 | -0/+6 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Making ready for release of 2.1 | David Heinemeier Hansson | 2008-05-31 | 1 | -2/+2 |
| |/ | |||||
| * | Added SQL escaping for :limit and :offset [#288 state:closed] (Aaron Bedra, ↵ | David Heinemeier Hansson | 2008-05-31 | 1 | -0/+20 |
| | | | | | | | | Steven Bristol, Jonathan Wiess) | ||||
* | | Add ActiveRecord::Base.sti_name that checks ↵ | rick | 2008-05-31 | 1 | -1/+17 |
|/ | | | | ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] [#114 state:resolved] | ||||
* | belongs_to polymorphic association assignments update the foreign_id and ↵ | Tim Harper | 2008-05-31 | 1 | -1/+28 |
| | | | | | | | | | | | foreign_type fields regardless of whether the record being assigned is new or not. fixes the following scenarios: * I have validates_inclusion_of on the type field for a polymorphic belongs_to association. I assign a new record to the model's polymorphic relationship of the proper type. validation fails because the type field has not been updated. * I replace the value for a ppolymorphic association to a new record of another class. The type field still says its the previous class, and the id field points to the previous record as well. [#191 state:closed] | ||||
* | Fix default nil tests for MySQL 5.0.51 [#192 state:resolved] | Ryan Bates | 2008-05-31 | 1 | -1/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Ensure query assertion counts are the same when partial updates are enabled | Jeremy Kemper | 2008-05-30 | 2 | -0/+3 |
| | |||||
* | Ensure :select passed in options overrides the one from the scope. [#239 ↵ | Andrew White | 2008-05-29 | 1 | -0/+16 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure AssociationCollection#count works with empty condition. [#271 ↵ | Pratik Naik | 2008-05-29 | 1 | -0/+4 |
| | | | | state:resolved] [Jan De Poorter] | ||||
* | Ensure named_scope#empty? uses count query. [#262 state:resolved] | Ryan Bates | 2008-05-28 | 1 | -0/+8 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix tests for postgres 8.3.x | Tarmo Tänav | 2008-05-26 | 2 | -5/+5 |
| | | | | | | | | | Made test_with_limiting_with_custom_select not dependent on database default order. Fixed tests with non-US monetary locale. The monetary type is fixed precision so it should not expect the database to return a float. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix faulty tests introduced in 8d0b4fa39 | Michael Koziarski | 2008-05-24 | 3 | -4/+5 |
| | |||||
* | Create through associations can now work with blocks. | Ryan Bates | 2008-05-24 | 1 | -6/+9 |
| | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#248 state:resolved] | ||||
* | add failing test case for block-setting of attributes via association | Trevor Turk | 2008-05-24 | 1 | -0/+9 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Added :select option to has_one and belongs_to, remove unused :order option ↵ | josevalim | 2008-05-24 | 3 | -0/+12 |
| | | | | | | | on belongs_to. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#241 state:resolved] | ||||
* | Fix failing tests on mysql 4.1 & ruby 1.8.4. [#237 state:resolved] | Frederick Cheung | 2008-05-22 | 1 | -2/+2 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix mysql 4.1 incompatibility in the active record schema tests. | Frederick Cheung | 2008-05-22 | 1 | -32/+41 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#233 state:resolved ] | ||||
* | ActiveRecord::Base#reload should clear dirty attributes. [#231 state:resolved] | Ryan Bates | 2008-05-21 | 1 | -0/+8 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure nil to '' doesn't get recorded by dirty for nullable integer columns. ↵ | Pratik Naik | 2008-05-20 | 1 | -0/+10 |
| | | | | [#150 state:resolved] [Jason Dew, Pratik] | ||||
* | Add first/last methods to associations/named_scope. [#226 state:resolved] | Ryan Bates | 2008-05-20 | 5 | -2/+100 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure add_column gives valid error for sqlite. [Gunnar Wolf, Pratik] [#197 ↵ | Pratik Naik | 2008-05-20 | 1 | -0/+26 |
| | | | | | | | | state:resolved] SQLite#add_column executes "VACUUM", which fails if inside a live transaction. This patch ensures a valid exception is raised if add_column is executed within a live transaction for sqlite adapter. | ||||
* | Don't rely on association proxying object_id. [#225 state:resolved] | Jeremy Kemper | 2008-05-19 | 1 | -2/+2 |
| | |||||
* | Fixing test for named_scope through a has_many :through | Rodrigo Kochenburger | 2008-05-15 | 1 | -2/+2 |
| | | | | | The test that checks if a has_many :through association has access to named_scope had a typo and didn't have the proper fixtures loaded. [#190 state:resolved] | ||||
* | DRY associations code and improve eager loading tests. | Pratik Naik | 2008-05-15 | 1 | -1/+4 |
| | |||||
* | Make sure needed table joins are included :select option. [#110 state:resolved] | John Devine | 2008-05-15 | 1 | -3/+6 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Add ActiveRecord option to store the full class name on STI's type column, ↵ | Rodrigo Kochenburger | 2008-05-13 | 2 | -0/+32 |
| | | | | | | allowing one to have STI subclasses in different namespaces [#114] Signed-off-by: rick <technoweenie@gmail.com> | ||||
* | Fix tests broken by mocha absence [#186 state:resolved] | Tim Pope | 2008-05-13 | 1 | -9/+11 |
| | | | | | | | Two ActiveRecord tests depended on mocha but were not marked as such. Place them in a use_mocha block so the test suite passes. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Dirty attributes aren't cleared if save fails. [#174 state:resolved] | Xavier Noria | 2008-05-12 | 2 | -1/+22 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | When preloading group by reflection rather than by class [#125 state:resolved] | Frederick Cheung | 2008-05-11 | 1 | -0/+6 |
| | | | | | | | | This avoids extra queries when several subclasses inherit the association from their parent class, while still coping with subclasses redefining associations. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix blank conditions on AssociationCollection#find. [#104 state:resolved] | Jonathan Viney | 2008-05-11 | 1 | -1/+7 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Add test for named_scope#proxy_options. [#97 state:resolved] | Duncan Beevers | 2008-05-11 | 1 | -0/+6 |
| | |||||
* | Ensure hm:t preloading honours reflection options. [#137 state:resolved] | Frederick Cheung | 2008-05-11 | 2 | -0/+15 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Added protection against duplicate migration names (Aslak Hellesøy) [#112 ↵ | Aslak Hellesøy | 2008-05-11 | 3 | -0/+20 |
| | | | | state:resolved] | ||||
* | Fix validates_uniqueness_of for SQL keywords [#23 state:resolved] | Alex MacCaw | 2008-05-11 | 3 | -0/+14 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | ActiveRecord time zone aware attributes: blank string is treated as nil when ↵ | gbuesing | 2008-05-08 | 1 | -0/+8 |
| | | | | assigned to writer | ||||
* | Fix Time.zone.parse from stripping time zone information and make Time aware ↵ | Scott Fleckenstein | 2008-05-08 | 1 | -0/+27 |
| | | | | attribute methods use Time.zone.parse instead of to_time | ||||
* | Calling ActiveRecord#inspect on an unloaded association won't wipe the ↵ | Andreas Neuhaus | 2008-05-08 | 2 | -0/+10 |
| | | | | | | collection [#9 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | create_table :force => true no longer tries to drop a non-existing table | Tarmo Tänav | 2008-05-07 | 1 | -0/+18 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Added AbstractAdapter#table_exists? and made AbstractAdapter#table ↵ | Tarmo Tänav | 2008-05-07 | 2 | -116/+114 |
| | | | | | | implementation non-optional Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Added logic to associations.rb to make sure select_for_limited_ids | John Devine | 2008-05-06 | 1 | -0/+9 |
| | | | | | | | | | includes joins that are needed to reach tables listed in the :order or :conditions options if they are not joined directly to the main active_record table. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#109 state:resolved] | ||||
* | Ensure correct record is returned when preloading has_one where more than ↵ | Frederick Cheung | 2008-05-06 | 2 | -0/+6 |
| | | | | | | | one row exists Signed-off-by: Michael Koziarski <michael@koziarski.com> [#73 state:closed] | ||||
* | Added change_table for migrations (Jeff Dean) [#71 state:resolved] | David Heinemeier Hansson | 2008-05-03 | 1 | -1/+207 |
| | |||||
* | Fix failing associate_with_create tests inserting null first_name | Jeremy Kemper | 2008-05-01 | 1 | -3/+3 |
| | |||||
* | Added missing files | David Heinemeier Hansson | 2008-05-01 | 2 | -0/+16 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 6 | -1/+70 |
|\ | |||||
| * | Fixed AssociationsPreload such that it doesnt require foreign keys to be ↵ | David Heinemeier Hansson | 2008-04-30 | 3 | -1/+29 |
| | | | | | | | | integers (fcheung) [#33 state:resolved] | ||||
| * | Added block-setting of attributes for Base.create like Base.new already has ↵ | David Heinemeier Hansson | 2008-04-30 | 2 | -0/+37 |
| | | | | | | | | (Adam Meehan) [#39 state:resolved] |