aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
| | | | Maximum wait_timeout on Windows is 2147483
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
|\ | | | | Quote arguments in db:structure:dump for PostgreSQL.
| * Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.Juan M. Cuello2012-05-221-2/+2
| | | | | | | | fixes #5913
* | Synchronize the ConnectionPool#release method to avoid thread safety issues ↵Andrew Selder2012-05-231-10/+12
|/ | | | | | | | | | | | | | | | | | | | [#6464] Fixes #6464 Synchronize the contents of the release method in ConnectionPool due to errors when running in high concurrency environments. Detected invalid hash contents due to unsynchronized modifications with concurrent users org/jruby/RubyHash.java:1356:in `keys' /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a ctive_record/connection_adapters/abstract/connection_pool.rb:294:in `release' /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a ctive_record/connection_adapters/abstract/connection_pool.rb:282:in `checkin'
* Fixes the build break caused by 9ee8528 in #6445.Godfrey Chan2012-05-221-2/+4
| | | | | | | | Ruby 1.8 raises a TypeError when trying to modify a frozen Hash, while Ruby 1.9 raises a RuntimeError instead. Also, Ruby < 1.9.3 uses a lowercase 'hash' in the exception message while Ruby >= 1.9.3 uses an uppercase 'Hash' instead. This commit normalizes those issues in the test case.
* Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-222-1/+13
| | | | | | | | | | | | | | | | | | | | | | This is a 3-2-stable backport for #6420 which was merged into master. Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback.
* Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-212-8/+20
|
* Fix uniqueness validator with `allow_nil: false` also for mysqlPiotr Sarnacki2012-05-191-1/+1
| | | | | MySQL's adapter was changing value for case sensitive comparison. We don't need to do it for `nil`.
* Fix `validates_uniqueness_off :field, :allow_nil => false`Piotr Sarnacki2012-05-192-2/+13
| | | | | | | | | | | | | | | | | | Closes (#5853) Uniqueness validator was not properly checking if there are any existing records, when value was `nil` and column was text type. `nil` was converted to string, which resulted in queries looking like: ```sql SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1 ``` instead of ```sql SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1 ```
* Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
| | | | Synchronize read and modification of @reserved_connections
* Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
| | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* Fix HABTM syntax error in Ruby 1.8.xErnie Miller2012-05-181-2/+2
|
* fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
|
* Perf: Don't load the association for #delete_all.Jon Leighton2012-05-186-9/+48
| | | | | | | | Bug #6289 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
| | | | | | Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* Remove unused private method yaml_fixtures_keyAlexey Muranov2012-05-111-3/+0
|
* Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
| | | | (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490)
* Merge pull request #6221 from ↵Jeremy Kemper2012-05-091-7/+26
|\ | | | | | | | | alexeymuranov/deprecate__instantiate_fixtures__arity Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
| * Remove deprecated use of ::instantiate_fixturesAlexey Muranov2012-05-101-4/+4
| |
| * Deprecate ::instantiate_fixtures unused parameterAlexey Muranov2012-05-101-3/+22
| | | | | | | | | | | | Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true). To be changed in master branch.
* | Merge pull request #6219 from frodsan/fix_buildPiotr Sarnacki2012-05-091-1/+9
|\ \ | | | | | | Fix build - 3.2
| * | Fix buildFrancesco Rodriguez2012-05-091-1/+9
| |/
* / Stop showing deprecations for Ruby 1.8.7 with remove_columnCarlos Antonio da Silva2012-05-092-4/+6
|/ | | | | String is Enumerable in 1.8.7, which means that passing a String to remove_column was generating deprecation warnings during tests.
* Merge pull request #6128 from frodsan/delete_all_limit_32Aaron Patterson2012-05-042-0/+6
|\ | | | | Fix #4979 against 3-2-stable
| * Fix #4979 against 3-2-stable - delete_all raise an error if a limit is providedFrancesco Rodriguez2012-05-022-0/+6
| |
* | Deprecate remove_column with array as an argumentPiotr Sarnacki2012-05-023-0/+19
| |
* | Add release data to Rails 3.2.3Rafael Mendonça França2012-04-301-1/+1
|/
* Add extra order clause to fix failing test on Ruby 1.8.7Carlos Antonio da Silva2012-04-241-1/+1
|
* Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-242-3/+9
|
* Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|
* Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-192-1/+31
| | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
* Removes unneeded caching from ActiveRecord::Base.relationBenedikt Deicke2012-04-191-4/+3
|
* Revert "Revert "Fix #5667. Preloading should ignore scoping.""Benedikt Deicke2012-04-192-2/+9
| | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb
* Adds test to check that circular preloading does not modify Model.unscoped ↵Benedikt Deicke2012-04-193-4/+26
| | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb
* Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-192-2/+6
| | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb
* Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-183-20/+2
| | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.
* Check for nil loggerNorman Clarke2012-04-181-1/+1
|
* Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\ | | | | Remove unused castcode
| * Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
| |
* | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
| |
* | log which config format AR uses to connect withTerence Lee2012-04-031-0/+4
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
|
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\ | | | | Fixing Identity Map when using find select in rails 3.2
| * refactor instantiate method in base, so we remove nesting if's which make ↵Arturo Pie2012-03-292-12/+19
| | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb
| * refactor the checking of the attributes of the record in IdentityMap#add, so ↵Arturo Pie2012-03-292-5/+12
| | | | | | | | it's more readable
| * Do not add record to identity map if the record doesn't have values for all ↵Arturo Pie2012-03-291-1/+1
| | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
| |
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-301-1/+1
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| | |
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:11:53 +0000