github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,157 Commits 34 Branches 105 Tags
dcafe995bfe51e53dd04607956be9b54073e9cb6
Commit Graph

29 Commits

Author SHA1 Message Date
Jeremy Kemper
949c8c0d0e Don't publicize with_scope for tests since it may shadow public misuse 2009-12-28 14:07:23 -08:00
Emilio Tagua
3747f896a1 Moved relation's test to relation_test. 2009-10-05 14:39:20 -03:00
Emilio Tagua
9520143159 Merge commit 'rails/master' 
Conflicts:
	activerecord/test/cases/adapter_test.rb
	activerecord/test/cases/method_scoping_test.rb
 2009-08-08 19:14:35 -03:00
Raimonds Simanovskis
ee654e54c4 Oracle generates different ORDER BY fragment 2009-08-06 23:40:59 +03:00
Emilio Tagua
0e0866e056 Introduced ActiveRecord::Relation, a layer between an ARel relation and an AR relation 2009-07-21 20:21:03 -03:00
Emilio Tagua
1cc4459939 Merge commit 'rails/master' 
Conflicts:

	activerecord/lib/active_record.rb

Updated:
  Arel submodule
 2009-05-18 20:01:06 -03:00
Pratik Naik
c5e109bbe7 Make sure default_scope#create checks for options[:conditions] [#2181 state:resolved] [James Le Cuirot] 2009-05-18 21:27:42 +02:00
Emilio Tagua
5e790d368c Merge commit 'rails/master' 2009-05-02 03:21:40 -03:00
Alexander Podgorbunsky
db0bfe4ede Default scope :order should be overridden by named scopes. 
[#2346 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-05-01 14:44:24 -07:00
Emilio Tagua
090539604b construct_finder_sql now use Arel 2009-04-24 21:48:45 -03:00
Emilio Tagua
a841cd2503 Fix models load order to be able to run unit tests. 
[#2550 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-04-23 16:02:11 -07:00
Jeremy Kemper
19ad375e7a Don't duplicate :order from scope and options, it makes mysql do extra work 2009-03-10 23:11:05 -07:00
Manfred Stienstra
c3aa2bcdcf Ensure nested with_scope merges conditions inside out [#2193 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-10 11:49:58 +00:00
rick
1cfc39e7e7 update the default scope test to take the model's default scope into account 2009-02-25 09:27:44 -08:00
Filip H.F. "FiXato" Slagter
a0d8202bb9 Ensure whitespaces are stripped when merging string joins. [#1297 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-01-28 19:50:55 +00:00
Daniel Luz
f7bd0beb67 Ensure Model#last doesn't affects order for another finders inside the same scope [#1499 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-21 23:24:06 +00: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
Pratik Naik
2530d0eea8 Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) 2008-11-16 23:36:41 +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
Pivotal Labs
487758b3b8 Allowed passing arrays-of-strings to :join everywhere. Merge duplicate join strings to avoid table aliasing problems. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1077 state:committed]
 2008-09-24 13:26:06 +02:00
Andrew White
db22c89543 Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code! 
[#501 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 12:07:15 -07:00
Tarmo Tänav
82343859d5 Added missing fixtures for tests which fail to run independently if run after schema reset 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-04 11:50:15 +02:00
Mark Catley
0fd3e4cd2b Fix column collision with named_scope and :joins. [#46 state:resolved] 2008-06-22 19:21:15 -07:00
Andrew White
235d635708 Ensure :select passed in options overrides the one from the scope. [#239 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-05-29 14:10:24 +01:00
Jeremy Kemper
0ff031992f Fix merging blank conditions. Closes #10764 [mcmire, cavalle] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9082 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-23 05:00:25 +00:00
Jeremy Kemper
39814fcce0 Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-21 17:20:51 +00:00
Jeremy Kemper
1e70928014 Fix paths 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-18 07:31:37 +00:00
Jeremy Kemper
42b39ae3f2 Move tests to cases 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-18 07:30:42 +00:00