aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #10183 from jholton/fix_association_auto_save"Jon Leighton2013-04-193-29/+9
| | | | | | | This reverts commit e8727d37fc49d5bf9976c3cb5c46badb92cf4ced, reversing changes made to d098e1c24bc145e0cc14532348436e14dc46d375. Reason: it broke the mysql build
* destroys association records before saving/inserting new association recordsJohnny Holton2013-04-193-9/+29
| | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #10264 from cconstantine/masterRafael Mendonça França2013-04-192-1/+7
|\ | | | | Postgresql array columns don't properly escape single quote strings when loading fixtures
| * Fix loading of fixtures when the column type is a postgres array of strings.Chris Constantine2013-04-182-1/+7
| | | | | | | | - A string in an array of strings that has a quote char (') needs to have that quote char escaped if the array is getting wrapped in quote chars.
* | Improve the error messageRafael Mendonça França2013-04-192-2/+2
| |
* | Merge pull request #10217 from mirasrael/make-migrator-run-transactional-4.0Rafael Mendonça França2013-04-193-5/+42
|\ \ | | | | | | | | | | | | | | | | | | Support transactions in Migrator.run Conflicts: activerecord/CHANGELOG.md
| * | Support transactions in Migrator.runbondarev2013-04-183-5/+42
| | |
* | | Merge pull request #10200 from ↵Jon Leighton2013-04-192-2/+11
|\ \ \ | |_|/ |/| | | | | | | | calebthompson/ct-fix-freeze-freezing-cloned-models Fix freeze applying to cloned objects
| * | Fix freeze applying to cloned objectsCaleb Thompson2013-04-152-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, freezing a cloned ActiveRecord object froze the original too. By cloning `@attributes` before freezing, we prevent cloned objects (which in Ruby share state of ivars) from being effected by `#freeze`. Resolves issue #4936, which has further information on this issue, as well as steps to reproduce. * Add a test case for `#freeze` not causing `cloned.frozen?` to be true. * Clone @attributes before freezing in `ActiveRecord::Core`, then reassign the cloned, frozen hash to the frozen model's `@attributes` ivar. /cc @steveklabnik
* | | Revert "Merge pull request #10043 from cconstantine/master"Rafael Mendonça França2013-04-182-21/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1. Reason: This broke the tests
* | | Bump arel to 4.0.0Rafael Mendonça França2013-04-181-1/+1
| | |
* | | Merge pull request #10043 from cconstantine/masterRafael Mendonça França2013-04-182-0/+21
|\ \ \ | | | | | | | | DB with postgres string array column doesn't load fixtures well
| * | | Fix loading of string arrays in postgresChris Constantine2013-04-082-0/+21
| | | |
* | | | Merge pull request #10258 from thenickcox/pending_migrations_pluralRafael Mendonça França2013-04-181-3/+3
|\ \ \ \ | | | | | | | | | | Fix subject-verb agreement in error msg (and other grammar stuff)
| * | | | Fix subject-verb agreement in error msg (and other grammar stuff)thenickcox2013-04-171-3/+3
| | | | |
* | | | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :throughRafael Mendonça França2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | associations
* | | | | add :nodoc: mark to *Registry classes [ci skip]Francesco Rodriguez2013-04-172-4/+4
| | | | |
* | | | | Bump activerecord-deprecated_finders to 1.0.0Rafael Mendonça França2013-04-171-1/+1
| | | | |
* | | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria]Xavier Noria2013-04-165-46/+70
| | | | | | | | | | | | | | | | | | | | Closes #10198.
* | | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into ↵kennyj2013-04-173-3/+15
| | | | | | | | | | | | | | | | | | | | bit column in Postgresql, because solving ambiguity.
* | | | | Fixed typos in AR CHANGELOGPrathamesh Sonpatki2013-04-161-4/+4
| | | | |
* | | | | Use db:test:load instead of db:test:load_schemaPiotr Sarnacki2013-04-161-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | db:test:load task should be favored over db:test:load_schema, because it checks for chosen format (ActiveRecord::Base.schema_format). closes #10227
* | | | Add OID::Bit for supporting bit string.kennyj2013-04-162-2/+19
| | | |
* | | | Revert "fixing bit string test"kennyj2013-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cdd293cb963b895ff580eb20d10f5d56ecb3d447. Reason: This wasn't properly fix.
* | | | Merge pull request #10214 from mattetti/ar_postgres_byteaRafael Mendonça França2013-04-152-0/+88
|\ \ \ \ | | | | | | | | | | AR postgres binary bug fix
| * | | | fix for the bytea/binary nil value bugMatt Aimonetti2013-04-142-1/+2
| | | | |
| * | | | added a test suite for the postgres binary typeMatt Aimonetti2013-04-141-0/+87
| | |_|/ | |/| | | | | | | | | | this shows a problem with nil values
* / | | Document collection.create! on has_many associations in ActiveRecordMario Visic2013-04-151-0/+4
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-132-7/+7
|\ \ \
| * | | fix :nodoc: mark on AR::AttributeMethods::Serialization [ci skip]Francesco Rodriguez2013-04-121-2/+2
| | | |
| * | | minor edit on StatementCache documentation [ci skip]Francesco Rodriguez2013-04-121-1/+1
| | | |
| * | | Fix StatementCache docs format [ci skip]Francesco Rodriguez2013-04-111-5/+5
| | | |
* | | | hides the per thread registry instance, and caches singleton methodsXavier Noria2013-04-132-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code was delegating to the instance with delegate macro calls, or invoking the instance method to reach the object and call its instance methods. But the point is to have a clean class-level interface where the thread local instance is hidden in the implementation. References #11c6973. References #10198.
* | | | removes calls to AR::Runtime.instanceXavier Noria2013-04-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Registries have class-level accessors to write clean code, let's use them. This makes style uniform also with existing usage in ScopeRegistry and InstrumentationRegistry. If performance of the method_missing callback was ever considered to be a concern, then we should stop using it altogether and probably remove the callback. But while we have the feature we should use it.
* | | | simplifies the RDoc of AR::RuntimeRegistryXavier Noria2013-04-131-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version was kind of duplicating the documentation of AS::PerThreadRegistry. Just say how to use it, the thread locals registry is know part of our vocabulary (though a pointer to Active Support is added for reference).
* | | | complete rewrite of the documentation of AS::PerThreadRegistryXavier Noria2013-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It focuses on how to use it. * Removes some ambigueties in the original docs about whether the state is stored in the class. * Documents it provides class-level accessors via method_missing. * Documents that if the extended class has an initializer, it must accept no arguments.
* | | | use unified and clean formatting in CHANGELOGS. [ci skip]Yves Senn2013-04-121-9/+9
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-117-8/+19
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: guides/source/action_mailer_basics.md
| * | | JoinPart is no longer an abstract classNeeraj Singh2013-04-081-1/+1
| | | |
| * | | update ActiveRecord::AttributeMethods::Serialization documentation [ci skip]Francesco Rodriguez2013-04-041-0/+7
| | | |
| * | | mark ReversibleBlockHelper as :nodoc: [ci skip]Francesco Rodriguez2013-04-041-1/+1
| | | |
| * | | mark relation mutator as :nodoc: [ci skip]Francesco Rodriguez2013-04-021-2/+1
| | | |
| * | | minor copy editingNeeraj Singh2013-03-303-4/+9
| | | |
* | | | Switched to new naming conventionsNoemj2013-04-112-4/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #10177 from ↵Carlos Antonio da Silva2013-04-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yahonda/test_relation_merging_with_merged_joins_oracle Address ORA-00979: not a GROUP BY expression error
| * | | | Address ORA-00979: not a GROUP BY expression errorYasuo Honda2013-04-111-1/+1
| | | | |
* | | | | cleanup statement cache testVipul A M2013-04-111-4/+4
|/ / / /
* | | | Remove warningCarlos Antonio da Silva2013-04-101-2/+2
| | | | | | | | | | | | | | | | warning: `*' interpreted as argument prefix
* | | | Merge pull request #10152 from Noemj/statement_cacheRafael Mendonça França2013-04-104-0/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statement cache Conflicts: activerecord/CHANGELOG.md
| * | | | Added statement cacheNoemj2013-04-104-0/+108
| | | | |