aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-211-16/+36
| | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
* Fix some warnings on 3-2-stablekennyj2012-02-211-1/+1
|
* Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redoJosé Valim2012-02-141-1/+4
| | | | Always reenable _dump task in AR databases rake. Closes #5030
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output. Conflicts: activerecord/test/cases/migration/index_test.rb Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-072-0/+10
| | | | | | Conflicts: activerecord/lib/active_record/core.rb
* no need to check for this constantXavier Noria2012-02-071-1/+1
|
* Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
|
* let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-031-1/+4
|
* Fix Issue #4819densya2032012-02-041-1/+1
| | | | | | 'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1' Just a typo of 'ActiveSupport::...'
* Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-021-16/+1
| | | | Fix for SQLite binary data corrupter (to master branch)
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-011-2/+1
| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
* Improve deprecation messageJon Leighton2012-01-311-7/+17
|
* Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-311-1/+1
| | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
* Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-311-4/+7
|
* Add workaround and deprecation if the inherited hook is not executed. Closes ↵Jon Leighton2012-01-311-0/+12
| | | | #4757.
* Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-311-1/+1
| | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
* query cache instrumentation should included the bindings in the payload ↵Xavier Noria2012-01-301-1/+1
| | | | [closes #4750]
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-271-1/+1
| | | | Fix regression from Rails 3.1
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-261-0/+2
|
* call to_s on value passed to table_name=Sergey Nartimov2012-01-261-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix another race condition.Jon Leighton2012-01-202-6/+10
| | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb
* Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-201-1/+1
|
* Merge pull request #4531 from exviva/pessimistic_with_lockAaron Patterson2012-01-191-0/+22
| | | | Add ActiveRecord::Base#with_lock
* select doesn't take multiple arguments - fixes #4539 [ci skip]Vijay Dev2012-01-191-2/+2
| | | | | Didn't cherry pick the master commit because this one already had some of the fixes made in master.
* Merge pull request #4487 from sarenji/fix-reset-countersAaron Patterson2012-01-171-1/+2
| | | | Fix bug where reset_counters resets the wrong counter cache.
* Fix race condition :bomb:Jon Leighton2012-01-131-4/+11
|
* Fix table_name in ActiveRecord with more than one abstract ancestorsPiotr Sarnacki2012-01-121-3/+7
| | | | | | | | | | | | | | | | | When subclassing abstract_class table_name should be always computed based on class name, no matter if superclass is subclassing base or another abstract_class. So: class FirstAbstract < ActiveRecord::Base self.abstract_class = true end class SecondAbstract < FirstAbstract self.abstract_class = true end class Post < SecondAbstract self.table_name #=> 'posts' (not 'second_abstracts') end
* fixes in api docsVijay Dev2012-01-131-1/+1
|
* on and ON are type casted to a true boolean columnSantiago Pastorino2012-01-111-2/+2
|
* add documentation explaining reorder behaviorMatt Jones2012-01-111-0/+10
|
* Merge pull request #4408 from tomstuart/read-and-write-attribute-aliasesSantiago Pastorino2012-01-111-4/+6
| | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute
* FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb:Aaron Patterson2012-01-101-3/+0
|
* deprecate the subdirectories parameter to `migrations`Aaron Patterson2012-01-101-2/+13
| | | | | | Conflicts: activerecord/lib/active_record/migration.rb
* Bump to rc2Santiago Pastorino2012-01-041-1/+1
|
* Merge pull request #4282 from edgecase/order_after_reorderAaron Patterson2012-01-044-8/+18
| | | | correctly handle order calls after a reorder
* Fix GH #4285. Remove options when we record calling creat_tablekennyj2012-01-041-1/+1
|
* deprecate ActiveSupport::Base64Sergey Nartimov2012-01-031-4/+4
| | | | extend and define ::Base64 if needed
* Document that index names are made up of all columns, not just the first.Jo Liss2011-12-291-9/+2
| | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed.
* Remove unnecessary comma.Uģis Ozols2011-12-291-1/+1
|
* Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_idsAaron Patterson2011-12-281-1/+1
| | | | allow reorder to affect eager loading correctly
* app code in general wants Time.current, not Time.nowXavier Noria2011-12-281-3/+3
|
* Remove empty line.Marcos Tapajós2011-12-281-1/+0
|
* Closes #4208Marcos Tapajós2011-12-271-2/+3
|
* Reconnect to the first database after db:createTsutomu Kuroda2011-12-251-0/+1
| | | | | Otherwise, the schema and seed will be loaded onto the test database.
* Fix situation where id method didn't get defined causing postgres to failJon Leighton2011-12-231-4/+3
|
* Doh, remove debugging lineJon Leighton2011-12-231-1/+0
|
* Fix #4046.Jon Leighton2011-12-232-46/+36
|
* Fix build when IM=trueJon Leighton2011-12-231-4/+3
|
* Make ActiveRecord::Relation#pluck work with serialized attributesJon Leighton2011-12-221-4/+4
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:08:13 +0000