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
18,576 Commits 34 Branches 105 Tags
2f59cd6fd6c54bd55d4cd55f59cae413e961626a
Commit Graph

174 Commits

Author SHA1 Message Date
Neeraj Singh
9401fa0b9c expanding the test to include both type of order declaration 
while declaring default_scope

Also added test for unscoped using block style with four different
combinations

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-09-18 20:49:19 +02:00
Raimonds Simanovskis
af2a011df2 fixed Subject model after_initialize callback for test_oracle_synonym test 2010-09-09 18:27:53 -07:00
Nick Ragaz
16e078d908 failing test for reorder overriding default_scope 
[5528]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-09-05 08:27:51 -03:00
Neeraj Singh
91fec0d24d order should always be concatenated. 
order that is declared first has highest priority in all cases.

Here are some examples.

Car.order('name desc').find(:first, :order => 'id').name

Car.named_scope_with_order.named_scope_with_another_order

Car.order('id DESC').scoping do
  Car.find(:first, :order => 'id asc')
end

No special treatment to with_scope or scoping.

Also note that if default_scope declares an order then the order
declared in default_scope has the highest priority unless
with_exclusive_scope is used.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-09-05 08:13:42 -03:00
Pratik Naik
c07f0ae52e Change relation merging to always append select, group and order values 2010-08-31 19:17:18 +01:00
Neeraj Singh
2e45542942 While creating a new record using has_many create method default scope of child should be respected. 
author.posts.create should take into account default_scope
defined on post.

[#3939: state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-19 14:52:15 -03:00
Santiago Pastorino
9a7e7e5fdb Add missing model 2010-08-14 18:49:04 -03:00
Santiago Pastorino
b451de0d6d Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;) 2010-08-14 04:12:33 -03:00
Neeraj Singh
6ed1ba472e Ensure we can nest include calls [#5285 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-12 13:10:58 -03:00
Neeraj Singh
009aa8825b Eager loading an association should not change the count of children 
[#4971 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-02 17:12:59 +02:00
Robert Pankowecki
f8b53f35b9 test and fix collection_singular_ids= with string primary keys [#5125 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-08-02 16:41:20 +02:00
Santiago Pastorino
b0b9bf3204 Object#returning removed 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-25 23:30:27 +02:00
José Valim
7131244313 Ensure default_scope can be overwriten by association conditions. 2010-07-21 15:06:23 +02:00
Subba Rao Pasupuleti
d77c3b669c eagerly loaded association records should respect default_scope [#2931 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-21 15:01:40 +02:00
Neeraj Singh
992711a86b update_attribute should not update readonly attributes 
[#5106 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-21 14:55:57 +02:00
Neeraj Singh
f576d7cf84 Ensure that primary_keys of HABTM records is not double quoted 
[#5152 state:reslved]
 2010-07-20 16:45:42 -07:00
Neeraj Singh
f4fbc2c1f9 update_attributes and update_attributes! are now wrapped in a transaction 
[#922 state:resovled]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-13 22:02:00 +02:00
Vitalii Khustochka
b75fca9e57 Added reorder delegation for ActiveRecord::Base(to be able to overwrite the default_scope ordering in the named scope [#5093 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-13 08:31:55 +02:00
Will St. Clair + Neeraj Singh
b520d602ff string IDs are now quoted correctly [#5064 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-13 08:14:52 +02:00
Neeraj Singh
1e53404fe9 reset_counter should work with non-traditional belongs_to and polymorphic belongs_to 
[#4984 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 23:24:12 +02:00
Grant Ammons
17650e394f Eager loading :through associations will join the :source model if there are :conditions. [#2362 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 22:36:26 +02:00
Josh Kalderimis
4b66aab00f mass_assignment_security moved from AR to AMo, and minor test cleanup 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 18:28:45 +02:00
Josh Kalderimis
7c86e8e21b minor changes to mass assignment security patch to bring it in line with rails standards 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-08 18:28:38 +02:00
Ben Somers
de51cbccf8 Fixed gruoped_by_title spelling [#5063 state:committed] 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2010-07-08 00:26:25 +02:00
José Valim
67582f08bf Push a failing test for issues [#4994] and [#5003]. 2010-06-29 19:50:09 +02:00
Neeraj Singh
40e87ac669 with_exclusive_scope does not work properly if ARel is passed. It does work nicely if hash is passed. Blow up if user is attempting it pass ARel to with_exclusive_scope. 
[#3838 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-29 01:18:20 +02:00
James Le Cuirot
f664c57fe8 Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. 
[#4830 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-20 00:32:06 +02:00
José Valim
85cc1fa657 Revert "Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:open]" 
This commit introduced a regression described in ticket [#4830].

This reverts commit 0265c708b9.
 2010-06-11 17:05:54 +02:00
James Le Cuirot
0265c708b9 Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2010-06-09 18:17:52 +05:30
Raimonds Simanovskis
8136230cca Explicitly set Topic model last_read attribute as Date value when Oracle enhanced adapter is used 
(otherwise some tests are failing which assume that this attribute will have Date value)
 2010-06-04 22:44:02 +03:00
Pratik Naik
517f709b51 Properly cache association_collection#scopes calls having arguments 2010-06-04 00:53:45 +01:00
José Valim
ad4be3d75d Fix failing test. 2010-05-21 16:20:56 +02:00
Ian White
b439d85a19 Nested records (re: autosave) are now updated even when the intermediate parent record is unchanged [#4242 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-18 16:13:00 +02:00
Diego Algorta
3436fdfc12 Fix for get_ids when including a belongs_to association on a has_many association [#2896 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2010-05-15 16:53:59 +01:00
José Valim
5c245b91d2 Make sure valid? preceives the context as in ActiveModel API (ht: Carlos Antonio) 2010-05-10 12:28:38 +03:00
Lawrence Pit
60504e62c8 to_xml with :include should skip_instruct on the included records [#4506 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-04-30 14:22:57 +02:00
Neeraj Singh
883f27aa9a test cases for record.to_xml [#458 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-04-30 13:19:30 +02:00
Andrew White
8ec085bf18 Support fixtures for namespaced models [#2965 state:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-04-25 16:04:38 +02:00
Andrew White
9cea9bc7f0 Refactor compute_type to handle situations where the correct class is already loaded 
Signed-off-by: wycats <wycats@gmail.com>
 2010-04-12 21:31:20 -07:00
Pratik Naik
b77dd218ce Add Relation extensions 2010-04-02 17:38:02 +01:00
Andrew White
67d1cec4c8 Add the ability to specify table_name_prefix on individual modules 
Signed-off-by: wycats <wycats@gmail.com>
 2010-03-28 23:43:28 -07:00
Rizwan Reza
f1e5a9ff98 Add :dependent = to has_one and has_many [#3075 state:resolved] 2010-03-28 18:47:46 +04:30
Carlos Antonio da Silva
47d252f992 Fix associations to call :destroy or :delete based on the right :dependent option 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-03-09 00:11:34 +01:00
Henry Hsu
bf9a0ae12b Fix a bug where default_scope was overriding attributes given on model initialization [#3218 status:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-02-26 11:09:43 +01:00
Joshua Peek
db49c706b6 Axe AM state machine 
We're going do it eventually, get it done before 3.0 is final.
 2010-01-30 18:38:01 -06:00
Pratik Naik
8ff2fb6f3a Make default_scope work with Relations 2010-01-23 13:41:09 +05:30
Pratik Naik
9e7ec2a9f1 Simplify calculation scope building. Remove :order from associations as it is troublesome w/ calculation methods using postgresql. 2010-01-18 23:40:42 +05:30
Pratik Naik
d60bb0a9e4 Rename named_scope to scope 2010-01-18 04:38:19 +05:30
Pratik Naik
dca3de3bc7 Make relations work as scopes 2010-01-17 23:22:11 +05:30
Pratik Naik
f0cde5be54 Make sure named_scope names are not used as method names already 2010-01-17 21:34:41 +05:30