Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 1 | -0/+10 |
|\ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule | ||||
| * | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 1 | -0/+10 |
| | | | | | | | | state:resolved] [James Le Cuirot] | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 1 | -3/+3 |
|\| | |||||
| * | Default scope :order should be overridden by named scopes. | Alexander Podgorbunsky | 2009-05-01 | 1 | -3/+3 |
| | | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | construct_finder_sql now use Arel | Emilio Tagua | 2009-04-24 | 1 | -1/+1 |
|/ | |||||
* | Fix models load order to be able to run unit tests. | Emilio Tagua | 2009-04-23 | 1 | -1/+1 |
| | | | | | | [#2550 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Don't duplicate :order from scope and options, it makes mysql do extra work | Jeremy Kemper | 2009-03-10 | 1 | -2/+4 |
| | |||||
* | Ensure nested with_scope merges conditions inside out [#2193 state:resolved] | Manfred Stienstra | 2009-03-10 | 1 | -5/+33 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | update the default scope test to take the model's default scope into account | rick | 2009-02-25 | 1 | -1/+1 |
| | |||||
* | Ensure whitespaces are stripped when merging string joins. [#1297 ↵ | Filip H.F. "FiXato" Slagter | 2009-01-28 | 1 | -0/+10 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure Model#last doesn't affects order for another finders inside the same ↵ | Daniel Luz | 2008-12-21 | 1 | -0/+18 |
| | | | | | | scope [#1499 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix default_scope to work in combination with named scopes | Tom Stuart | 2008-11-17 | 1 | -3/+9 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | Pratik Naik | 2008-11-16 | 1 | -0/+61 |
| | |||||
* | Revert "Added default_scope to Base [#1381 state:committed] (Paweł ↵ | David Heinemeier Hansson | 2008-11-16 | 1 | -38/+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 | 1 | -0/+38 |
| | |||||
* | Allowed passing arrays-of-strings to :join everywhere. Merge duplicate join ↵ | Pivotal Labs | 2008-09-24 | 1 | -0/+30 |
| | | | | | | | strings to avoid table aliasing problems. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1077 state:committed] | ||||
* | Merge scoped :joins together instead of overwriting them. May expose scoping ↵ | Andrew White | 2008-08-28 | 1 | -2/+79 |
| | | | | | | | | bugs in your code! [#501 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Added missing fixtures for tests which fail to run independently if run ↵ | Tarmo Tänav | 2008-08-04 | 1 | -1/+1 |
| | | | | | | after schema reset Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix column collision with named_scope and :joins. [#46 state:resolved] | Mark Catley | 2008-06-22 | 1 | -0/+10 |
| | |||||
* | 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> | ||||
* | Fix merging blank conditions. Closes #10764 [mcmire, cavalle] | Jeremy Kemper | 2008-03-23 | 1 | -2/+22 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9082 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails | Jeremy Kemper | 2008-01-21 | 1 | -7/+7 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Fix paths | Jeremy Kemper | 2008-01-18 | 1 | -5/+5 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Move tests to cases | Jeremy Kemper | 2008-01-18 | 1 | -0/+416 |
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |