aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-231-2/+1
|\ | | | | Fix the `:primary_key` option for `has_many` associations.
| * Fix the `:primary_key` option for `has_many` associations.Yves Senn2013-05-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing records from a `has_many` association it used the `primary_key` defined on the association. Our test suite didn't fail because on all occurences of `:primary_key`, the specified column was available in both tables. This prevented the code from raising an exception but it still behaved badly. I added a test-case to prevent regressions that failed with: ``` 1) Error: HasManyAssociationsTest#test_has_many_assignment_with_custom_primary_key: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: essays.first_name: UPDATE "essays" SET "writer_id" = NULL WHERE "essays"."writer_id" = ? AND "essays"."first_name" IS NULL ```
* | deprecate Validator#setup (to get rid of a respond_to call). validators do ↵Nick Sutterer2013-05-231-6/+1
|/ | | | their setup in their constructor now.
* remove code duplicationNeeraj Singh2013-05-221-2/+3
|
* reverse comparison because of strange AS behaviorAaron Patterson2013-05-211-1/+1
| | | | http://tenderlovemaking.com/2013/05/21/one-danger-of-freedom-patches.html
* just set the default argument, a nil parent should be an errorAaron Patterson2013-05-211-2/+1
|
* fold the collection rather than multiple assigmentsAaron Patterson2013-05-211-3/+2
|
* use drop rather than calculate the array lengthAaron Patterson2013-05-211-1/+1
|
* Merge branch 'bindwhere'Aaron Patterson2013-05-211-20/+20
|\ | | | | | | | | | | | | | | | | * bindwhere: avoid creating a set if no where values are removed remove bind values for where clauses that were removed push partitioning up so bind elimination can get the removed wheres push partion logic down and initialization logic up partition the where values so we can access the removed ones
| * avoid creating a set if no where values are removedAaron Patterson2013-05-211-0/+2
| |
| * remove bind values for where clauses that were removedAaron Patterson2013-05-211-9/+8
| |
| * push partitioning up so bind elimination can get the removed wheresAaron Patterson2013-05-211-5/+3
| |
| * push partion logic down and initialization logic upAaron Patterson2013-05-211-15/+11
| |
| * partition the where values so we can access the removed onesAaron Patterson2013-05-201-1/+6
| |
* | the rake task `db:test:prepare` needs to load the configurationYves Senn2013-05-211-1/+1
|/ | | | Without loading the configuration the task will not perform any work.
* eliminate some conditionalsAaron Patterson2013-05-201-3/+3
|
* change method name to reflect what it actually does.Aaron Patterson2013-05-201-2/+2
|
* save the where values in variables so we don't need to look them up allAaron Patterson2013-05-201-4/+5
| | | | the time
* pass where values to the helper function rather than rely on internal stateAaron Patterson2013-05-201-4/+4
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-196-10/+38
|\
| * copy edits[ci skip]Vijay Dev2013-05-191-11/+8
| |
| * Added some more documentation for define_readers and define_writer of the ↵aditya-kapoor2013-05-153-0/+15
| | | | | | | | Association and its inherited classes
| * Added some more documentation for ↵aditya-kapoor2013-05-151-0/+11
| | | | | | | | ActiveRecord::Associations::Builder::Association class
| * Added documentation for ActiveRecord::Associations::Builder::Association classaditya-kapoor2013-05-151-0/+4
| |
| * improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip]Anton Kalyaev2013-05-141-3/+4
| |
| * emphasize that callbacks are called in destroy_allNeeraj Singh2013-05-132-7/+7
| | | | | | | | | | | | | | Cleaned up rdoc a bit emphasizing that callbacks are called. Also removed the stress on the fact that records are always removed. If callbacks return false then records will not be deleted.
* | stop swallowing exceptions in assert_queries. Methods that raise anAaron Patterson2013-05-171-2/+2
| | | | | | | | | | exception are unlikely to pass this assertion, but since the assertions raise an exception, the original exception is lost.
* | stop doing assingments in an iteratorAaron Patterson2013-05-171-2/+6
| |
* | include bind values from the default scopeAaron Patterson2013-05-171-2/+4
| |
* | let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| |
* | Add more data to AR::UnknownAttributeErrorBogdan Gusiev2013-05-162-1/+10
| | | | | | | | | | | | | | | | | | begin Topic.new("hello" => "world") rescue ActiveRecord::UnknownAttributeError => e e.record # => #<Topic ... > e.attribute # => "hello" end
* | Merge pull request #10619 from alno/top_level_array_in_postgres_jsonAaron Patterson2013-05-162-1/+3
|\ \ | | | | | | Support array as root element in Postgresql JSON columns
| * | Support array as root element in JSONAlexey Noskov2013-05-142-1/+3
| | |
* | | Check if APP_RAKEFILE is definedPiotr Sarnacki2013-05-161-1/+1
| | |
* | | Fix detection of engine in rake db:load_configJoel Cogen2013-05-161-1/+1
| | | | | | | | | | | | Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
* | | tiny types should only be integers when the length is <= 1. fixes #10620Aaron Patterson2013-05-151-3/+9
| | |
* | | require things we needAaron Patterson2013-05-151-0/+1
| | |
* | | Also support extensions in PostgreSQL 9.1, because this has been supported ↵kennyj2013-05-151-4/+4
| | | | | | | | | | | | since 9.1.
* | | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
|/ /
* | Merge pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-121-1/+2
| | | | | | | | | | | | Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc. Conflicts: activerecord/CHANGELOG.md
* | Some editorial changes on the documentation.Rafael Mendonça França2013-05-122-27/+27
|/ | | | | | | | * Remove some autolinks * Fix the rendered result * Change sql to SQL [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-123-4/+8
|\ | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| |
| * Added documentation for ActiveRecord::Base#next_migration_numberaditya-kapoor2013-05-091-0/+5
| |
| * minor rdoc cleanup for reflection methodsNeeraj Singh2013-05-091-4/+4
| |
| * added to rdoc for unscope that default_scope winsNeeraj Singh2013-05-031-0/+3
| |
* | Adding documentation to the automatic inverse_of finder.wangjohn2013-05-112-1/+22
| |
* | Call assume_migrated_upto_version on connectionKyle Stevens2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | Call assume_migrated_upto_version on connection to prevent it from first being picked up in method_missing. In the base class, Migration, method_missing expects the argument to be a table name, and calls proper_table_name on the arguments before sending to connection. If table_name_prefix or table_name_suffix is used, the schema version changes to prefix_version_suffix, breaking `rake test:prepare`. Fixes #10411.
* | Merge pull request #10567 from ↵Rafael Mendonça França2013-05-111-1/+2
|\ \ | | | | | | | | | | | | neerajdotname/read_attribute_before_type_cast_should_accept_symbol read_attribute_before_type_cast should accept symbol
| * | read_attribute_before_type_cast should accept symbolNeeraj Singh2013-05-111-1/+2
| | |