Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo | José Valim | 2012-02-14 | 1 | -1/+4 |
| | | | | Always reenable _dump task in AR databases rake. Closes #5030 | ||||
* | Handle nil in add_index :length option in MySQL | Paul Sadauskas | 2012-02-08 | 1 | -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 Leighton | 2012-02-07 | 2 | -0/+10 |
| | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
* | no need to check for this constant | Xavier Noria | 2012-02-07 | 1 | -1/+1 |
| | |||||
* | Fixed the documenation for 'to_xml' | Markus Fenske | 2012-02-07 | 1 | -1/+2 |
| | |||||
* | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 1 | -1/+4 |
| | |||||
* | Fix Issue #4819 | densya203 | 2012-02-04 | 1 | -1/+1 |
| | | | | | | 'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1' Just a typo of 'ActiveSupport::...' | ||||
* | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-02 | 1 | -16/+1 |
| | | | | Fix for SQLite binary data corrupter (to master branch) | ||||
* | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 1 | -2/+1 |
| | | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by | ||||
* | Improve deprecation message | Jon Leighton | 2012-01-31 | 1 | -7/+17 |
| | |||||
* | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 1 | -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 Leighton | 2012-01-31 | 1 | -4/+7 |
| | |||||
* | Add workaround and deprecation if the inherited hook is not executed. Closes ↵ | Jon Leighton | 2012-01-31 | 1 | -0/+12 |
| | | | | #4757. | ||||
* | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 1 | -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 Noria | 2012-01-30 | 1 | -1/+1 |
| | | | | [closes #4750] | ||||
* | Merge pull request #4715 from pwim/find-create-multi-args | Jon Leighton | 2012-01-27 | 1 | -1/+1 |
| | | | | Fix regression from Rails 3.1 | ||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | disable automatic explain if there is no logger [closes #4671] | Xavier Noria | 2012-01-26 | 1 | -0/+2 |
| | |||||
* | call to_s on value passed to table_name= | Sergey Nartimov | 2012-01-26 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix another race condition. | Jon Leighton | 2012-01-20 | 2 | -6/+10 |
| | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb | ||||
* | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 1 | -0/+22 |
| | | | | Add ActiveRecord::Base#with_lock | ||||
* | select doesn't take multiple arguments - fixes #4539 [ci skip] | Vijay Dev | 2012-01-19 | 1 | -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-counters | Aaron Patterson | 2012-01-17 | 1 | -1/+2 |
| | | | | Fix bug where reset_counters resets the wrong counter cache. | ||||
* | Fix race condition :bomb: | Jon Leighton | 2012-01-13 | 1 | -4/+11 |
| | |||||
* | Fix table_name in ActiveRecord with more than one abstract ancestors | Piotr Sarnacki | 2012-01-12 | 1 | -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 docs | Vijay Dev | 2012-01-13 | 1 | -1/+1 |
| | |||||
* | on and ON are type casted to a true boolean column | Santiago Pastorino | 2012-01-11 | 1 | -2/+2 |
| | |||||
* | add documentation explaining reorder behavior | Matt Jones | 2012-01-11 | 1 | -0/+10 |
| | |||||
* | Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases | Santiago Pastorino | 2012-01-11 | 1 | -4/+6 |
| | | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute | ||||
* | FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb: | Aaron Patterson | 2012-01-10 | 1 | -3/+0 |
| | |||||
* | deprecate the subdirectories parameter to `migrations` | Aaron Patterson | 2012-01-10 | 1 | -2/+13 |
| | | | | | | Conflicts: activerecord/lib/active_record/migration.rb | ||||
* | Bump to rc2 | Santiago Pastorino | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 4 | -8/+18 |
| | | | | correctly handle order calls after a reorder | ||||
* | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | deprecate ActiveSupport::Base64 | Sergey Nartimov | 2012-01-03 | 1 | -4/+4 |
| | | | | extend and define ::Base64 if needed | ||||
* | Document that index names are made up of all columns, not just the first. | Jo Liss | 2011-12-29 | 1 | -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 Ozols | 2011-12-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -1/+1 |
| | | | | allow reorder to affect eager loading correctly | ||||
* | app code in general wants Time.current, not Time.now | Xavier Noria | 2011-12-28 | 1 | -3/+3 |
| | |||||
* | Remove empty line. | Marcos Tapajós | 2011-12-28 | 1 | -1/+0 |
| | |||||
* | Closes #4208 | Marcos Tapajós | 2011-12-27 | 1 | -2/+3 |
| | |||||
* | Reconnect to the first database after db:create | Tsutomu Kuroda | 2011-12-25 | 1 | -0/+1 |
| | | | | | Otherwise, the schema and seed will be loaded onto the test database. | ||||
* | Tidy up migration types. | José Valim | 2011-12-24 | 4 | -11/+10 |
| | |||||
* | added ability to specify from cli when generating a model/migration whether ↵ | Dmitrii Samoilov | 2011-12-24 | 4 | -7/+16 |
| | | | | particular property should be an index like this 'rails g model person name:string:index profile:string' | ||||
* | Fix situation where id method didn't get defined causing postgres to fail | Jon Leighton | 2011-12-23 | 1 | -4/+3 |
| | |||||
* | Doh, remove debugging line | Jon Leighton | 2011-12-23 | 1 | -1/+0 |
| | |||||
* | Fix #4046. | Jon Leighton | 2011-12-23 | 2 | -46/+36 |
| | |||||
* | Fix build when IM=true | Jon Leighton | 2011-12-23 | 1 | -4/+3 |
| | |||||
* | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 1 | -4/+4 |
| |