aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* updating the changelogAaron Patterson2013-12-021-1/+1
|
* updating changelogsAaron Patterson2013-10-161-1/+1
|
* bumping to 3.2.15Aaron Patterson2013-10-151-1/+1
|
* bumping to rc3Aaron Patterson2013-10-111-1/+1
|
* Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-104-10/+2
| | | | | | | | | This reverts commit ccd11d58910059f07b28cc518dbdad42cbc8ea0c, reversing changes made to 54c05acdba138f3a7a3d44dfc922b0fe4e4cf554. Reason: This caused a regression when the associated record is created in a before_create callback. See https://github.com/rails/rails/pull/12413#issuecomment-25848163
* Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-102-14/+0
| | | | | | | | | | This reverts commit 7ed5bdc834479c39e3b0ad5a38bcffe27983c10d, reversing changes made to 31c79e291f42b1d862df06c552fe002864aae705. Reason: this caused a regression when the associated record is creted in a before_create callback. See https://github.com/rails/rails/pull/12413#issuecomment-25848163
* bumping to rc2Aaron Patterson2013-10-041-1/+1
|
* Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-042-0/+14
| | | | Add inverse of add target
* bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
|
* Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-033-1/+11
|\ | | | | Fix STI scopes using benolee's suggestion. Fixes #11939
| * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-303-1/+11
| |
* | Move set_inverse_instance to association.build_recordArthur Neves2013-09-304-2/+10
| | | | | | | | [fixes #10371]
* | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-263-4/+22
| | | | | | | | | | inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was found on the db.
* | on tests: dont always touch firm on validateArthur Neves2013-09-252-2/+5
| |
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-1/+18
| | | | | | | | | | | | | | Make sure inverse_of is visible on the has_many callbacks Conflicts: activerecord/CHANGELOG.md activerecord/test/models/company.rb
* | Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-123-2/+21
| | | | | | | | | | | | | | | | Fixes table.joins(:relation).last(N) breaking on sqlite Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb
* | on SchemaCache use the connection getter instead of the obj givenArthur Neves2013-09-091-2/+2
|/
* Load fixtures from linked foldersKassio Borges2013-08-054-3/+8
|
* Fix broken testRafael Mendonça França2013-07-241-1/+1
| | | | quote_value is called on the object not the class
* Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-242-3/+3
| | | | | | | | | | This includes fixing typos in changelog, removing a deprecated mocha/setup test require, and preferring the `column_for_attribute` accessor over direct access to the columns_hash in the new code. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb
* Specified column type for quote_valueAlfred Wong2013-07-243-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | When calling quote_value the underlying connection sometimes requires more information about the column to properly return the correct quoted value. I ran into this issue when using optimistic locking in JRuby and the activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to insert a integer into a NVARCHAR column type so we need to format it as N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without the column type being passed the connection adapter cannot properly return the correct quote value because it doesn't know to return N'3' or '3'. This patch is fairly straight forward where it just passes in the column type into the quote_value, as it already has the ability to take in the column, so it can properly handle at the connection level. I've added the tests required to make sure that the quote_value method is being passed the column type so that the underlying connection can determine how to quote the value. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb
* Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
| | | | This is reworking of rails/rails/pull/7380 made for rails 3.
* Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
|
* Update CHANGELOG entryRafael Mendonça França2013-07-221-4/+1
|
* Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-162-3/+3
|
* Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
|
* Merge pull request #11451 from ↵Yves Senn2013-07-153-0/+18
| | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object Conflicts: activerecord/lib/active_record/autosave_association.rb
* Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-122-3/+3
|
* Do not shallow the original exception in exec_cacheRafael Mendonça França2013-07-092-1/+11
| | | | | | | when result_error_field is not defined on result raise the original exception. Fixes #11260
* Add license to the gemspecRafael Mendonça França2013-07-081-0/+2
|
* Skip connection url test when the machine is using socket configuration.Rafael Mendonça França2013-07-061-0/+3
| | | | The connection url parssing don't accept the socket option
* Merge pull request #11019 from tkhr/test_case_for_issue_10393Yves Senn2013-06-253-1/+29
|\ | | | | Add test case for issue #10393 and fix warning message
| * Allow global override of default STI inheritance columnchapmajs2013-06-263-1/+29
| | | | | | | | | | | | This change fixes a bug by which 3.2-STABLE users can't globally override the default STI inheritance column with `ActiveRecord::Base.inheritance_column = 'some_column'`. 3.2-STABLE users are forced to use a deprecated method or monkey patch it otherwise. Test case written by tkhr <takehiro0740@gmail.com>.
* | build fix, fall back to old hash syntaxYves Senn2013-06-261-3/+3
|/
* Merge pull request #9893 from ↵Yves Senn2013-06-251-0/+13
|\ | | | | | | | | JonRowe/add_test_to_assert_association_doesnt_overwrite Add a test to assert autosaving associations doesn't overwrite id accessor methods
| * test case to assert that associations do not overwrite after create, fixes #9310Jon Rowe2013-03-241-0/+13
| |
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-06-251-5/+6
| |
* | Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-253-1/+13
|\ \ | | | | | | | | | Fix a bug in ActiveRecord::Store accessors
| * | Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-293-1/+13
| | |
* | | Revert "Revert "Merge pull request #10901 from ↵Yves Senn2013-06-253-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader"" This reverts commit 5009b078875e596a2fba7827336f7548aa6e35ac. Also updated the CHANGELOG and adjusted the test-case to match the one on master.
* | | Revert "Merge pull request #10901 from ↵Yves Senn2013-06-223-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader" This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07. I missed to check the target branch and wrongly merged it into 3-2-stable directly.
* | | Merge pull request #10901 from ↵Yves Senn2013-06-223-1/+34
|\ \ \ | | | | | | | | | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
| * | | Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-213-1/+34
| | | |
* | | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+35
|/ / / | | | | | | | | | | | | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed. Conflicts: activerecord/CHANGELOG.md
* | | adding a test for #10830Aaron Patterson2013-06-051-0/+46
| | |
* | | Restore rescue block for when IM is enabledAndrew White2013-05-241-19/+22
| | |
* | | It's scoped in 3-2-stable!Arun Agrawal2013-05-241-1/+1
| | | | | | | | | scope => scoped
* | | Using 1.8.7 syntax for 3-2-stableArun Agrawal2013-05-243-6/+6
| | |
* | | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
| | | | | | | | | | | | | | | | | | | | | Fix the `:primary_key` option for `has_many` associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/has_many_association.rb
* | | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-183-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of #10417 fixes bug introduced by #3329 These are the conditions necessary to reproduce the bug: - For an association, autosave => true. - An association record is being destroyed - A new association record is being created. - There is a unique index one of the association's fields. - The record being created has the same value as the record being destroyed on the indexed field. Before, the deletion of records was postponed until after all insertions/saves. Therefore the new record with the identical value in the indexed field caused a non-unique value error to be thrown at the database level. With this fix, the deletions happen first, before the insertions/saves. Therefore the record with the duplicate value is gone from the database before the new record is created, thereby avoiding the non-uniuqe value error.