Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Require mocha >= 0.9.3, older versions don't work anymore [#1579 state:resolved] | Hongli Lai (Phusion) | 2008-12-15 | 1 | -0/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-10 | 1 | -0/+7 |
|\ | |||||
| * | Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵ | Bruce Krysiak | 2008-12-10 | 1 | -0/+7 |
| | | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Revert "Fix: counter_cache should decrement on deleting associated records." | Jeremy Kemper | 2008-12-10 | 2 | -34/+0 |
|/ | | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc. | ||||
* | Fix test names collision. | Emilio Tagua | 2008-12-10 | 1 | -4/+4 |
| | | | | | | [#1549 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix: counter_cache should decrement on deleting associated records. | Emilio Tagua | 2008-12-10 | 2 | -0/+34 |
| | | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Rework ActiveSupport::OrderedHash to make lookups faster | Frederick Cheung | 2008-12-10 | 1 | -2/+3 |
| | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Change field_changed? method to handle the case where a nullable integer ↵ | Ben Symonds | 2008-12-08 | 1 | -0/+12 |
| | | | | | | | | column is changed from 0 to '0' [#1530 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add :having option to find, to use in combination with grouped finds. Also ↵ | miloops | 2008-12-01 | 6 | -0/+20 |
| | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed] | ||||
* | Ensure hash conditions on referenced tables are considered when eager ↵ | Paul | 2008-11-26 | 1 | -2/+18 |
| | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Autoload ActiveRecord files | Joshua Peek | 2008-11-24 | 2 | -2/+0 |
| | |||||
* | Remove SQL Server cases from tests for latest adapter work to pass rails ↵ | Ken Collins | 2008-11-19 | 10 | -149/+15 |
| | | | | | | expected behavior. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 2 | -54/+54 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix default_scope to work in combination with named scopes | Tom Stuart | 2008-11-17 | 2 | -10/+16 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | Pratik Naik | 2008-11-16 | 2 | -0/+73 |
| | |||||
* | Revert "Added default_scope to Base [#1381 state:committed] (Paweł ↵ | David Heinemeier Hansson | 2008-11-16 | 2 | -50/+0 |
| | | | | | | Kondzior)" -- won't gel with threads. This reverts commit ff594b2bc94ff2a942fe6ca05672387722dee686. | ||||
* | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | David Heinemeier Hansson | 2008-11-16 | 2 | -0/+50 |
| | |||||
* | Add create_fixtures method for tests | Jeremy Kemper | 2008-11-15 | 1 | -0/+4 |
| | |||||
* | Set up fixtures for AR tests | Jeremy Kemper | 2008-11-15 | 1 | -0/+8 |
| | |||||
* | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 8 | -2/+70 |
|\ | |||||
| * | fix assignment to has_one :through associations. | Matt Jones | 2008-11-15 | 6 | -1/+64 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fix typo in pool_conections_test [#1350 state:committed] | Amos King | 2008-11-14 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Make sure any Fixnum returned by a DB sum is type cast to a Float before ↵ | Ken Collins | 2008-11-13 | 1 | -0/+5 |
| | | | | | | | | | | | | standard converstion to a BigDecimal [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-08 | 1 | -4/+7 |
|\| | |||||
| * | Timeout the connection pool monitor on ruby 1.8 only | Jeremy Kemper | 2008-11-08 | 1 | -4/+7 |
| | | |||||
* | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -0/+23 |
|\| | |||||
| * | Added tests for HABTM associations with counter_sql | Tekin Suleyman | 2008-11-07 | 1 | -0/+23 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1102 state:committed] | ||||
* | | Update AR tests | Jeremy Kemper | 2008-11-07 | 2 | -5/+5 |
| | | |||||
* | | Remove fixtures from Test::Unit::TestCase. Mix in AR::TestFixtures instead. | Jeremy Kemper | 2008-11-07 | 1 | -11/+6 |
|/ | |||||
* | Make sure ActiveRecord::Base.connected? doesn't raise an exception for ↵ | Pratik Naik | 2008-11-06 | 1 | -0/+5 |
| | | | | defined connections | ||||
* | Ensure ActiveRecord::ConnectionPool.connected? handles undefined ↵ | Wes Oldenbeuving | 2008-11-06 | 1 | -0/+8 |
| | | | | | | connections. [#936 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed that serialized strings should never be type-casted (i.e. turning ↵ | David Heinemeier Hansson | 2008-10-27 | 1 | -0/+6 |
| | | | | "Yes" to a boolean)(Andreas Korth) [#857 state:committed] | ||||
* | "raise NoMethodError" raises NoMethodError. Raise it with NoMethodError.new ↵ | Mike Gunderloy | 2008-10-25 | 1 | -4/+7 |
| | | | | | | instead. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed issue where block is not called on the very first invocation of a ↵ | Ken Miller | 2008-10-24 | 1 | -0/+11 |
| | | | | | | find_or_create_by_ automatic finder. [#1224 state:committed] | ||||
* | Skip collection ids reader optimization if using :finder_sql | Jeremy Kemper | 2008-10-23 | 1 | -0/+7 |
| | |||||
* | Ensure association proxy responds to private class methods defined in ↵ | Pratik Naik | 2008-10-16 | 2 | -2/+16 |
| | | | | associated class. [#1083] | ||||
* | Allow class methods to be sent (via #send) to association proxy (fix for bug ↵ | Ian White | 2008-10-16 | 1 | -0/+4 |
| | | | | | | introduced by 691aa20) [#1083] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure methods called on association proxies respect access control. [#1083 ↵ | Pratik Naik | 2008-10-13 | 5 | -1/+48 |
| | | | | state:resolved] [Adam Milligan, Pratik] | ||||
* | Remove the functionality introduce in 28d3390 | Michael Koziarski | 2008-10-10 | 2 | -33/+0 |
| | | | | There are several situations it doesn't cater for, and the inconsistency isn't worth blocking 2.2. | ||||
* | explicitly including child associations that are also included in the parent ↵ | Will Bryant | 2008-10-10 | 3 | -1/+44 |
| | | | | | | | association definition should not result in double records in the collection/double loads (#1110) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1110 state:committed] | ||||
* | Ensure Model.sum and Model.avg typecast appropriately. [#1066 state:resolved] | Pratik Naik | 2008-10-04 | 1 | -3/+3 |
| | | | | | Model.sum delegates typecasting to the column being summed. If that's not feasible, returns a string. Model.avg always returns big decimal. | ||||
* | Introduce ActiveRecord::Reflection::ThroughReflection to simplify hm:t ↵ | Pratik Naik | 2008-10-04 | 1 | -0/+4 |
| | | | | reflection logic | ||||
* | Fix has_many :through when the source is a belongs_to association. [#323 ↵ | Zach Dennis | 2008-10-04 | 4 | -1/+28 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Try reloading model on class mismatch [#229 state:resolved] | Lawrence Pit | 2008-10-04 | 1 | -0/+20 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Make sure recreate MySQL test database with the proper encoding and ↵ | Luca Guidi | 2008-10-03 | 1 | -0/+5 |
| | | | | | | | collation [#1165 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1165 state:committed] | ||||
* | Dynamic finders should use the ActiveRecord::Base::find method instead of ↵ | Eloy Duran | 2008-10-03 | 1 | -5/+22 |
| | | | | | | | | | | | | ::find_initial, :find_last, and ::find_all. This is so when people override ActiveRecord::Base::find, the new ::find method will also be invoked by the dynamic finders. Associations for instance do go through ::find, so this makes it more consistent. Also removed the unnecessary deprecation silence blocks. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1162 state:committed] | ||||
* | wrote a test showing eager loading's misbehavior (sanitizing against the ↵ | Will Bryant | 2008-09-29 | 1 | -0/+7 |
| | | | | | | wrong table) when the association has a :conditions hash Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Changed ActiveRecord attributes to respect access control. | Adam Milligan | 2008-09-24 | 1 | -4/+47 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1084 state:committed] | ||||
* | Allowed passing arrays-of-strings to :join everywhere. Merge duplicate join ↵ | Pivotal Labs | 2008-09-24 | 3 | -0/+47 |
| | | | | | | | strings to avoid table aliasing problems. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1077 state:committed] | ||||
* | Make AssociationCollection start transactions in the correct database. | Hongli Lai (Phusion) | 2008-09-23 | 3 | -0/+27 |
| | | | | | | | | | | AssociationCollection now starts transactions by calling AssociationCollection#transaction instead of @owner.transaction or @reflection.klass.transaction. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1081 state:committed] |