Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12643 from severin/pg_cast_json_on_write | Yves Senn | 2013-10-25 | 3 | -0/+26 |
|\ | | | | | cast json values on write to be consistent with reading from the db. | ||||
| * | cast json values on write to be consistent with reading from the db. | Severin Schoepke | 2013-10-25 | 3 | -0/+26 |
| | | | | | | | | See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d | ||||
* | | prevent `time_zone_aware_attributes` test leak. follow-up to #12633. | Yves Senn | 2013-10-25 | 1 | -21/+21 |
| | | |||||
* | | only warn on leaked time zone state instead of rasing an error. | Yves Senn | 2013-10-25 | 1 | -3/+6 |
| | | | | | | | | | | | | Raising `RuntimeErrors` skips important cleanup code and leads to a lot of subsequent errors. This clutters the test output with a lot of noise. | ||||
* | | Merge pull request #12633 from senny/no_more_time_zone_leaks | Yves Senn | 2013-10-25 | 12 | -214/+223 |
|\ \ | |/ |/| | prevent global timezone state from leaking out of test cases. | ||||
| * | prevent global timezone state from leaking out of test cases. | Yves Senn | 2013-10-25 | 12 | -214/+223 |
| | | |||||
* | | Merge pull request #12641 from ↵ | Rafael Mendonça França | 2013-10-25 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | jetthoughts/12640_updated_migrations_doc_to_use_remove_column Fix migration docs to use new remove_column semantics | ||||
| * | | Fix migration docs to use new remove_column semantics | Paul Nikitochkin | 2013-10-25 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes: #12640 | ||||
* | | | `ActiveRecord::Store` works together with PG `hstore` columns. | Yves Senn | 2013-10-25 | 6 | -14/+88 |
| | | | | | | | | | | | | | | | | | | This is necessary because as of 5ac2341 `hstore` columns are always stored as `Hash` with `String` keys. `ActiveRecord::Store` expected the attribute to be an instance of `HashWithIndifferentAccess`, which led to the bug. | ||||
* | | | `stored_attributes` need to be specific to a subclass. | Yves Senn | 2013-10-25 | 3 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they are all stored globally in the same `Hash`. This commit forces the creation of a per-class variable if necessary. The behavior was exposed through the following test-case: ``` 1) Failure: StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]: --- expected +++ actual @@ -1 +1 @@ -[:color, :homepage, :favorite_food] +[:resolution, :color, :homepage, :favorite_food] ``` | ||||
* | | | test to verify the `ActiveRecord::Store` behavior with PG's json type | Yves Senn | 2013-10-25 | 1 | -0/+18 |
| | | | |||||
* | | | Merge pull request #12621 from ↵ | Rafael Mendonça França | 2013-10-24 | 3 | -1/+24 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/fix_has_one_association_with_primary_key_set Save association when primary key is manually set Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | Save association when primary key is manually set | laurocaetano | 2013-10-24 | 3 | -1/+24 |
| | | | | |||||
* | | | | Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods | Aaron Patterson | 2013-10-24 | 1 | -6/+3 |
|\ \ \ \ | | | | | | | | | | | Always check to see if methods exist after calling define_attribute_methods | ||||
| * | | | | always check to see if methods exist after calling define_attribute_methods | Matt Jones | 2013-10-24 | 1 | -6/+3 |
| | |_|/ | |/| | | |||||
* / | | | Add CHANGELOG entry for #12635 [ci skip] | Rafael Mendonça França | 2013-10-24 | 1 | -0/+4 |
|/ / / | |||||
* | / | Fix typo: `has_many :pets`, not `pets :has_many`. | Peter Jaros | 2013-10-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix order dependent tests | Rafael Mendonça França | 2013-10-22 | 1 | -4/+4 |
| | | |||||
* | | minor Active Record CHANGELOG cleanup. [ci skip]. | Yves Senn | 2013-10-22 | 1 | -3/+3 |
| | | |||||
* | | move helper class to the top | Aaron Patterson | 2013-10-21 | 1 | -42/+42 |
| | | |||||
* | | build the association graph functionally | Aaron Patterson | 2013-10-21 | 3 | -20/+13 |
| | | | | | | | | This lets us avoid the constant calls to Array#<< | ||||
* | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-21 | 16 | -215/+328 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Escape the parentheses in the default function regexp Update docs on Tilt::Template in Asset Pipeline guide Fix loading a sql structure file on postgres when the file's path has whitespace in it remove trailing whitespace added with b057765 [ci skip]. Allow unscope to work with `where.not` Raise an exception when model without primary key calls .find_with_ids Process sub-query relation's binding values Instrument the generation of Action Mailer messages Remove extra variable creation and merge. In Relation#empty? use #exists? instead of #count. [ci skip] avoid deprecation warning in sample code Convert Fixnum into String the port number in MySQL Fix some indentation on autosave association Make define_non_cyclic_method simpler Add Sass gobbling info to asset pipeline docs Ensure the state is clean after one failure Fix typo in form_helper.rb add a new local variable to track if digests are being stored, to ensure the cleanup works correctly [ci skip] Fix number of methods added by association. update digestor code based on review ... | ||||
| * \ | Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sql | Rafael Mendonça França | 2013-10-21 | 4 | -6/+56 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Inline bind values for sub-queries generated for Relation in where Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | Process sub-query relation's binding values | Paul Nikitochkin | 2013-10-20 | 4 | -4/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated sub-query for Relation as array condition for `where` method did not take in account its bind values, in result generates invalid SQL query. Fixed by adding sub-query relation's binding values to base relation Closes: #12586 | ||||
| * | | | Escape the parentheses in the default function regexp | Rafael Mendonça França | 2013-10-21 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing every default value in PostreSQL database to being handled as default function. Fixes #12581 | ||||
| * | | | Fix loading a sql structure file on postgres when the file's path has ↵ | Kevin Mook | 2013-10-21 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | whitespace in it | ||||
| * | | | remove trailing whitespace added with b057765 [ci skip]. | Yves Senn | 2013-10-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Allow unscope to work with `where.not` | Eric Hankins | 2013-10-21 | 3 | -7/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allows you to call #unscope on a relation with negative equality operators, i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated through the use of where.not. | ||||
| * | | | Raise an exception when model without primary key calls .find_with_ids | Shimpei Makimoto | 2013-10-21 | 3 | -0/+13 |
| | |/ | |/| | |||||
| * | | In Relation#empty? use #exists? instead of #count. | Szymon Nowak | 2013-10-19 | 2 | -2/+5 |
| |/ | |||||
| * | Merge pull request #12560 from sue445/modify_find_lock_sample_code | Yves Senn | 2013-10-18 | 1 | -3/+3 |
| |\ | | | | | | | avoid deprecation warning in sample code [ci skip] | ||||
| | * | [ci skip] avoid deprecation warning in sample code | sue445 | 2013-10-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it. | ||||
| * | | Convert Fixnum into String the port number in MySQL | Kenta Okamoto | 2013-10-18 | 3 | -1/+15 |
| | | | |||||
| * | | Fix some indentation on autosave association | Arthur Neves | 2013-10-17 | 1 | -196/+196 |
| | | | |||||
| * | | Make define_non_cyclic_method simpler | Arthur Neves | 2013-10-17 | 1 | -7/+7 |
| |/ | |||||
* | | @base_klass is not used | Aaron Patterson | 2013-10-21 | 1 | -1/+0 |
| | | |||||
* | | join_type isn't used on the node anymore | Aaron Patterson | 2013-10-21 | 2 | -11/+7 |
| | | |||||
* | | make joins generation method look similar | Aaron Patterson | 2013-10-21 | 1 | -6/+9 |
| | | |||||
* | | remove node duping code | Aaron Patterson | 2013-10-21 | 1 | -57/+19 |
| | | |||||
* | | refactor outer join generation | Aaron Patterson | 2013-10-21 | 1 | -11/+6 |
| | | |||||
* | | add outer joins for matching nodes | Aaron Patterson | 2013-10-21 | 1 | -2/+14 |
| | | |||||
* | | construct joins by walking the outer join tree | Aaron Patterson | 2013-10-21 | 1 | -5/+34 |
| | | |||||
* | | pass the outer joins to join_constraints | Aaron Patterson | 2013-10-20 | 2 | -6/+3 |
| | | |||||
* | | disconnect join_constraints from the instance | Aaron Patterson | 2013-10-20 | 2 | -3/+3 |
| | | |||||
* | | pass in scope chain so reflection is not needed | Aaron Patterson | 2013-10-20 | 2 | -3/+3 |
| | | |||||
* | | pass the foreign table and class to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -5/+4 |
| | | |||||
* | | pass the join type to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-16 | 1 | -6/+6 |
|\| | | | | | | | | | | | | | * master: Rephrase ActiveRecord transaction rollback warning Fix code blocks identation on AR and AS CHANGELOGs Removing unused fake models from actionpack tests | ||||
| * | Fix code blocks identation on AR and AS CHANGELOGs | Lucas Mazza | 2013-10-16 | 1 | -6/+6 |
| | | |||||
* | | use the node as cache so we can avoid accessing the table | Aaron Patterson | 2013-10-15 | 1 | -13/+13 |
| | |