Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 1 | -0/+12 |
|\ | | | | | [3-2-stable] migrate(:down) method with table_name_prefix | ||||
| * | migrate(:down) method with table_name_prefix | kennyj | 2012-03-21 | 1 | -0/+12 |
| | | |||||
* | | Fix identity map tests | Carlos Antonio da Silva | 2012-03-23 | 1 | -16/+16 |
| | | |||||
* | | Add order to tests that rely on db ordering, to fix failing tests on pg | Carlos Antonio da Silva | 2012-03-22 | 13 | -46/+45 |
|/ | | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now. | ||||
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 1 | -0/+7 |
| | | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA. | ||||
* | [3-2-stable] Fix GH #5399. connection_pools's keys are ↵ | kennyj | 2012-03-14 | 1 | -1/+7 |
| | | | | ActiveRecord::Base::ConnectionSpecification objects. | ||||
* | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 1 | -0/+4 |
| | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API | ||||
* | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 1 | -0/+10 |
| | |||||
* | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 4 | -0/+52 |
| | | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb | ||||
* | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 3 | -12/+11 |
| | |||||
* | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-08 | 4 | -4/+34 |
| | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb | ||||
* | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |
| | |||||
* | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 1 | -0/+42 |
| | | | | use for the current thread. fixes #5330 | ||||
* | Add tests to test that through associations are not readonly, and we can ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 |
| | | | | update the records we retrive from the association | ||||
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 1 | -0/+3 |
| | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | ||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 2 | -0/+38 |
| | | | | builder | ||||
* | Only run binary type cast test with encode! on Ruby 1.9 | Carlos Antonio da Silva | 2012-03-04 | 1 | -6/+8 |
| | |||||
* | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 1 | -0/+9 |
| | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | ||||
* | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-29 | 2 | -3/+3 |
| | |||||
* | 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 |
| |