mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,375 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

5139 Commits

Author SHA1 Message Date
Kevin Moore 3e2465521b Aligning master changelog w/ 3-0-stable 2011-01-09 16:07:25 -08:00
Katrina Owen 4690bee301 Adding postgresql template option when executing db:test:clone_structure 
Specify the template to use in config/database.yml, e.g.

  test:
    adapter: postgresql
    template: template_postgis

If no template is specified, postgresql defaults to template1
 2011-01-09 15:35:47 -08:00
Aaron Patterson 12f5158f09 remove unused string substitution 2011-01-08 20:15:15 -08:00
Aaron Patterson 3b677aa006 use select_all because not all database adapters support bind values 2011-01-08 19:59:31 -08:00
Aaron Patterson ec960c3730 join the cult of cargo. reduce the number of NoMethodErrors in the system 2011-01-07 18:45:30 -08:00
Aaron Patterson 36d7bd1898 stop creating intermediate AR objects, just construct AR objects from a list of hashes 2011-01-07 18:45:17 -08:00
Aaron Patterson 84f81f5779 no need for to_sym 2011-01-07 16:50:44 -08:00
Aaron Patterson 33ebf9bd56 String#insert() mutates the string, so no need for lasgn 2011-01-07 16:27:34 -08:00
Aaron Patterson 1e2ab564f9 fewer funcalls to the cached attributes variable 2011-01-07 16:27:34 -08:00
Jeremy Kemper 63ed6ca998 Add test for e0e3adf 2011-01-07 16:25:25 -08:00
Jon Leighton 82b0ce9c97 Refactor HasOneAssociation#replace 2011-01-07 15:03:16 -08:00
Jon Leighton 5b28e52542 Don't not remove double negatives 2011-01-07 15:03:16 -08:00
Jon Leighton d23c332e02 Clean up create, create! and build in HasOneAssociation 2011-01-07 15:03:15 -08:00
Jon Leighton 5ecf692248 merge_with_conditions is not necessary because the conditions will already be in the scope_for_create hash in the scope 2011-01-07 15:03:15 -08:00
Jon Leighton 45d0d18bae Not really worth having the HasAssociation module for just a single method 2011-01-07 15:03:15 -08:00
Jon Leighton 770e6893b9 Construct an actual ActiveRecord::Relation object for the association scope, rather than a hash which is passed to apply_finder_options. This allows more flexibility in how the scope is created, for example because scope.where(a, b) and scope.where(a).where(b) mean different things. 2011-01-07 15:03:15 -08:00
Jon Leighton 441118458d Use encode_with for marshalling 2011-01-07 15:03:15 -08:00
Aaron Patterson 2efd780dcb send() will raise an ArgumentError, so we should leverage ruby 2011-01-07 14:30:20 -08:00
Aaron Patterson 6e63e7a874 no need for parens 2011-01-07 14:10:46 -08:00
Aaron Patterson 344a2d5adc use a hash for caching aggregations rather than ivars 2011-01-07 13:53:34 -08:00
Aaron Patterson f3d92f0756 method is never called with arguments 2011-01-07 13:41:38 -08:00
Aaron Patterson 2ee4c8d90b only rescue from Mysql::Error exceptions [#6236 state:resolved] 2011-01-07 11:48:29 -08:00
Aaron Patterson 839f3bf682 just use a hash for doing association caching 2011-01-07 11:28:11 -08:00
Aaron Patterson 8a1c533780 no need for self 2011-01-06 15:15:36 -08:00
Aaron Patterson eba8411652 adding an `encode_with` method for Psych dump/load methods 2011-01-05 14:59:19 -08:00
Aaron Patterson 97bc74c746 make sure new objects can round trip 2011-01-05 14:03:13 -08:00
Aaron Patterson 6d74710828 make sure that Psych can roundtrip an AR object 2011-01-05 14:01:47 -08:00
Aaron Patterson 9731c862ec AR internals expect a normal hash, otherwise there are serialization incompatibilities 2011-01-05 13:50:08 -08:00
Aaron Patterson c7dce2c7b2 no need to specify self 2011-01-05 11:08:21 -08:00
Aaron Patterson 102255330b no need to send a symbol to send() 2011-01-05 10:50:46 -08:00
Aaron Patterson 90171ad833 avoid creating so many Arel::Table objects 2011-01-05 10:29:06 -08:00
Aaron Patterson 9f1b0b32e2 use attr_reader and alias methods to access instance variables 2011-01-05 09:58:25 -08:00
Aaron Patterson 8bdc191994 we have a method for this, so let's use it 2011-01-05 09:51:09 -08:00
Aaron Patterson e468a62dc8 use arel ast construction rather than generating strings 2011-01-05 09:47:13 -08:00
Aaron Patterson 35a225535f use arel to construct AST rather than generate strings 2011-01-05 09:23:30 -08:00
Aaron Patterson 3f4143eedb fixing merge errors 2011-01-04 15:16:56 -08:00
Aaron Patterson 3f7e097464 Merge remote branch 'rsim/require_deprecation' 
* rsim/require_deprecation:
  require ActiveSupport deprecatation file before using deprecate method in database_statements
 2011-01-04 15:09:22 -08:00
Aaron Patterson c08fccf980 Merge remote branch 'rsim/habtm_select_fix' 
* rsim/habtm_select_fix:
  Explicitly select * from has_and_belongs_to_many association tables, simplify exists? query
 2011-01-04 15:08:28 -08:00
Prem Sichanugrist ad343d7263 Use Rails 3.1 `change` method in 'add_' migration generator 2011-01-04 11:16:52 -08:00
Prem Sichanugrist 9e64dfad0d Use Rails 3.1 `change` method in model generator 2011-01-04 11:16:52 -08:00
Raimonds Simanovskis 9c1c551f25 Explicitly select * from has_and_belongs_to_many association tables, simplify exists? query 
Previous version (after commit 3103296a61) was generating wrong SQL for Oracle when calling exists? method on HABTM association.
 2011-01-04 17:06:33 +02:00
Raimonds Simanovskis 1d758d9086 require ActiveSupport deprecatation file before using deprecate method in database_statements 
otherwise when using external ActiveRecord adapters (e.g. Oracle) database_statements might be loaded before active_support/core_ext/module/deprecation which results in NoMethodError (commit 60cf65def8 added "deprecate" call to database_statements.rb)
 2011-01-04 11:21:03 +02:00
Jon Leighton 40afcade0d Remove undocumented feature from has_one where you could pass false as the second parameter to build_assoc or create_assoc, and the existing associated object would be untouched (the foreign key would not be nullified, and it would not be deleted). If you want behaviour similar to this you can do the following things: 
* Use :dependent => :nullify (or don't specify :dependent) if you want to prevent the existing associated object from being deleted
* Use has_many if you actually want multiple associated objects
* Explicitly set the foreign key if, for some reason, you really need to have multiple objects associated with the same has_one. E.g.

    previous = obj.assoc
    obj.create_assoc
    previous.update_attributes(:obj_id => obj.id)
 2011-01-03 16:24:32 -08:00
Jon Leighton 2120da7f73 ActiveRecord::Relation#primary_key should return a string, just like ActiveRecord::Base.primary_key does. 2011-01-03 16:24:32 -08:00
Jon Leighton 0619dc2319 Implement deprecated version of AssociationReflection#primary_key_name, which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1. 2011-01-03 16:24:32 -08:00
Jon Leighton a9bed985cf When preloading a belongs_to, the target should still be set (to nil) if there is no foreign key present. And the loaded flag should be set on the association proxy. This then allows us to remove the foreign_key_present? check from BelongsToAssociation#find_target. Also added a test for the same thing on polymorphic associations. 2011-01-03 16:24:32 -08:00
Jon Leighton 99a8d8430f Create the association scope directly rather than going through with_scope 2011-01-03 16:24:32 -08:00
Jon Leighton 1313d386da Make Relation#create_with always merge rather than overwrite, not just when merging two relations. If you wish to overwrite, you can do relation.create_with(nil), or for a specific attribute, relation.create_with(:attr => nil). 2011-01-03 16:24:32 -08:00
Jon Leighton 31d101879f Use the association directly in other places too 2011-01-03 16:24:32 -08:00
Jon Leighton 3103296a61 Let AssociationCollection#find use #scoped to do its finding. Note that I am removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences. 2011-01-03 16:24:31 -08:00