aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
...
* AMo #key is now #to_key and CI is probably happysnusnu2010-02-201-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-2/+8
|\
| * Fix test load paths for those not using bundlerJoshua Peek2010-02-152-2/+8
| |
* | Rename Rails::Subscriber to Rails::LogSubscriberPrem Sichanugrist2010-02-161-5/+5
|/
* test_validates_acceptance_of_as_database_column fixedSantiago Pastorino2010-02-051-3/+3
| | | | | | [#3826 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add test case for unable to run migration if ActiveRecord::Base.logger is ↵Prem Sichanugrist2010-02-021-0/+10
| | | | | | nil (#3434) Signed-off-by: José Valim <jose.valim@gmail.com>
* Get rails tests running on bundler 0.9Carl Lerche2010-01-311-8/+1
|
* Axe AM state machineJoshua Peek2010-01-302-69/+0
| | | | We're going do it eventually, get it done before 3.0 is final.
* Drop AR I18n deprecation and simple use errors.messages as fallback.José Valim2010-01-302-9/+9
|
* future proofing the sqlite3 adapter codeAaron Patterson2010-01-262-0/+9
| | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc ↵Jack Christensen2010-01-252-1/+47
| | | | so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns [#3777 state:resolved]
* Make default_scope work with RelationsPratik Naik2010-01-232-1/+12
|
* Relation should respond to class methodsPratik Naik2010-01-221-0/+5
|
* Allow calling class methods on a RelationPratik Naik2010-01-221-0/+9
|
* Revert "Refactoring attributes/types" [#3348 state:open]Pratik Naik2010-01-228-317/+0
| | | | | | | | | | | | | | | | | This reverts commit f936a1f100e75082081e782e5cceb272885c2df7. Conflicts: activerecord/lib/active_record.rb activerecord/lib/active_record/base.rb Revert "Fixed: #without_typecast should only disable typecasting on the duplicated attributes" [#3387 state:open] This reverts commit 2831996483c6a045f1f38d8030256eb58d9771c3. Reason : It's not generating attribute methods properly, making object.column 5x slower.
* Default to sync instrumentation.José Valim2010-01-211-11/+2
|
* Remove find_with_associations and related code from associations now that ↵Pratik Naik2010-01-201-15/+0
| | | | Relation handles that stuff
* Remove Relation#where_clausePratik Naik2010-01-191-4/+4
|
* Give preference to to_a over arel from Relation#method_missingPratik Naik2010-01-191-0/+6
|
* Add Relation#construct_relation_for_association_calculations for ↵Pratik Naik2010-01-191-17/+0
| | | | calculations with includes
* Simplify calculation scope building. Remove :order from associations as it ↵Pratik Naik2010-01-182-6/+4
| | | | is troublesome w/ calculation methods using postgresql.
* Handle invalid query IN() generated when a blank array is supplied in hash ↵Pratik Naik2010-01-181-0/+5
| | | | conditions
* Get rid of Relation#order_clausesPratik Naik2010-01-181-3/+3
|
* Ensure deprecated validate methods are invoked when they are private [#3214 ↵José Valim2010-01-181-1/+18
| | | | status:resolved]
* Rename named_scope to scopePratik Naik2010-01-188-28/+32
|
* Dont check for class equaity when merging relationsPratik Naik2010-01-181-4/+0
|
* Inherit named scope class Scope from RelationPratik Naik2010-01-181-11/+6
|
* Ensure that Scope#proxy_scope is always klass. Rename proxy_scope to klass too.Pratik Naik2010-01-181-4/+4
|
* Make relations work as scopesPratik Naik2010-01-171-4/+4
|
* Make sure named_scope names are not used as method names alreadyPratik Naik2010-01-172-7/+13
|
* save(false) is gone, use save(:validate => false) instead.José Valim2010-01-172-7/+15
|
* Make merging of order values consistentPratik Naik2010-01-172-5/+7
|
* Make Relation#reload force load the records immediatelyPratik Naik2010-01-171-3/+5
|
* Revert "Fix #microseconds conversion and #fast_string_to_time"Pratik Naik2010-01-171-43/+0
| | | | This reverts commit 717a2941e15b32d07cc456bb0d81742ecfc5b4a3. Bunch of failures when running postgresql tests.
* Rename active_relation_engine -> arel_engine and active_relation_table -> ↵Pratik Naik2010-01-161-2/+2
| | | | arel_table
* Fix #microseconds conversion and #fast_string_to_timeChris Hapgood2010-01-161-0/+43
| | | | | | | | * Use direct integer parsing in #fast_string_to_time to avoid convoluted conversions and errors due to truncation. * Use Float#round in #microseconds to avoid truncation errors. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix the query matching in SubscriberTestPratik Naik2010-01-161-2/+2
|
* Make scopes use relations under the hoodPratik Naik2010-01-162-61/+32
|
* Different nested validations should not be ignore [#3638 status:resolved]José Valim2010-01-141-0/+8
|
* Add subscriber for ActionPack and move all logging inside it.José Valim2010-01-131-2/+2
|
* Deprecate ActiveRecord::Base.colorize_logging.José Valim2010-01-131-1/+1
|
* Create Rails::Subscriber::TestHelper and use it to make ActiveRecord ↵José Valim2010-01-131-0/+51
| | | | subscriber tests run in both sync and async scenarios.
* Move AR logging responsibilities to ActiveRecord::Railties::Subscriber.José Valim2010-01-131-12/+1
|
* reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 was ↵Chad Woolley2010-01-121-2/+2
| | | | | | getting negative and changing values for ID field. See http://www.sqlite.org/datatypes.html Signed-off-by: Yehuda Katz <wycats@gmail.com>
* Expose connections available in the connection pool.José Valim2010-01-111-0/+2
|
* Merge remote branch 'eloy/master'José Valim2010-01-099-14/+102
|\
| * Renamed AssociationReflection #collection_association? to #collection?.Eloy Duran2010-01-081-4/+4
| |
| * Rollback the transaction when one of the autosave associations fails to ↵Eloy Duran2010-01-085-1/+68
| | | | | | | | save. [#3391 state:resolved]
| * Exclude unchanged records from the collection being considered for autosave. ↵Lawrence Pit2010-01-081-9/+4
| | | | | | | | | | | | [#2578 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>