aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Update versions of all components to normalize them to new formatBryan Helmkamp2010-03-021-2/+3
|
* ActiveRecord should raise an error on invalid migration types.José Valim2010-02-281-4/+7
|
* Print database.rake errors to stderr.S. Christoffer Eliesen2010-02-271-5/+5
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* no more warning interpreted as argument prefix on association_preload.rbSantiago Pastorino2010-02-261-1/+1
|
* fixed a 'RecordNotFound' bug when calling 'reload' on a object which doesn't ↵Tobias Bielohlawek2010-02-261-1/+1
| | | | | | | | met the default_scope conditions, added test [#3166 status:resolved] The reload method didn't made use of 'with_exclusive_scope' when reloading the object. This lead to a RecordNotFound exception, in case the object doesn't met the default_scope condition (anymore) - which is obviously a bug. This quick fix makes use of with_exclusive_scope in the reload method as well. See test for full example. Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix a bug where default_scope was overriding attributes given on model ↵Henry Hsu2010-02-261-1/+1
| | | | | | initialization [#3218 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.Jeremy Kemper2010-02-253-5/+5
|
* Revert "Fix test load paths for those not using bundler"Carlhuda2010-02-231-0/+1
| | | | | | This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path.
* avoid @lock_value not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid @transaction_joinable not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid active not initialized warningSantiago Pastorino2010-02-221-0/+1
|
* Require persisted? in ActiveModel::Lint and remove new_record? and ↵José Valim2010-02-211-4/+9
| | | | destroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not.
* Add to_key and to_param methods to ActiveModel::Conversion.José Valim2010-02-211-1/+1
|
* AMo #key is now #to_key and CI is probably happysnusnu2010-02-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obviously #key is a too common name to be included in the AMo interface, #to_key fits better and also relates nicely to #to_param. Thx wycats, koz and josevalim for the suggestion. AR's #to_key implementation now takes customized primary keys into account and there's a testcase for that too. The #to_param AMo lint makes no assumptions on how the method behaves in the presence of composite primary keys. It leaves the decision wether to provide a default, or to raise and thus signal to the user that implementing this method will need his special attention, up to the implementers. All AMo cares about is that #to_param is implemented and returns nil in case of a new_record?. The default CompliantObject used in lint_test provides a naive default implementation that just joins all key attributes with '-'. The #to_key default implementation in lint_test's CompliantObject now returns [id] instead of [1]. This was previously causing the (wrong) tests I added for AR's #to_key implementation to pass. The #to_key tests added with this patch should be better. The CI failure was caused by my lack of knowledge about the test:isolated task. The tests for the record_identifier code in action_controller are using fake non AR models and I forgot to stub the #to_key method over there. This issue didn't come up when running the test task, only test:isolated revealed it. This patch fixes that. All tests pass isolated or not, well, apart from one previously unpended test in action_controller that is unrelated to my patch.
* Adds #key and #to_param to the AMo interfacesnusnu2010-02-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces two new methods that every AMo compliant object must implement. Below are the default implementations along with the implied interface contract. # Returns an Enumerable of all (primary) key # attributes or nil if new_record? is true def key new_record? ? nil : [1] end # Returns a string representing the object's key # suitable for use in URLs, or nil if new_record? # is true def to_param key ? key.first.to_s : nil end 1) The #key method Previously rails' record_identifier code, which is used in the #dom_id helper, relied on calling #id on the record to provide a reasonable DOM id. Now with rails3 being all ORM agnostic, it's not safe anymore to assume that every record ever will have an #id as its primary key attribute. Having a #key method available on every AMo object means that #dom_id can be implemented using record.to_model.key # instead of record.id Using this we're able to take composite primary keys into account (e.g. available in datamapper) by implementing #dom_id using a newly added record_key_for_dom_id(record) method. The user can overwrite this method to provide customized versions of the object's key used in #dom_id. Also, dealing with more complex keys that can contain arbitrary strings, means that we need to make sure that we only provide DOM ids that are valid according to the spec. For this reason, this patch sends the key provided through a newly added sanitize_dom_id(candidate_id) method, that makes sure we only produce valid HTML The reason to not just add #dom_id to the AMo interface was that it feels like providing a DOM id should not be a model concern. Adding #dom_id to the AMo interface would force these concern on the model, while it's better left to be implemented in a helper. Now one could say the same is true for #to_param, and actually I think that it doesn't really fit into the model either, but it's used in AR and it's a main part of integrating into the rails router. This is different from #dom_id which is only used in view helpers and can be implemented on top of a semantically more meaningful method like #key. 2) The #to_param method Since the rails router relies on #to_param to be present, AR::Base implements it and returns the id by default, allowing the user to overwrite the method if desired. Now with different ORMs integrating into rails, every ORM railtie needs to implement it's own #to_param implementation while already providing code to be AMo compliant. Since the whole point of AMo compliance seems to be to integrate any ORM seamlessly into rails, it seems fair that all we really need to do as another ORM, is to be AMo compliant. By including #to_param into the official interface, we can make sure that this code can be centralized in the various AMo compliance layers, and not be added separately by every ORM railtie. 3) All specs pass
* Merge master.José Valim2010-02-171-1/+0
|\
| * Fix test load paths for those not using bundlerJoshua Peek2010-02-151-1/+0
| |
* | Rename Rails::Subscriber to Rails::LogSubscriberPrem Sichanugrist2010-02-163-4/+4
|/
* Move batch finders to RelationPratik Naik2010-02-125-82/+82
|
* Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the ↵David Heinemeier Hansson2010-02-061-4/+8
| | | | MySQL driver to improve log signal to noise ration in development [DHH]
* fix usage examples and more to use new invocationsRomD2010-02-061-2/+2
| | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ↵Prem Sichanugrist2010-02-061-1/+1
| | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always ↵Jeremy Kemper2010-02-041-2/+4
| | | | uses AS.
* MergeDavid Heinemeier Hansson2010-02-032-3/+3
|\
| * Merge remote branch 'mikel/master'Jeremy Kemper2010-02-031-2/+2
| |\
| | * Adding guard to make sure test database declarations exist before trying to ↵Mikel Lindsaar2010-02-041-2/+2
| | | | | | | | | | | | auto create
| * | removing , from ,= statement in WrappedDatabaseException constructorSubbaRao Pasupuleti2010-02-031-1/+1
| |/ | | | | | | | | | | [#3830 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* / Move to 3.0.0.betaDavid Heinemeier Hansson2010-02-031-1/+1
|/
* Added encoding qery support for SQLite3 to make rake db:charset work on all ↵Mikel Lindsaar2010-02-032-0/+14
| | | | databases shipping with Rails 3
* Made rake db:create also create the test database if you are in development modeMikel Lindsaar2010-02-031-1/+5
|
* Change Rails::Generators::Migration protected instance methods to class ↵Szymon Nowak2010-02-021-9/+8
| | | | | | methods. [#3820 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* fixed migration logger bug [#3434 status:resolved]Corey Johnson2010-02-021-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-021-3/+6
|\
| * Convert to class_attributeJeremy Kemper2010-02-011-3/+6
| |
* | Updating copyright dates on all licensesMikel Lindsaar2010-02-011-1/+1
|/
* Axe AM state machineJoshua Peek2010-01-302-25/+0
| | | | We're going do it eventually, get it done before 3.0 is final.
* Rely on arel to generate the correct sql when an empty array is supplied to ↵Pratik Naik2010-01-301-1/+1
| | | | IN predicate
* Drop AR I18n deprecation and simple use errors.messages as fallback.José Valim2010-01-303-26/+14
|
* tsort-based dependency resolution for initializersPaul Rosania2010-01-291-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Move the ActiveRecord generator settings into the RailtieCarl Lerche2010-01-281-0/+3
|
* Clear up some ivar warningsJeremy Kemper2010-01-271-3/+13
|
* future proofing the sqlite3 adapter codeAaron Patterson2010-01-261-3/+3
| | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc ↵Jack Christensen2010-01-251-1/+5
| | | | so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns [#3777 state:resolved]
* Fix AR's rake tasks to work with the Rails::Application refactorCarlhuda2010-01-251-1/+1
|
* As first step setup the load path and lazy compare middlewares.José Valim2010-01-251-3/+3
|
* Add active_model/railtie back to generated boot.rb, add models back to ↵José Valim2010-01-251-5/+4
| | | | paths, load active_support/railtie since we need it and ensure default logger is set before config.
* Rename plugin_name to railtie_name and engine_name.José Valim2010-01-241-1/+1
|
* Merge branch 'master' into appJosé Valim2010-01-2319-474/+165
|\ | | | | | | | | Conflicts: railties/lib/rails/application.rb
| * Make default_scope work with RelationsPratik Naik2010-01-231-2/+3
| |
| * Relation should respond to class methodsPratik Naik2010-01-221-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:05:52 +0000