aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Start Rails 5.2 developmentMatthew Draper2017-03-223-774/+7
|
* Fix where_clause#except with specific where valueJohn Hawthorn2017-03-202-2/+10
| | | | | | | | | Fixes a regression introduced in 22ca710f20c3c656811df006cbf1f4dbc359f7a6 where Relation#unscope with a specific where value (vs unscoping the entire where clause) could result in the wrong binds being left on the query. This was caused by an index variable not being incremented properly.
* Merge pull request #28474 from kamipo/fix_extension_with_darty_targetKasper Timm Hansen2017-03-203-2/+12
|\ | | | | Fix extension method with dirty target in has_many associations
| * Fix extension method with dirty target in has_many associationsRyuta Kamizono2017-03-203-2/+12
| | | | | | | | | | | | | | Extension methods should not delegate to `scope` to respect dirty target on `CollectionProxy`. Fixes #28419.
* | Merge pull request #28487 from kamipo/remove_duplicated_columns_definitionRafael França2017-03-202-11/+5
|\ \ | | | | | | Remove duplicated `columns` definition
| * | Remove duplicated `columns` definitionRyuta Kamizono2017-03-202-11/+5
| |/
* | Merge pull request #28473 from kamipo/delegate_uniq_to_recordsRafael França2017-03-204-20/+20
|\ \ | | | | | | Delegate `uniq` to `records`
| * | Use `load` rather than `collect` for force loadingRyuta Kamizono2017-03-194-20/+20
| | | | | | | | | | | | | | | | | | | | | Since b644964b `ActiveRecord::Relation` includes `Enumerable` so delegating `collect`, `all?`, and `include?` are also unneeded. `collect` without block returns `Enumerable` without preloading by that. We should use `load` rather than `collect` for force loading.
* | | Merge pull request #27939 from kamipo/fix_select_all_with_legacy_bindsRafael França2017-03-202-1/+14
|\ \ \ | |_|/ |/| | Fix `select_all` with legacy `binds`
| * | Fix `select_all` with legacy `binds`Ryuta Kamizono2017-02-122-1/+14
| | | | | | | | | | | | Fixes #27923.
* | | Merge pull request #28479 from kamipo/evaluate_default_block_only_when_necessaryKasper Timm Hansen2017-03-203-4/+4
|\ \ \ | | | | | | | | Evaluate the default block only when necessary
| * | | Evaluate the default block only when necessaryRyuta Kamizono2017-03-202-3/+3
| | |/ | |/| | | | | | | Follow up of #28453.
| * | Delegate `uniq` to `records`Ryuta Kamizono2017-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes CI failure due to 48f3be8c. `Enumerable#uniq` was introduced since Ruby 2.4. We should delegate `uniq` to `records` explicitly. And since b644964b `ActiveRecord::Relation` includes `Enumerable` so delegating `map` is unneeded.
* | | Fix changelog entry about transaction error classes [ci skip]yuuji.yaginuma2017-03-201-1/+1
|/ / | | | | | | | | `ActiveRecord::TransactionSerializationError` was introduces in #25093. However, refactored in #25107, `TransactionSerializationError` is gone.
* | Merge pull request #28191 from eugeneius/string_assoc_orderRafael França2017-03-172-2/+30
|\ \ | | | | | | Allow order to be given expressions as hash keys
| * | Allow order to be given expressions as hash keysEugene Kenny2017-02-272-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `order` is given a hash, the keys are currently assumed to be attribute names and are quoted as such in the query, which makes it impossible to pass an expression instead: Post.order("LENGTH(title)" => :asc).last # SELECT `posts`.* FROM `posts` ORDER BY `posts`.`LENGTH(title)` DESC LIMIT 1 If the key is an `Arel::Nodes::SqlLiteral`, we now use it directly in the query. This provides a way to build a relation with a complex order clause that can still be reversed with `reverse_order` or `last`.
* | | Merge pull request #28154 from aripollak/remove-comments-from-structure-sqlRafael Mendonça França2017-03-173-3/+43
|\ \ \ | | | | | | | | | | | | Drop comments from structure.sql in postgresql
| * | | Only remove comments before the first statementAri Pollak2017-02-242-7/+12
| | | |
| * | | Drop comments from structure.sql in postgresqlAri Pollak2017-02-243-3/+38
| | | | | | | | | | | | | | | | Fixes #28153.
* | | | uniq was deprecated and removed alreadyRafael Mendonça França2017-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | This was causing an infinity loop since it was delegating to `all` and all delegating back to this module.
* | | | Merge pull request #28318 from ↵Rafael França2017-03-174-46/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/remove-ability-update-locking_column-value Remove ability update locking_column value
| * | | | Remove ability update locking_column valuebogdanvlviv2017-03-164-46/+4
| | | | |
* | | | | Add :default option to belongs_to (#28453)George Claghorn2017-03-175-1/+50
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use it to specify that an association should be initialized with a particular record before validation. For example: # Before belongs_to :account before_validation -> { self.account ||= Current.account } # After belongs_to :account, default: -> { Current.account }
* | | | Fix fragile test (`AssociationProxyTest#test_save_on_parent_saves_children`)Fumiaki MATSUSHIMA2017-03-161-36/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we run only following tests: - test/cases/scoping/default_scoping_test.rb - test/cases/associations_test.rb ``` $ cat Rakefile.test require "rake/testtask" ENV["ARCONN"] = "postgresql" Rake::TestTask.new do |t| t.libs << "test" t.test_files = %w( test/cases/scoping/default_scoping_test.rb test/cases/associations_test.rb ) end ``` a test will fail: ``` $ bundle exec rake test -f Rakefile.test /app/activesupport/lib/active_support/core_ext/enumerable.rb:20: warning: method redefined; discarding old sum Using postgresql Run options: --seed 11830 # Running: .........................................................................................F................ Finished in 6.939055s, 15.2759 runs/s, 27.9577 assertions/s. 1) Failure: AssociationProxyTest#test_save_on_parent_saves_children [/app/activerecord/test/cases/associations_test.rb:185]: Expected: 1 Actual: 2 106 runs, 194 assertions, 1 failures, 0 errors, 0 skips rake aborted! Command failed with status (1) /usr/local/bin/bundle:22:in `load' /usr/local/bin/bundle:22:in `<main>' Tasks: TOP => test (See full trace by running task with --trace) ``` In #28083, change `self.use_transactional_tests` to `false` but we forget to clean-up fixture. However we don't have to disable transaction except a few tests.
* | | | Remove unused `@txn` variableEugene Kenny2017-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This was added in c24c885209ac2334dc6f798c394a821ee270bec6, removed in b89ffe7f0047eb614e42232a21201b317b880755, and then (unintentionally?) reintroduced in 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.
* | | | Revert "Merge pull request #28369 from ↵Matthew Draper2017-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mylake/reduce-postgresql-adapter-memory-bloat" This reverts commit 192db64452d148c7b51713979459e38407380dc6, reversing changes made to 9893955363cf6358556ed3b36f4538d5b54e9d17. We can't sacrifice correctness for performance.
* | | | Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloatRafael França2017-03-131-2/+2
|\ \ \ \ | | | | | | | | | | 500x memory reduction of 10k schemas for postgresql adapter
| * | | | Use “distinct” to filter redundant types from pg_typeto reduce memory ↵mylake2017-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | bloat especially in multi-schema structure database
* | | | | Merge pull request #28068 from kamipo/refactor_data_sourcesRafael França2017-03-138-205/+156
|\ \ \ \ \ | | | | | | | | | | | | Extract `data_source_sql` to refactor data source statements
| * | | | | Prefer `USING (column_list)` for joining information_schemaRyuta Kamizono2017-02-251-3/+1
| | | | | |
| * | | | | Extract `data_source_sql` to refactor data source statementsRyuta Kamizono2017-02-208-202/+155
| | | | | |
* | | | | | Merge pull request #28017 from mtsmfm/suppress-dep-warnMatthew Draper2017-03-133-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Suppress deprecation warning `implementing to_yaml is deprecated`
| * | | | | | Suppress deprecation warning `implementing to_yaml is deprecated`Fumiaki MATSUSHIMA2017-02-153-0/+6
| | | | | | |
* | | | | | | Merge pull request #28371 from kamipo/simplify_countAndrew White2017-03-121-7/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count`
| * | | | | | | Simply forward `Calculations#count` to `Enumerable#count`Ryuta Kamizono2017-03-101-7/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #24203. Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is enough to call `super` simply.
* | | | | | | Merge pull request #28372 from kamipo/delegate_as_jsonAndrew White2017-03-123-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Simply delegate `as_json` to `records`
| * | | | | | | Simply delegate `as_json` to `records`Ryuta Kamizono2017-03-103-6/+2
| |/ / / / / /
* / / / / / / Remove conditions parameter from `NullRelation#delete_all`Ryuta Kamizono2017-03-101-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Follow up of e7381d289e4f8751dcec9553dcb4d32153bd922b.
* | | | | | Add missing credit [ci skip]Ryuta Kamizono2017-03-101-0/+2
| | | | | |
* | | | | | Merge pull request #28351 from kamipo/deprecate_schema_migrations_table_nameRafael Mendonça França2017-03-093-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Deprecate `Migrator.schema_migrations_table_name`
| * | | | | | Deprecate `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-093-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 67fba0cf `SchemaMigration` model was extracted. Use `SchemaMigration.table_name` instead.
* | | | | | | Fix select with block doesn't return newly built records in has_many associationRyuta Kamizono2017-03-093-2/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `select` in `QueryMethods` is also an enumerable method. Enumerable methods with block should delegate to `records` on `CollectionProxy`, not `scope`. Fixes #28348.
* | | | | | Check whether `Rails.application` defined before calling itAndrew White2017-03-072-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #27674 we changed the migration generator to generate migrations at the path defined in `Rails.application.config.paths` however the code checked for the presence of the `Rails` constant but not the `Rails.application` method which caused problems when using Active Record and generators outside of the context of a Rails application. Fixes #28325.
* | | | | | Merge pull request #28305 from kamipo/extract_schema_migration_all_versionsAndrew White2017-03-063-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract `SchemaMigration.all_versions`
| * | | | | | Extract `SchemaMigration.all_versions`Ryuta Kamizono2017-03-063-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `SchemaMigration.all_versions` instead of `SchemaMigration.all.map(&:version)` to avoid to instantiate AR objects.
* | | | | | | Fix `deserialize` with JSON arrayRyuta Kamizono2017-03-063-1/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes #28285.
* | | | | | Remove useless `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-053-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | Simply use `SchemaMigration.table_name` instead.
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-041-1/+1
|\ \ \ \ \ \
| * | | | | | Remove duplicated "does" [ci skip]Ryuta Kamizono2017-02-141-1/+1
| | | | | | |
* | | | | | | Don't hide method that's been documented API since Rails 2.1Andrew White2017-03-041-3/+3
| | | | | | |