aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* fix typo in collection proxyAccessd2012-07-311-1/+1
|
* AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-312-3/+3
| | | | | | | User.order("name asc").order("created_at desc") # SELECT * FROM users ORDER BY created_at desc, name asc This also affects order defined in `default_scope` or any kind of associations.
* Remove the deprecation of update_column.Rafael Mendonça França2012-07-301-5/+0
| | | | | | update_column was suggested as replacement of update_attribute at the last release of 3-2-stable, so deprecating it now will confuse the users.
* Explaining a bit better about the default behaviour of dependentRodrigo Flores2012-07-281-1/+2
|
* removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
| | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale.
* Merge pull request #7185 from route/reset_table_name_refactoringRafael Mendonça França2012-07-281-8/+4
|\ | | | | Refactor to reset_table_name
| * Refactor to reset_table_nameDmitry Vorotilin2012-07-281-8/+4
| |
* | missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
|/ | | | | | | | This require makes the dependency even more clear. In particular we are eager loading the session store but that does not work if AR is used outside Rails, this patch is preliminary work in fixing #7160.
* Revert "Removing composed_of from ActiveRecord."Rafael Mendonça França2012-07-2710-9/+343
| | | | | | | | | | | This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592. Reason: we need to discuss a better path from this removal. Conflicts: activerecord/lib/active_record/reflection.rb activerecord/test/cases/base_test.rb activerecord/test/models/developer.rb
* Merge pull request #6827 from zephyr-dev/masterJosé Valim2012-07-272-0/+65
|\ | | | | Validates_presence_of associated object marked for destruction
| * AR has a subclass of AM:PresenceValidator.Brent Wheeldon & Nick Monje2012-07-202-0/+65
| | | | | | | | | | | | | | This allows us to mark the parent object as invalid if all associated objects in a presence validated association are marked for destruction. See: https://github.com/rails/rails/issues/6812
* | Changelog and doc updates for the previous changes.Jon Leighton2012-07-271-6/+6
| |
* | Deprecate Relation#all.Jon Leighton2012-07-274-17/+4
| | | | | | | | | | | | It has been moved to active_record_deprecated_finders. Use #to_a instead.
* | Deprecate ActiveRecord::Base.scoped.Jon Leighton2012-07-275-13/+5
| | | | | | | | | | | | | | It doesn't serve much purpose now that ActiveRecord::Base.all returns a Relation. The code is moved to active_record_deprecated_finders.
* | ActiveRecord::Base.all returns a Relation.Jon Leighton2012-07-272-18/+15
| | | | | | | | | | | | | | | | | | | | | | Previously it returned an Array. If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This is more explicit. In most cases this should not break existing code, since Relations use method_missing to delegate unknown methods to #to_a anyway.
* | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | `:rails_env` tasks is not needed in all the tasks that depends of `load_config`, only in the tasks that uses `Rails.env`. Since `:rails_env` task set the `Rails.env` to be "development" if it is not set we don't need the `||` statements too Fix #7175. Conflicts: activerecord/lib/active_record/railties/databases.rake
* | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-261-18/+15
| | | | | | | | | | | | | | | | | | Moved logic from class_of_active_record_descendant(class) to the base_class method. This method was confusing because it required an argument, but that argument was 'self'. Moved base_class tests to inheritance_test.rb and added some test coverage for some untested cases.
* | Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
| |
* | Merge pull request #7161 from ↵Jon Leighton2012-07-261-5/+7
|\ \ | | | | | | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers
| * | Eager autoload ActiveRecord association helpersMichael Fairley2012-07-251-5/+7
| | |
* | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-251-1/+2
|\ \ \ | | | | | | | | Postgresql auto reconnect 2
| * | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-161-0/+1
| | | |
| * | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass
* | | | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-242-4/+9
| | | | | | | | | | | | | | | | Closes #1190
* | | | Use update_columns to implemente the update_columnRafael Mendonça França2012-07-241-17/+18
| | | |
* | | | New #update_columns method.Sebastian Martinez2012-07-241-0/+17
| | | |
* | | | Restore connection_id on error.kennyj2012-07-231-4/+10
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-217-27/+108
|\ \ \ \
| * | | | improve NullRelation docs [ci skip]Vijay Dev2012-07-212-5/+4
| | | | |
| * | | | minor copy edits [ci skip]Vijay Dev2012-07-212-4/+2
| | | | |
| * | | | Fix typosOscar Del Ben2012-07-191-3/+3
| | | | |
| * | | | Add nodocs to delegation module and docs for merge!Oscar Del Ben2012-07-172-1/+2
| | | | |
| * | | | Update batches docsOscar Del Ben2012-07-171-6/+6
| | | | |
| * | | | Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
| | | | |
| * | | | Fix typos and add nodocs to NullRelationOscar Del Ben2012-07-172-4/+4
| | | | |
| * | | | Improve docs for AR RelationOscar Del Ben2012-07-171-7/+19
| | | | |
| * | | | Add docs for Relation initialize, create and create!Oscar Del Ben2012-07-161-1/+34
| | | | |
| * | | | Don't link to edgeguides in docsOscar Del Ben2012-07-161-1/+1
| | | | |
| * | | | TypoOscar Del Ben2012-07-161-1/+0
| | | | |
| * | | | Add documentation for query_methods bang methodsOscar Del Ben2012-07-161-1/+20
| | | | |
| * | | | Add nodoc to create_with_valueOscar Del Ben2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reason: all *_value methods are defined dynamically and so don't appear in the documentation.
| * | | | Add documentation for arel and build_arelOscar Del Ben2012-07-161-0/+2
| | | | |
| * | | | Add documentation for create_withOscar Del Ben2012-07-161-1/+19
| | | | |
* | | | | remove unused methodJon Leighton2012-07-201-4/+0
| | | | |
* | | | | we don't need this argJon Leighton2012-07-201-2/+2
| | | | |
* | | | | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-208-142/+35
| | | | |
* | | | | Remove obsolete line.Jon Leighton2012-07-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is broken (it should say association_scope.uniq_value rather than options[:uniq]) but the tests still pass. I think it is designed to uniq-ify associations using finder_sql. However, I am about to remove that anyway.
* | | | | Convert association macros to the new syntaxJon Leighton2012-07-201-1/+1
| | | | |
* | | | | Avoid options ever being nilJon Leighton2012-07-202-8/+8
| | | | | | | | | | | | | | | | | | | | This fixes active_record_deprecated_finders.
* | | | | Merge pull request #7078 from kennyj/logging_query_planRafael Mendonça França2012-07-191-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Log query plan when we use count_by_sql method.