aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27683 from eugeneius/update_counters_empty_touch_testKasper Timm Hansen2017-01-151-0/+9
|\ | | | | Add test for update_counters with empty touch array
| * Add test for update_counters with empty touchEugene Kenny2017-01-151-0/+9
| | | | | | | | | | | | | | | | | | This is a regression test for a fix included in https://github.com/rails/rails/commit/bad9bfbea6d6af9dc28583e08a49492668087393. Without that change, this test would fail with: ActiveRecord::StatementInvalid: SQLite3::SQLException: near "WHERE": syntax error: UPDATE "topics" SET "replies_count" = COALESCE("replies_count", 0) - 1, WHERE "topics"."id" = ?
* | Revert "Don't guard against `touch: []`."Kasper Timm Hansen2017-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | `timestamp_attributes_for_updates_in_model` returns an empty array when a model has no `updated_at` or `updated_on`. So my previously thought uncommon case is a lot more likely now. This reverts commit a0a1ede8c2eb6436571eae8778033162d1f9dcc3.
* | Merge pull request #27618 from kamipo/fix_uuid_default_nilKasper Timm Hansen2017-01-152-20/+37
|\ \ | | | | | | Fix UUID primary key with default nil in legacy migration
| * | Fix UUID primary key with default nil in legacy migrationRyuta Kamizono2017-01-092-1/+20
| | | | | | | | | | | | | | | | | | UUID primary key with no default value feature (#10404, #18206) was lost in legacy migration caused by #25395 got merged. Restore the feature again in legacy migration.
| * | Should test uuid legacy migration without `supports_pgcrypto_uuid?`Ryuta Kamizono2017-01-091-19/+17
| | |
* | | Don't guard against `touch: []`.Kasper Timm Hansen2017-01-151-2/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #27683. Seeing a code sample that leads to what we're guarding against: ```ruby Topic.update_counters(1, replies_count: 1, touch: []) ``` It doesn't look like a case people would ever intentionally end up with. Thus we're better off sparing the conditional. Note: it could happen if a method returns an empty array that's then passed to `update_counters` and its touchy friends. But `[].presence` can fix that once people see their query blow up. [ Eugene Kenny & Kasper Timm Hansen ]
* | Merge pull request #27660 from akihiro17/updates-timestampKasper Timm Hansen2017-01-144-7/+32
|\ \ | | | | | | Add the touch option to ActiveRecord#increment! and decrement!
| * | Add the touch option to ActiveRecord#increment! and decrement!akihiro172017-01-144-7/+32
| | | | | | | | | | | | | | | Supports the `touch` option from update_counters. The default behavior is not to update timestamp columns.
* | | `type_condition` should be overwritten by `create_with_value` in ↵Ryuta Kamizono2017-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `scope_for_create` `type_condition` should be overwritten by `create_with_value`. So `type` in `create_with_value` should be a string because `where_values_hash` keys are converted to string. Fixes #27600.
* | | Fix pool_from_any_process to use most recent speceileencodes2017-01-132-1/+36
|/ / | | | | | | | | | | | | | | | | | | | | | | | | If a process is forked more than once, the pool was grabbing the oldest spec, not the most recent spec. This wasn't noticed before because most folks are lilely forking the process only once. If you're forking the process multiple times however the wrong spec name will be returned and an incorrect connection will be used for the process. This fixes the issue by reversing the list of spec names so we can grab the most recent spec rather than the oldest spec.
* | class Foo < Struct.new(:x) creates an extra unneeded anonymous classAkira Matsuda2017-01-136-16/+12
| | | | | | | | because Struct.new returns a Class, we just can give it a name and use it directly without inheriting from it
* | Reduce string objects by using \ instead of + or << for concatenating stringsAkira Matsuda2017-01-127-12/+12
| | | | | | | | (I personally prefer writing one string in one line no matter how long it is, though)
* | beginrescueendAkira Matsuda2017-01-121-5/+3
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-111-3/+3
|\ \ | | | | | | | | | | | | Conflicts: railties/lib/rails/generators.rb
| * | `meta-data` --> `metadata`Jon Moss2016-12-311-3/+3
| | | | | | | | | | | | | | | | | | Removes space from the word; is now spelled in the standard way. [ci skip]
* | | Fix indentKouhei Sutou2017-01-111-1/+1
| | |
* | | oops! :scream_cat:Akira Matsuda2017-01-101-1/+1
| | |
* | | Use temporary connection pool for the tests clearing AR::Base's ↵Akira Matsuda2017-01-101-59/+92
| | | | | | | | | | | | | | | | | | | | | active_connections clearing AR::Base's active_connections on the "primary" pool loses connections to the in_memory DB when running sqlite3_mem tests
* | | Reconnecting AR::Base's connection breaks sqlite3_mem testsAkira Matsuda2017-01-101-2/+6
| | | | | | | | | | | | so let's test with a tiny inner-class model instead
* | | sqlite3_mem tests are broken since 79887593c18919fed49f441d64236362cb755872Akira Matsuda2017-01-101-0/+2
| | | | | | | | | | | | | | | since 79887593c18919fed49f441d64236362cb755872, create_all task recreates the connection to AR::Base which doesn't connect to the in_memory database that is set up for tests
* | | Merge pull request #27621 from dylanahsmith/mysql2-nil-connection-testYves Senn2017-01-101-1/+2
|\ \ \ | | | | | | | | activerecord/test: Fix Mysql2ConnectionTest#test_execute_after_disconnect
| * | | activerecord/test: Fix Mysql2ConnectionTest#test_execute_after_disconnectDylan Thacker-Smith2017-01-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mysql2ConnectionTest#test_execute_after_disconnect was originally added to catch a NoMethodError occuring in execute when the Mysql2Adapter has a nil `@connection`. Pull request #26869 removed the error message check in that test because the error message changed in the mysql2 gem, which caused the test to fail. Now the test wouldn't catch the original bug since the NoMethodError would get turned into a ActiveRecord::StatementInvalid exception. Check the cause of the StatementInvalid exception to make sure it is of the correct type.
* | | | Improve deprecation message for deprecated reflection class nameRyuta Kamizono2017-01-101-1/+1
| | | |
* | | | Suppress deprecation message to `has_and_belongs_to_many` only onceRyuta Kamizono2017-01-101-2/+2
|/ / / | | | | | | | | | | | | Passing a class to `has_and_belongs_to_many` show deprecation message three times. It is enough only once.
* | | Merge pull request #27551 from kirs/deprecate-class-name-as-classKasper Timm Hansen2017-01-095-3/+27
|\ \ \ | |_|/ |/| | Deprecate reflection class name to accept a class
| * | Deprecate reflection class name to accept a classKir Shatrov2017-01-095-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | The idea of `class_name` as an option of reflection is that passing a string would allow us to lazy autoload the class. Using `belongs_to :client, class_name: Customer` is eagerloading models more than necessary and creating possible circular dependencies.
* | | Merge pull request #25427 from eugeneius/update_increment_documentationKasper Timm Hansen2017-01-081-8/+8
|\ \ \ | |/ / |/| | Update increment! documentation [ci skip]
| * | Update increment! documentation [ci skip]Eugene Kenny2016-08-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `increment!` and `decrement!` methods were recently reimplemented to make them safe to call from multiple connections concurrently. This changed their behaviour in a few ways. Previously they used `update_attribute`, which calls the attribute setter method, runs callbacks, and touches the record. Now they behave more like `update_column`, writing the update to the database directly and bypassing all of those steps.
* | | Merge pull request #27603 from prathamesh-sonpatki/fix-random-failureSantiago Pastorino2017-01-081-0/+2
|\ \ \ | | | | | | | | Fix random failure related to migration environment
| * | | Fix random failure related to migration environmentPrathamesh Sonpatki2017-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reference: https://travis-ci.org/rails/rails/jobs/189764676 - Reproduction command: MTB_VERBOSE=2 bundle exec minitest_bisect --seed 33328 -Itest "test/cases/migration_test.rb" "test/cases/tasks/database_tasks_test.rb" - You need to also add minitest_bisect gem to the Gemfile to reproduce this failure.
* | | | Merge pull request #27602 from prathamesh-sonpatki/followup-27596Santiago Pastorino2017-01-081-1/+8
|\ \ \ \ | | | | | | | | | | Followup of #27596, test output of "run" method as well
| * | | | Followup of #27596, test output of "run" method as wellPrathamesh Sonpatki2017-01-071-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | - #27596 Updated "run" and "migrate" method for returning correct value but only added test for "migrate" method. This commit adds a test for "run" as well.
* | | | Merge pull request #27598 from ↵Sean Griffin2017-01-072-1/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | NickLaMuro/fix-deep-nesting-where-clauses-with-joins Fix bug with symbolized keys in .where with nested join
| * | | Adds .to_s to table_name callNick LaMuro2017-01-061-1/+1
| | | | | | | | | | | | | | | | Avoids a NoMethodError when table_name is a symbol instead of a string.
| * | | Add failing test for where with joinsNick LaMuro2017-01-061-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will cause a failure with the changes from 8e2e5f9: https://github.com/rails/rails/commit/8e2e5f9e3d1f434e265dc104ea9b00ff75702fc3 With the `singularize` call that is being done in that method when there is multiple nestings of associations (JOIN calling a JOIN) and the `stringify_keys!` is only called once here: https://github.com/rails/rails/blob/21e5fd4/activerecord/lib/active_record/relation/where_clause_factory.rb#L16 And not in the subsequent recursion in `.predicate_builder`
* | | | Preserve `up` and `down` return typeschneems2017-01-062-2/+18
|/ / / | | | | | | | | | | | | | | | In Rails 4.2 calling `ActiveRecord::Migrator.migrate` would return an array of results. Without realizing that this return type was expected I accidentally introduced a change in https://github.com/rails/rails/commit/4d60e93174a3d6d90b1a06fc7515cb5cd749a6f3 This PR preserves the previous behavior and adds a test on the return type. This will need a backport to 5.0 branch.
* | | Merge pull request #27294 from eavgerinos/doc-ar-callbacks-orderRafael França2017-01-061-0/+49
|\ \ \ | | | | | | | | [documentation] ActiveRecord: Document order of Callbacks
| * | | [ci skip] ActiveRecord: Document order of CallbacksAggelos Avgerinos2016-12-221-0/+49
| | | |
* | | | Privatize unneededly protected methods in Active RecordAkira Matsuda2017-01-055-16/+12
| | | |
* | | | `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-0522-28/+28
| | | | | | | | | | | | | | | | Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby
* | | | This method is never called since 8e633e505880755e7e366ccec2210bbe2b5436e7Akira Matsuda2017-01-051-7/+0
| | | |
* | | | Merge pull request #27580 from kamipo/optimize_information_schema_queryRafael França2017-01-051-0/+1
|\ \ \ \ | | | | | | | | | | Optimizing information_schema query for `foreign_keys`
| * | | | Optimizing information_schema query for `foreign_keys`Ryuta Kamizono2017-01-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need `table_name` to avoid all databases scan. See https://dev.mysql.com/doc/refman/5.7/en/information-schema-optimization.html. ``` > EXPLAIN SELECT fk.referenced_table_name AS 'to_table', fk.referenced_column_name AS 'primary_key', fk.column_name AS 'column', fk.constraint_name AS 'name', rc.update_rule AS 'on_update', rc.delete_rule AS 'on_delete' FROM information_schema.key_column_usage fk JOIN information_schema.referential_constraints rc USING (constraint_schema, constraint_name) WHERE fk.referenced_column_name IS NOT NULL AND fk.table_schema = 'activerecord_unittest' AND fk.table_name = 'fk_test_has_pk' AND rc.table_name = 'fk_test_has_pk'\G *************************** 1. row *************************** id: 1 select_type: SIMPLE table: fk partitions: NULL type: ALL possible_keys: NULL key: TABLE_SCHEMA,TABLE_NAME key_len: NULL ref: NULL rows: NULL filtered: NULL Extra: Using where; Open_full_table; Scanned 0 databases *************************** 2. row *************************** id: 1 select_type: SIMPLE table: rc partitions: NULL type: ALL possible_keys: NULL key: TABLE_NAME key_len: NULL ref: NULL rows: NULL filtered: NULL Extra: Using where; Open_full_table; Scanned 1 database; Using join buffer (Block Nested Loop) 2 rows in set, 1 warning (0.00 sec) ``` Fixes #27579.
* | | | | Fix style guide violationsRafael Mendonça França2017-01-051-3/+3
|/ / / /
* | | | Require "models/post" before "models/comment"Yasuo Honda2017-01-042-2/+2
| | | | | | | | | | | | | | | | Refer a similar pull request #26370
* | | | Raise error when has_many through is defined before through associationChris Holmes2017-01-045-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/26834 This change raises an error if a has_many through association is defined before the through association.
* | | | Fix `find_by` and `where` consistencyRyuta Kamizono2017-01-042-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alternative of #26213. Currently `find_by` and `where` with AR object return inconsistent result. This is caused by statement cache does not support AR object. Passing to finder method to fix the issue. Fixes #26210.
* | | | Revert "Merge pull request #21233 from ↵Rafael Mendonça França2017-01-0324-198/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privileges" This reverts commit eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa, reversing changes made to 5c40239d3104543e70508360d27584a3e4dc5baf. Reason: Broke the isolated tests. https://travis-ci.org/rails/rails/builds/188721346
* | | | Revert "Merge pull request #27550 from ↵Rafael Mendonça França2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine" This reverts commit 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7, reversing changes made to a5041f267ded119c2d00b8786c2f2c1e3f93c8a1. Reason: It breaks the public API
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 10:54:21 +0000