github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-04 11:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,643 Commits 34 Branches 105 Tags
d45e2c733d471b0c87f7cf721376ca4802450121
Commit Graph

2109 Commits

Author SHA1 Message Date
Jeremy Kemper
d45e2c733d Merge branch 'master' of git@github.com:rails/rails 2008-12-10 14:53:18 -08:00
Jeremy Kemper
b30ae19748 Revert "Fix: counter_cache should decrement on deleting associated records." 
[#1196 state:open]

This reverts commit 05f2183747.
 2008-12-10 14:48:12 -08:00
Bruce Krysiak
aa5cdb0d47 Added a :camelize option to ActiveRecord and Hash to_xml serialization and from_xml deserialization 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-12-10 20:28:05 +01:00
Jeremy Kemper
9539543026 Add ActiveRecord::VERSION autoload 2008-12-10 11:01:04 -08:00
Emilio Tagua
05f2183747 Fix: counter_cache should decrement on deleting associated records. 
[#1195 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-12-10 10:59:52 -08:00
Jeremy Kemper
e8c4939fb3 Benchmark.ms 2008-12-09 11:17:11 -08:00
Akira Matsuda
c3b87dd4c9 Make word separator in AR validation error messages configurable. 
[#1294 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-12-08 15:55:02 -08:00
Ben Symonds
091e6f791a Change field_changed? method to handle the case where a nullable integer column is changed from 0 to '0' 
[#1530 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-12-08 15:42:13 -08:00
Pratik Naik
dbbae5e00e Merge with docrails 2008-12-07 03:27:53 +01:00
Mike Ferrier
566a3dce67 Make NoMethodError message more descriptive when an undefined message has been sent to an association [#1515 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-12-04 13:31:18 -06:00
miloops
97403ad5fd Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1028 state:committed]
 2008-12-01 20:22:31 +01:00
Foliosus
0c4ba90aa1 Removed extra 'as' in :joins clause for habtm preloading 
Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#1405 state:committed]
 2008-12-01 20:00:19 +01:00
Paul
9a4d557713 Ensure hash conditions on referenced tables are considered when eager loading with limit/offset. [#1404 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-11-26 15:25:39 +01:00
Jeremy Kemper
ad93212f79 Rename use_transactional_fixtures? so it doesn't collide with the superclass_delegating_accessor's query method 2008-11-25 23:50:57 -08:00
Jeremy Kemper
104f3a5776 Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. 2008-11-24 18:43:04 -08:00
Joshua Peek
835be0cbed missed ActiveRecord::Migrator 2008-11-24 12:31:16 -06:00
Joshua Peek
d6b923adbd get activerecord tests passing with lazy loading 2008-11-24 12:17:07 -06:00
Joshua Peek
21901e9345 fixtures depends on dependencies 2008-11-24 12:17:07 -06:00
Joshua Peek
fffb1da3f2 require json lib when serialization is loaded 2008-11-24 11:52:29 -06:00
Joshua Peek
703fecb4fc Add LAZY env flag for testing autoload/lazy load feature 2008-11-24 11:37:57 -06:00
Joshua Peek
7254d23764 Autoload ActiveRecord files 2008-11-24 11:14:24 -06:00
David Heinemeier Hansson
db6b3a1f2c Docfix [#1444 state:committed] 2008-11-23 13:43:59 +01:00
Ken Collins
8e4624be9e Remove SQL Server cases from tests for latest adapter work to pass rails expected behavior. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-19 18:00:56 +01:00
Pratik Naik
9c3c42d8ea Remove reset! as a connection#checkout callback 2008-11-19 21:18:07 +05:30
David Heinemeier Hansson
51a19ae2bf Assume that the next version is going to be 2.3 for now 2008-11-19 14:12:38 +01:00
Sven Fuchs
12118963ac use :en as a default locale (in favor of :en-US) 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-18 14:23:53 +01:00
Tom Stuart
32cb2345a5 Fix default_scope to work in combination with named scopes 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-17 22:00:14 +01:00
Joshua Peek
e6c51051e4 Ensure shared default_scoping stack is duped before assigning to thread local 2008-11-16 13:52:21 -06:00
Pratik Naik
2530d0eea8 Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) 2008-11-16 23:36:41 +05:30
Pratik Naik
d9f460a39b Ensure @@already_loaded_fixtures is initialized before use 2008-11-16 22:21:05 +05:30
David Heinemeier Hansson
ca23287b44 Revert "Added default_scope to Base [#1381 state:committed] (Paweł Kondzior)" -- won't gel with threads. 
This reverts commit ff594b2bc9.
 2008-11-16 16:35:52 +01:00
David Heinemeier Hansson
ff594b2bc9 Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) 2008-11-16 16:01:18 +01:00
Jeremy Kemper
eeea1a26ec Merge branch 'master' into testing 2008-11-15 12:21:04 -08:00
Will Bryant
789a3f5b03 Moved the * strings out of construct_finder_sql to a new default_select method so it can be overridden by plugins cleanly 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1371 state:resolved]
 2008-11-15 18:26:41 +01:00
Matt Jones
d3fd997109 fix assignment to has_one :through associations. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-15 18:20:39 +01:00
David Heinemeier Hansson
61e43700b8 Prepare for RC2 2008-11-14 12:26:50 +01:00
David Heinemeier Hansson
ff4ccb8334 Revert "Move fixtures settings from AR::TestCase to railties test_help" -- it broke all the tests! 
This reverts commit 9a88ab64bb.
 2008-11-14 12:01:26 +01:00
Jeremy Kemper
9a88ab64bb Move fixtures settings from AR::TestCase to railties test_help 2008-11-13 19:09:23 -08:00
Jeremy Kemper
1304b66492 Remove superfluous require 2008-11-13 19:03:24 -08:00
Ken Collins
57d795bad4 Make sure any Fixnum returned by a DB sum is type cast to a Float before standard converstion to a BigDecimal [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-13 10:45:57 -06:00
Jeremy Kemper
b17eb65d00 Move fixtures settings from AR::TestCase to railties test_help 2008-11-12 11:33:09 -08:00
Jeremy Kemper
5d2b5ba23e Merge branch 'master' into testing 2008-11-11 10:22:09 -08:00
Frederick Cheung
78a18392e1 Remove redundant uniq 2008-11-11 11:22:13 +01:00
Joshua Peek
335a315240 Add simple case when DB calculations returns 0 instead of 0.0 [#1346 state:resolved] 2008-11-10 14:16:43 -06:00
Jeremy Kemper
1df0a07f06 lazy-initialize already loaded fixtures map 2008-11-08 22:49:00 -05:00
Jeremy Kemper
ace9e533dc Merge branch 'master' into testing 2008-11-08 18:58:29 -05:00
Jeremy Kemper
dd77733f2f Timeout the connection pool monitor on ruby 1.8 only 2008-11-08 00:27:18 -05:00
Jeremy Kemper
661980692b Merge branch 'master' into testing 2008-11-07 21:54:29 -05:00
Ken Collins
a7f920f674 If average value from DB is 0, make sure to convert it to a 0.0 float before calling #to_d on it [#1346 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-07 20:39:06 -06:00
Jeremy Kemper
0994d11f26 Merge branch 'master' into testing 2008-11-07 19:55:29 -05:00