aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10664 from aderyabin/docpatchYves Senn2013-10-291-1/+1
|\ | | | | Fix doc in Postgres database creation [ci skip]
| * Fix doc in Postgres database creationAndrey Deryabin2013-06-251-1/+1
| |
* | Fix broken delete_all test, which will now be failing since #delete_all is ↵David Heinemeier Hansson2013-10-281-4/+4
| | | | | | | | broken
* | Add failing test for preloading with a polymorphic association and using the ↵David Heinemeier Hansson2013-10-281-1/+10
| | | | | | | | existential predicate
* | Remove confusing generated-code commentaryJeremy Kemper2013-10-281-4/+4
| |
* | Fix typoDavid Heinemeier Hansson2013-10-271-1/+1
| |
* | Merge pull request #12578 from ↵Rafael Mendonça França2013-10-274-3/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | jeradphelps/configurable_schema_migrations_table_name Configurable name for schema_migrations table Conflicts: activerecord/CHANGELOG.md
| * | added schema_migrations_table_name to ActiveRecord::Base in order that the ↵Jerad Phelps2013-10-274-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name of the schema migrations table can be configured. consolidated test_schema_migrations_table_name tests Added changelog entry edited changelog removed commented lines removed reader ensure the schema migrations table is reset at end of test added entry to configuration guide guides typo and changelog order
* | | Assert the return value in the testRafael Mendonça França2013-10-271-1/+1
| | |
* | | Merge pull request #12664 from jetthoughts/12242_includes_in_through_associationRafael Mendonça França2013-10-274-2/+37
|\ \ \ | | | | | | | | Skip `include_values` from through associations chains for building association scope
| * | | Skip `include_values` from through associations chains for building target scopePaul Nikitochkin2013-10-274-2/+37
| | | | | | | | | | | | | | | | Fixes: #12242, #9517, #10240
* | | | Add a note about ensuring the version is right for the adapter (since you ↵David Heinemeier Hansson2013-10-271-1/+1
|/ / / | | | | | | | | | might well have specified the right gem, but locked it to too low of a version)
* | | Fixed typo with after_commit docsChris Ledet2013-10-251-2/+2
| | | | | | | | | Fixed syntax error on `after_commit` docs
* | | Merge pull request #12643 from severin/pg_cast_json_on_writeYves Senn2013-10-253-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 Schoepke2013-10-253-0/+26
| | | | | | | | | | | | | | | | See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d
* | | | prevent `time_zone_aware_attributes` test leak. follow-up to #12633.Yves Senn2013-10-251-21/+21
| | | |
* | | | only warn on leaked time zone state instead of rasing an error.Yves Senn2013-10-251-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_leaksYves Senn2013-10-2512-214/+223
|\ \ \ \ | |/ / / |/| | | prevent global timezone state from leaking out of test cases.
| * | | prevent global timezone state from leaking out of test cases.Yves Senn2013-10-2512-214/+223
| | | |
* | | | Merge pull request #12641 from ↵Rafael Mendonça França2013-10-251-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 semanticsPaul Nikitochkin2013-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes: #12640
* | | | | `ActiveRecord::Store` works together with PG `hstore` columns.Yves Senn2013-10-256-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 Senn2013-10-253-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 typeYves Senn2013-10-251-0/+18
| | | | |
* | | | | Merge pull request #12621 from ↵Rafael Mendonça França2013-10-243-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 setlaurocaetano2013-10-243-1/+24
| | | | | |
* | | | | | Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methodsAaron Patterson2013-10-241-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_methodsMatt Jones2013-10-241-6/+3
| | |_|/ / / | |/| | | |
* / | | | | Add CHANGELOG entry for #12635 [ci skip]Rafael Mendonça França2013-10-241-0/+4
|/ / / / /
* | / / / Fix typo: `has_many :pets`, not `pets :has_many`.Peter Jaros2013-10-241-1/+1
| |/ / / |/| | |
* | | | Fix order dependent testsRafael Mendonça França2013-10-221-4/+4
| | | |
* | | | minor Active Record CHANGELOG cleanup. [ci skip].Yves Senn2013-10-221-3/+3
| | | |
* | | | move helper class to the topAaron Patterson2013-10-211-42/+42
| | | |
* | | | build the association graph functionallyAaron Patterson2013-10-213-20/+13
| | | | | | | | | | | | | | | | This lets us avoid the constant calls to Array#<<
* | | | Merge branch 'master' into joindepAaron Patterson2013-10-2116-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_sqlRafael Mendonça França2013-10-214-6/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline bind values for sub-queries generated for Relation in where Conflicts: activerecord/CHANGELOG.md
| | * | | | Process sub-query relation's binding valuesPaul Nikitochkin2013-10-204-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 regexpRafael Mendonça França2013-10-212-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 Mook2013-10-213-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | whitespace in it
| * | | | | remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
| | | | | |
| * | | | | Allow unscope to work with `where.not`Eric Hankins2013-10-213-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_idsShimpei Makimoto2013-10-213-0/+13
| | |/ / / | |/| | |
| * | | | In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
| |/ / /
| * | | Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
| |\ \ \ | | | | | | | | | | avoid deprecation warning in sample code [ci skip]
| | * | | [ci skip] avoid deprecation warning in sample codesue4452013-10-181-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 MySQLKenta Okamoto2013-10-183-1/+15
| | |/ / | |/| |
| * | | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | | |
| * | | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| |/ /
* | | @base_klass is not usedAaron Patterson2013-10-211-1/+0
| | |
* | | join_type isn't used on the node anymoreAaron Patterson2013-10-212-11/+7
| | |