aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* updating the changelogAaron Patterson2013-12-021-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-102-1/+1
| | | | | | | | | 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-101-1/+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-041-0/+1
| | | | 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-031-1/+1
|\ | | | | Fix STI scopes using benolee's suggestion. Fixes #11939
| * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-301-1/+1
| |
* | Move set_inverse_instance to association.build_recordArthur Neves2013-09-302-1/+1
| | | | | | | | [fixes #10371]
* | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-261-4/+6
| | | | | | | | | | inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was found on the db.
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-251-0/+1
| | | | | | | | | | | | | | 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-121-2/+2
| | | | | | | | | | | | | | | | 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-051-2/+2
|
* Specified column type for quote_valueAlfred Wong2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+3
| | | | 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
|
* Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-161-1/+1
|
* Merge pull request #11451 from ↵Yves Senn2013-07-151-0/+2
| | | | | | | | 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-121-2/+2
|
* Do not shallow the original exception in exec_cacheRafael Mendonça França2013-07-091-1/+5
| | | | | | | when result_error_field is not defined on result raise the original exception. Fixes #11260
* Allow global override of default STI inheritance columnchapmajs2013-06-261-1/+1
| | | | | | 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>.
* Merge pull request #10373 from janko-m/fix-store-accessorCarlos Antonio da Silva2013-06-251-1/+1
|\ | | | | | | Fix a bug in ActiveRecord::Store accessors
| * Fix ActiveRecord::Store not tracking changesJanko Marohnić2013-04-291-1/+1
| |
* | Revert "Revert "Merge pull request #10901 from ↵Yves Senn2013-06-251-1/+1
| | | | | | | | | | | | | | | | 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-221-1/+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-221-1/+1
|\ \ | | | | | | | | | | | | 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-211-1/+1
| | |
* | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-151-3/+5
|/ / | | | | | | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed. Conflicts: activerecord/CHANGELOG.md
* | 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
* | 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. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/has_many_association.rb
* | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-181-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Backport a super-simplified version of #6792, fixingBen Woosley2013-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT" The combination of a :uniq => true association and the #distinct call in #construct_limited_ids_condition combine to create invalid SQL, because we're explicitly selecting DISTINCT, and also sending #distinct on to AREL, via the relation#distinct_value. Where #6792 was the forever fix, this is the minimal fix. Instead of properly indicating the distinctness of the query through #uniq_value alone, we use a literal select statement and set #uniq_value to always be falsey
* | Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-121-0/+6
|\ \ | | | | | | | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * | backport runner fixes to 3-2-stablekennyj2012-12-161-0/+6
| | | | | | | | | | | | | | | | | | | | | Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61.
* | | Preserve context for joins while merging relationsAndrew Horner2013-05-113-3/+34
| | | | | | | | | | | | | | | | | | This is a backport of #10164, already merged into master. The issue is described in lengthy detail in issues #3002 and #5494.
* | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-121-1/+1
| | | | | | | | | | | | Now with a non-broken test.
* | | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | Reason: This was backported, but the test does not pass as is. This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77.
* | | Using map. No need to run query againArun Agrawal2013-05-101-1/+1
| | |
* | | Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-101-1/+1
|\ \ \ | | | | | | | | Don't try to EXPLAIN select_db calls
| * | | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-101-1/+1
| | |/ | |/|
* | | Fixed pluck to be working with selects.Arun Agrawal2013-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9777 for details. Previously pluck is not returning what we wanted to Added a test also to make sure it's working fine. This will also fix the build for 1.8.7 as we were doing some sort on hash. Thanks @pixeltrix for helping me out. Thanks @linduxed for pairing with me.
* | | Remove useless elseArun Agrawal2013-05-101-3/+0
| | |
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb Reason: This caused a regression since it changed the behavior in a stable release. Fixes #9777
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-061-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/belongs_to.rb
* | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
| | | | | | | | | | | | Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). Align indentation in comments.
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-111-1/+1
| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 23:24:15 +0000