Commit Graph

2942 Commits

Author SHA1 Message Date
Jeremy Roman
ffb22bd2be fix habtm documentation to correct typo
Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
2010-03-26 13:35:56 +04:30
Aaron Patterson
5de3698e2b cleaning up many more warnings in activerecord [#4180 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
2010-03-15 08:57:41 -07:00
Aaron Patterson
95bd56e3cc speeding up clone_attributes, changing readonly to be initialized in def initialize
Signed-off-by: wycats <wycats@gmail.com>
2010-03-14 17:29:25 -06:00
Aaron Patterson
115230e619 cleaning up some test warnings
Signed-off-by: wycats <wycats@gmail.com>
2010-03-14 17:28:27 -06:00
Xavier Noria
fe43bbd8c7 keep AssociationProxy#to_a to avoid warning in Array(post.author), and delegate it to @target in association collections
[#4165 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-03-12 11:53:22 -08:00
Emilio Tagua
e08c153a08 Arel now fallback to using Arel::Attribute if the table/column doesn't exists.
[#4142 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-03-10 13:49:11 -08:00
Aaron Patterson
aad432a9e9 removing spawn from SpawnMethods
Signed-off-by: wycats <wycats@gmail.com>
2010-03-10 13:29:00 -08:00
Pratik Naik
181c414baa Fix scope loading issue when the table doesn't exist 2010-03-10 11:28:04 +00:00
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
wycats
39d6f9e112 Make many parts of Rails lazy. In order to facilitate this,
add lazy_load_hooks.rb, which allows us to declare code that
should be run at some later time. For instance, this allows
us to defer requiring ActiveRecord::Base at boot time purely
to apply configuration. Instead, we register a hook that should
apply configuration once ActiveRecord::Base is loaded.

With these changes, brings down total boot time of a
new app to 300ms in production and 400ms in dev.

TODO: rename base_hook
2010-03-07 06:24:30 -08:00
Aaron Patterson
a424f199a9 drying up more code in associations.rb
Signed-off-by: wycats <wycats@gmail.com>
2010-03-06 21:41:13 -08:00
Aaron Patterson
939291e8f2 deleting repeated code
Signed-off-by: wycats <wycats@gmail.com>
2010-03-06 21:33:29 -08:00
Aaron Patterson
3789539916 converting inject to each and map
[#4119 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-03-06 20:31:50 -08:00
Aaron Patterson
45c36ea096 refactoring build_where
Signed-off-by: wycats <wycats@gmail.com>
2010-03-06 13:25:12 -08:00
Bryan Helmkamp
a4111bbca0 Update versions of all components to normalize them to new format 2010-03-02 00:32:48 -05:00
José Valim
f3839b2b99 ActiveRecord should raise an error on invalid migration types. 2010-02-28 11:53:48 +01:00
S. Christoffer Eliesen
09cb0977d4 Print database.rake errors to stderr.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-27 16:53:40 -08:00
Santiago Pastorino
b25c41e6d8 no more warning interpreted as argument prefix on association_preload.rb 2010-02-26 14:54:10 -08:00
Tobias Bielohlawek
4db72b702f fixed a 'RecordNotFound' bug when calling 'reload' on a object which doesn't 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>
2010-02-26 11:14:16 +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
Jeremy Kemper
f7b0a857e9 Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. 2010-02-25 09:32:29 -08:00
Carlhuda
24ab5665b2 Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818.

This commit broke tests. You cannot have a file called "bundler" on the load path.
2010-02-23 17:31:17 -08:00
Santiago Pastorino
ee541049fd avoid @lock_value not initialized warning 2010-02-22 14:08:07 -08:00
Santiago Pastorino
2b43021499 avoid @transaction_joinable not initialized warning 2010-02-22 14:07:53 -08:00
Santiago Pastorino
ca92e92ba1 avoid active not initialized warning 2010-02-22 14:07:44 -08:00
José Valim
250c809246 Require persisted? in ActiveModel::Lint and remove new_record? and 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. 2010-02-21 11:12:14 +01:00
José Valim
9dd67fce25 Add to_key and to_param methods to ActiveModel::Conversion. 2010-02-21 09:08:59 +01:00
snusnu
f81c6bc040 AMo #key is now #to_key and CI is probably happy
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.
2010-02-20 20:17:29 -08:00
snusnu
9acd686753 Adds #key and #to_param to the AMo interface
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
2010-02-19 23:31:25 -08:00
José Valim
3f948a0e29 Merge master. 2010-02-17 00:48:04 +01:00
Prem Sichanugrist
f0523f72b4 Rename Rails::Subscriber to Rails::LogSubscriber 2010-02-16 22:36:15 +01:00
Joshua Peek
eec2d301d4 Fix test load paths for those not using bundler 2010-02-15 10:20:11 -06:00
Pratik Naik
dc3cc6c608 Move batch finders to Relation 2010-02-12 22:31:03 +00:00
David Heinemeier Hansson
28fe0c330a Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH] 2010-02-06 13:20:47 -08:00
RomD
f44a0b1d52 fix usage examples and more to use new invocations
Signed-off-by: Carl Lerche <carllerche@mac.com>
2010-02-06 09:51:53 -08:00
Prem Sichanugrist
1d9d9d2d89 Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-06 15:51:44 +01:00
Jeremy Kemper
23ad1eff0d Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS. 2010-02-04 10:08:06 -08:00
David Heinemeier Hansson
dd13874ff6 Merge 2010-02-03 17:31:35 -08:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Jeremy Kemper
9b033d14b2 Merge remote branch 'mikel/master' 2010-02-03 17:03:21 -08:00
SubbaRao Pasupuleti
639e044298 removing , from ,= statement in WrappedDatabaseException constructor
[#3830 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-03 17:02:40 -08:00
Mikel Lindsaar
02ef8d20a1 Adding guard to make sure test database declarations exist before trying to auto create 2010-02-04 11:57:13 +11:00
Mikel Lindsaar
9d65390805 Added encoding qery support for SQLite3 to make rake db:charset work on all databases shipping with Rails 3 2010-02-03 18:06:38 +11:00
Mikel Lindsaar
fbdef7aafe Made rake db:create also create the test database if you are in development mode 2010-02-03 16:39:04 +11:00
Szymon Nowak
17bee0dd2f Change Rails::Generators::Migration protected instance methods to class methods. [#3820 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-02 10:18:48 +01:00
Corey Johnson
f4e5303bcf fixed migration logger bug [#3434 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-02 10:12:07 +01:00
Mikel Lindsaar
d1eed079e1 Merge branch 'master' of git://github.com/rails/rails 2010-02-02 10:51:19 +11:00
Jeremy Kemper
e5ab4b0d07 Convert to class_attribute 2010-02-01 02:02:42 -08:00
Mikel Lindsaar
65ad16568c Updating copyright dates on all licenses 2010-02-01 10:10:53 +11: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