aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #27847 from jaredbeck/patch-6Rafael França2017-01-301-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Docs: Specify return value of `save!`
| * | | | | | | | Docs: Specify return value of `save!`Jared Beck2017-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can never remember if it returns `self` or `true` (seems to be `true`) [ci skip]
* | | | | | | | | Merge pull request #27743 from jordanlewis/simplify-postgres-column-definitionsRafael França2017-01-301-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Simplify query in column_definitions() for Postgres
| * | | | | | | | Simplify Postgres query for column_definitions()Jordan Lewis2017-01-301-5/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | column_definitions() needs to fetch the collation for every column, if present. Previously, it did so using a correlated subquery - a subquery that references results from the outer scope. This patch updates the query to remove the subquery in favor of a simpler and more efficient JOIN clause. Running the two queries through EXPLAIN against Postgres additionally shows that the original form with a correlated subquery requires a Nested Loop Left Join, while the new form with a simple JOIN can use a more efficient Merge Left Join.
* | | | | | | | Merge pull request #27773 from kirs/serialized-error-attributeRafael França2017-01-305-17/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Report the attribute on ActiveRecord::SerializationTypeMismatch
| * | | | | | | Report the attribute on ActiveRecord::SerializationTypeMismatchKir Shatrov2017-01-295-17/+34
| |/ / / / / /
* | | | | | | Missing require "active_support/multibyte/chars"Akira Matsuda2017-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this probably fixes #25840
* | | | | | | Add assertion messagesAkira Matsuda2017-01-252-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This message could be generated by `assert_predicate`, https://github.com/rails/rails/commit/1853a4f2c8b2bddfbde6aae80abb08310295201c#commitcomment-20546113 but I'd rather handwrite the message string if I could reduce magic from the code by doing so.
* / / / / / move `db_migrate_path` method to `Migration` moduleyuuji.yaginuma2017-01-223-16/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Since `Migration` module is included in both `MigrationGenerator` and `ModelGenerator`, no need to define a common method for each class.
* | | | | Deprecate `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-206-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` These internal initialize methods are no longer used internally.
* | | | | Revert "Merge pull request #27718 from kamipo/remove_internal_public_methods"Matthew Draper2017-01-206-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 39c77eb1843f79925c7195e8869afc7cb7323682, reversing changes made to 9f6f51be78f8807e18fc6562c57af2fdbf8ccb56.
* | | | | Merge pull request #27384 from matthewd/bigint-pk-tweaksMatthew Draper2017-01-205-9/+7
|\ \ \ \ \ | | | | | | | | | | | | Tweak bigint PK handling
| * | | | | Tweak bigint PK handlingMatthew Draper2017-01-185-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't force PKs on tables that have explicitly opted out * All integer-like PKs are autoincrement unless they have an explicit default
* | | | | | Add CHANGELOG entry for #24743Ryuta Kamizono2017-01-191-2/+6
| | | | | |
* | | | | | assert_send is going to be deprecated since minitest 5.10.0Akira Matsuda2017-01-182-2/+2
| | | | | |
* | | | | | Make sure to clear query cache to prevent sporadic test failureAkira Matsuda2017-01-181-0/+4
| | | | | |
* | | | | | :warning: "Use assert_nil if expecting nil. This will fail in MT6."Akira Matsuda2017-01-184-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are followups for 307065f959f2b34bdad16487bae906eb3bfeaf28, but TBH I'm personally not very much confortable with this style. Maybe we could override assert_equal in our test_helper not to warn?
* | | | | | Remove `initialize_schema_migrations_table` and ↵Ryuta Kamizono2017-01-186-23/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `initialize_internal_metadata_table` internal public methods These internal methods accidentally appeared in the doc, and so almost useless. It is enough to create these internal tables directly, and indeed do so in several places. https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/schema.rb#L55 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/railties/databases.rake#L6 https://github.com/rails/rails/blob/v5.0.1/activerecord/lib/active_record/tasks/database_tasks.rb#L230
* | | | | Merge pull request #27674 from kjg/migration_generator_honor_path_configAndrew White2017-01-173-2/+22
|\ \ \ \ \ | | | | | | | | | | | | Generate migrations at path set by `config.paths["db/migrate"]`
| * | | | | Generate migrations at path set by `config.paths["db/migrate"]`Kevin Glowacz2017-01-163-2/+22
| | | | | |
* | | | | | Merge pull request #27700 from kenta-s/remove-meaningless-line-from-adapter-testAndrew White2017-01-171-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove meaningless line from adapter_test.rb
| * | | | | | Remove meaningless line from adapter_test.rbkenta-s2017-01-161-1/+0
| | | | | | |
* | | | | | | SQLite: Foreign Key SupportRyuta Kamizono2017-01-176-30/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://www.sqlite.org/foreignkeys.html
* | | | | | | Should work foreign key in test schema without `if supports_foreign_keys?` ↵Ryuta Kamizono2017-01-172-8/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement If an adapter does not support foreign key feature, should be noop. https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/foreign_key_test.rb#L288-L294 https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/test/cases/migration/references_foreign_key_test.rb#L208-L214
* | | | | | Add CHANGELOG entry for #27701Andrew White2017-01-161-0/+4
| | | | | |
* | | | | | Merge pull request #27701 from kamipo/translate_foreign_key_violationAndrew White2017-01-162-45/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translate Foreign Key violation to the specific exception for SQLite3 adapter
| * | | | | | Translate Foreign Key violation to the specific exception for SQLite3 adapterRyuta Kamizono2017-01-162-45/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise `ActiveRecord::InvalidForeignKey` when a record cannot be inserted or updated because it references a non-existent record for SQLite3 adapter.
* / / / / / Allow SQLServerAdapter to opt into a few tests.Ken Collins2017-01-163-4/+4
|/ / / / /
* | | | | 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