Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 1 | -3/+7 |
| | | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys | ||||
* | fix test with ruby 187-p358 | Arun Agrawal | 2012-02-18 | 1 | -1/+5 |
| | |||||
* | Use real table and columns for index test | Rafael Mendonça França | 2012-02-08 | 1 | -3/+3 |
| | |||||
* | Push proper test changes for previous commit conflicts. | José Valim | 2012-02-08 | 1 | -2/+4 |
| | |||||
* | Handle nil in add_index :length option in MySQL | Paul Sadauskas | 2012-02-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+15 |
| | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
* | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 1 | -0/+48 |
| | |||||
* | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-02 | 2 | -1/+2 |
| | | | | Fix for SQLite binary data corrupter (to master branch) | ||||
* | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 1 | -0/+12 |
| | | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by | ||||
* | Fix broken tests added by 85c724d59 | Rafael Mendonça França | 2012-01-31 | 3 | -13/+13 |
| | |||||
* | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 2 | -0/+5 |
| | | | | 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 | -0/+7 |
| | |||||
* | Add workaround and deprecation if the inherited hook is not executed. Closes ↵ | Jon Leighton | 2012-01-31 | 1 | -0/+10 |
| | | | | #4757. | ||||
* | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 1 | -0/+16 |
| | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES | ||||
* | Merge pull request #4715 from pwim/find-create-multi-args | Jon Leighton | 2012-01-27 | 1 | -0/+11 |
| | | | | Fix regression from Rails 3.1 | ||||
* | Merge pull request #4696 from rafaelfranca/issue-4653 | Aaron Patterson | 2012-01-26 | 1 | -2/+0 |
|\ | | | | | Remove extra attributes from HABTM join tables in AR tests | ||||
| * | Remove extra attributes from HABTM join tables in AR tests | Rafael Mendonça França | 2012-01-26 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | HABTM Join tables should not have extra attributes When extra attributes is needed in HABTM join tables is better to use `has_many :through` association. Fix #4653 | ||||
* | | disable automatic explain if there is no logger [closes #4671] | Xavier Noria | 2012-01-26 | 1 | -1/+15 |
|/ | |||||
* | call to_s on value passed to table_name= | Sergey Nartimov | 2012-01-26 | 1 | -0/+5 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fix another race condition. | Jon Leighton | 2012-01-20 | 1 | -0/+8 |
| | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb | ||||
* | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 1 | -0/+20 |
| | | | | Add ActiveRecord::Base#with_lock | ||||
* | Merge pull request #4487 from sarenji/fix-reset-counters | Aaron Patterson | 2012-01-17 | 6 | -2/+43 |
| | | | | Fix bug where reset_counters resets the wrong counter cache. | ||||
* | Fix table_name in ActiveRecord with more than one abstract ancestors | Piotr Sarnacki | 2012-01-12 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | 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 | ||||
* | on and ON are type casted to a true boolean column | Santiago Pastorino | 2012-01-11 | 1 | -0/+29 |
| | |||||
* | Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases | Santiago Pastorino | 2012-01-11 | 1 | -1/+40 |
| | | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute | ||||
* | Merge pull request #4282 from edgecase/order_after_reorder | Aaron Patterson | 2012-01-04 | 2 | -1/+7 |
| | | | | correctly handle order calls after a reorder | ||||
* | Fix GH #4285. Remove options when we record calling creat_table | kennyj | 2012-01-04 | 1 | -0/+6 |
| | |||||
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -0/+10 |
| | | | | allow reorder to affect eager loading correctly | ||||
* | avoid deprecation warnings when running AR tests | Aaron Patterson | 2011-12-24 | 2 | -2/+7 |
| | |||||
* | Fix #4046. | Jon Leighton | 2011-12-23 | 3 | -0/+22 |
| | |||||
* | serialize fails on subclass | Alvaro Bautista | 2011-12-23 | 4 | -6/+32 |
| | |||||
* | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 1 | -1/+8 |
| | |||||
* | added failing tests for has_many, has_one and belongs_to associations with ↵ | Jakub Kuźma | 2011-12-21 | 3 | -7/+65 |
| | | | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge pull request #4014 from lest/bypass-preloading-for-ids-reader | Jon Leighton | 2011-12-18 | 1 | -0/+6 |
|\ | | | | | bypass preloading for ids_reader | ||||
| * | bypass preloading for ids_reader | Sergey Nartimov | 2011-12-18 | 1 | -0/+6 |
| | | | | | | | | | | when fetching ids for a collection, bypass preloading to avoid the unnecessary performance overhead | ||||
* | | call scope within unscoped to prevent duplication of where values | Sergey Nartimov | 2011-12-17 | 2 | -0/+7 |
|/ | |||||
* | Delete obsolete comment | Jon Leighton | 2011-12-16 | 1 | -1/+0 |
| | |||||
* | Should clear the primary keys cache also | Jon Leighton | 2011-12-16 | 1 | -1/+5 |
| | |||||
* | Don't store defaults in the schema cache | Jon Leighton | 2011-12-16 | 2 | -1/+2 |
| | |||||
* | Cache columns at the model level. | Jon Leighton | 2011-12-16 | 4 | -21/+34 |
| | | | | Allows two models to use the same table but have different primary keys. | ||||
* | Let AttributeMethods do its own including etc | Jon Leighton | 2011-12-15 | 1 | -4/+2 |
| | |||||
* | Split out most of the AR::Base code into separate modules :cake: | Jon Leighton | 2011-12-15 | 1 | -13/+0 |
| | |||||
* | Fix #3987. | Jon Leighton | 2011-12-15 | 1 | -0/+10 |
| | |||||
* | Allow nested attributes in associations to update values in it's owner ↵ | Andrew Kaspick | 2011-12-14 | 2 | -1/+9 |
| | | | | object. Fixes a regression from 3.0.x | ||||
* | Remove that there copy/pasted code :bomb: | Jon Leighton | 2011-12-14 | 1 | -5/+0 |
| | |||||
* | Don't try to autosave nested assocs. Fixes #2961. | Jon Leighton | 2011-12-14 | 1 | -0/+14 |
| | |||||
* | Stop the build asploding on 1.8.7 | Jon Leighton | 2011-12-14 | 1 | -0/+4 |
| | |||||
* | Add return for 1.8.7 | Jon Leighton | 2011-12-14 | 1 | -1/+1 |
| | |||||
* | Unfluff the CI. | Jon Leighton | 2011-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | With transactional fixtures enabled, the session records would end up in @_current_transaction_records, and at the end of the transaction, methods would be called on them that would trigger method_missing and trigger attribute methods to be generated. However, at this point the sessions table would not exist, and the columns were not cached, so an exception would be raised because we can't find the columns to generate attribute methods for. Not sure exactly why this didn't crop up before but there have been changes to the schema cache code and perhaps that means that column data that was cached previously at that point is now uncached. | ||||
* | Revert naive O(1) table_exists? implementation. | Jon Leighton | 2011-12-13 | 1 | -0/+1 |
| | | | | | | | | | | It was a bad idea to rescue exceptions here. This can interfere with transaction rollbacks which seems to be the cause of current CI failure. Instead, each adapter should implement its own DB-specific O(1) implementation, and we fall back on the generic, slower, implementation otherwise. |