aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25873 from schuetzm/warn_about_dirty_lockRafael Mendonça França2017-02-073-2/+18
|\ | | | | | | Deprecate locking of dirty records
| * Deprecate locking of dirty recordsMarc Schütz2017-02-073-2/+18
| |
* | Remove deprecated behavior that halts callbacks when the return is falseRafael Mendonça França2017-02-074-121/+4
| |
* | Merge pull request #27608 from ↵Rafael França2017-02-071-47/+0
|\ \ | |/ |/| | | | | kamipo/remove_deprecated_passing_string_to_define_callback Remove deprecated passing string to define callback
| * Remove deprecated passing string to define callbackRyuta Kamizono2017-02-041-47/+0
| | | | | | | | And raise `ArgumentError` when passing string to define callback.
* | Revert "Remove useless `column_alias` in `subquery_for_count`"Ryuta Kamizono2017-02-072-3/+3
| | | | | | | | This reverts commit 28977f1fa3d7b15c1608174a165e60b71ddf3995.
* | Merge pull request #27334 from ↵Jeremy Daer2017-02-0712-31/+79
|\ \ | | | | | | | | | | | | kamipo/pk_and_ref_columns_should_be_identical_type `primary_key` and `references` columns should be identical type
| * | `primary_key` and `references` columns should be identical typeRyuta Kamizono2017-02-0712-31/+79
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26266. The default type of `primary_key` and `references` were changed to `bigint` since #26266. But legacy migration and sqlite3 adapter should keep its previous behavior.
* | | Merge pull request #26378 from ↵Jeremy Daer2017-02-064-41/+51
|\ \ \ | | | | | | | | | | | | | | | | kamipo/decouple_building_arel_ast_for_uniqueness_validator Decouple the building Arel ASTs for uniqueness validator
| * | | Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`Ryuta Kamizono2017-01-202-3/+3
| | | | | | | | | | | | | | | | These methods are obviously for internal use.
| * | | Decouple the building Arel ASTs for uniqueness validatorRyuta Kamizono2016-12-254-38/+48
| | | | | | | | | | | | | | | | | | | | | | | | Currently uniqueness validator is coupled with building Arel ASTs. This commit extracts `WhereClauseFactory#build_for_case_sensitive` for decouple the building Arel ASTs.
* | | | Remove useless `column_alias` in `subquery_for_count`Ryuta Kamizono2017-02-062-5/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | If select clause is specified and last column has a column alias, additional column alias causes a statement invalid. Add test coverage for counting a single column with NULL values. Fixes #27676, #27682, and #27705.
* | | Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctlyJeremy Daer2017-02-0611-236/+191
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the behaviour of the compatibility layer for integer-like PKs * kamipo/fix_mysql_pk_dumping_correctly: Restore custom primary key tests lost at #26266 Restore the behaviour of the compatibility layer for integer-like PKs Correctly dump integer-like primary key with default nil
| * | | Restore custom primary key tests lost at #26266Ryuta Kamizono2017-02-041-25/+43
| | | | | | | | | | | | | | | | | | | | Some custom primary key tests (added at #17631, #17696, #18220, #18228) were lost at #26266. Restore the tests to improve test coverage.
| * | | Restore the behaviour of the compatibility layer for integer-like PKsRyuta Kamizono2017-02-046-174/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PR #27384 changed migration compatibility behaviour. ```ruby class CreateMasterData < ActiveRecord::Migration[5.0] def change create_table :master_data, id: :integer do |t| t.string :name end end end ``` Previously this migration created non-autoincremental primary key expected. But after the PR, the primary key changed to autoincremental, it is unexpected. This change restores the behaviour of the compatibility layer.
| * | | Correctly dump integer-like primary key with default nilRyuta Kamizono2017-02-045-40/+40
| | |/ | |/| | | | | | | | | | | | | | | | The PR #27384 changed integer-like primary key to be autoincrement unless an explicit default. This means that integer-like primary key is restored as autoincrement unless dumping the default nil explicitly. We should dump integer-like primary key with default nil correctly.
* | | Merge pull request #27884 from kamipo/deprecate_migration_keysJeremy Daer2017-02-067-6/+18
|\ \ \ | | | | | | | | Deprecate `ColumnDumper#migration_keys`
| * | | Deprecate `ColumnDumper#migration_keys`Ryuta Kamizono2017-02-077-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | `ColumnDumper#migration_keys` was extracted to customize keys for standardized column arguments widths. But the feature was removed in df84e98. The internal method is no longer used for that.
* | | | Remove useless `MySQL::Column` testsRyuta Kamizono2017-02-071-42/+0
|/ / / | | | | | | | | | | | | | | | | | | Since text default treated as an empty string in non-strict mode has been removed in #26154, `MySQL::Column` behaves like any other column. Also, The difference between strict and non-strict mode is covered by `test_mysql_not_null_defaults_strict` and `test_mysql_not_null_defaults_non_strict`.
* | | Merge pull request #27919 from bf4/correct_spellingArthur Nogueira Neves2017-02-069-15/+15
|\ \ \ | | | | | | | | Correct spelling
| * | | Correct spellingBenjamin Fleischer2017-02-059-15/+15
| |/ / | | | | | | | | | | | | | | | | | | ``` go get -u github.com/client9/misspell/cmd/misspell misspell -w -error -source=text . ```
* / / Indicate action that failed in YamlColumnKir Shatrov2017-02-054-10/+10
|/ /
* | Merge pull request #27865 from composerinteralia/collection-ids-setter-bugEileen M. Uchitelle2017-02-033-2/+17
|\ \ | | | | | | Fix collection_singular_ids= bug
| * | Fix collection_singular_ids= bugDaniel Colson2017-02-023-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the association's primary key is manually set as a symbol and called with an array of strings, CollectionAssociation#ids_writer fails to cast the ids to integers. This is because AssociationReflection#association_primary_key_type and ThroughReflection#association_primary_key_type return the incorrect type, since ModelSchema.type_for_attribute only accepts a string. The result is an ActiveRecord::RecordNotFound error.
* | | Fix a test of AR::Type::TypeMap#lookup when using OracleKoichi ITO2017-02-021-6/+14
|/ /
* | Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+Ryuta Kamizono2017-02-0113-28/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL generated columns: https://dev.mysql.com/doc/refman/5.7/en/create-table-generated-columns.html MariaDB virtual columns: https://mariadb.com/kb/en/mariadb/virtual-computed-columns/ Declare virtual columns with `t.virtual name, type: …, as: "expression"`. Pass `stored: true` to persist the generated value (false by default). Example: create_table :generated_columns do |t| t.string :name t.virtual :upper_name, type: :string, as: "UPPER(name)" t.virtual :name_length, type: :integer, as: "LENGTH(name)", stored: true t.index :name_length # May be indexed, too! end Closes #22589
* | Chain scope constraints should respect own table aliasRyuta Kamizono2017-02-016-5/+41
| | | | | | | | Fixes #27666.
* | Merge pull request #27859 from yahonda/diag27826Rafael França2017-01-311-11/+22
|\ \ | | | | | | Use temporary connection pool for sqlite3_mem adapter
| * | Use temporary connection pool for sqlite3_mem adapterYasuo Honda2017-01-311-11/+22
| | | | | | | | | | | | | | | Fixes #27826 Refer https://github.com/rails/rails/commit/f7b317175430a2d9300d9c4acfc1f34f4fdb2fbc
* | | Merge pull request #27767 from benoittgt/freeze_sql_type_with_get_oid_typeArthur Nogueira Neves2017-01-311-1/+1
|\ \ \ | | | | | | | | Freeze default empty string for sql_type in get_oid_type
| * | | Freeze default empty string for sql_type in get_oid_typeBenoit Tigeot2017-01-221-1/+1
| | | | | | | | | | | | | | | | One empty string allocation per column per row.
* | | | Merge pull request #27855 from kevinzwhuang/finder-methods-typo-fixEileen M. Uchitelle2017-01-311-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo about sort in finder_methods.rb
| * | | | Fix grammar typo about sort in finder_methods.rbKevin Huang2017-01-301-2/+2
| | | | |
* | | | | Merge pull request #27838 from kamipo/reload_destroyed_through_recordRafael França2017-01-312-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | Reload `through_record` that has been destroyed in `create_through_record`
| * | | | Reload `through_record` that has been destroyed in `create_through_record`Ryuta Kamizono2017-01-292-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative of #27714. If `has_one :through` association has set `nil`, `through_record` is destroyed but still remain loaded target in `through_proxy` until `reload` or `reset` explicitly. If `through_proxy` is not reset (remain destroyed (frozen) target), setting new record causes `RuntimeError: Can't modify frozen hash`. To prevent `RuntimeError`, should reload `through_record` that has been destroyed in `create_through_record`.
* | | | | Merge pull request #27849 from joevandyk/patch-2Rafael França2017-01-311-1/+2
| | | | | | | | | | | | | | | Specify complete path to AR::LegacyYamlAdapter
* | | | | Merge pull request #27797 from y-yagi/correctly_check_error_messageArthur Nogueira Neves2017-01-302-5/+13
|\ \ \ \ \ | | | | | | | | | | | | correctly check error message
| * | | | | correctly check error messageyuuji.yaginuma2017-01-252-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `assert_raise` does not check error message. However, in some tests, it seems like expecting error message checking with `assert_raise`. Instead of specifying an error message in `assert_raise`, modify to use another assert to check the error message.
* | | | | | Avoid lambda scopes when possibleAaron Patterson2017-01-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lambda scopes require a bunch more work. Ideally the `scope` list would be a homogeneous collection. In this case, the reflection knows how to construct the right reflection for this join, so lets just construct that relation rather than instance execing to figure it out later.
* | | | | | deprecate `scope_chain`Aaron Patterson2017-01-302-5/+17
| | | | | |
* | | | | | update comments and call `super`Aaron Patterson2017-01-301-24/+3
| | | | | |
* | | | | | remove caching until we prove it is requiredAaron Patterson2017-01-301-7/+3
| | | | | |
* | | | | | Fix `scopes` implementation on `PolymorphicReflection`Aaron Patterson2017-01-303-54/+15
| | | | | | | | | | | | | | | | | | | | | | | | `PolymorphicReflection` needs to be custom for handling scope lambdas
* | | | | | Implement `scopes` method on each Reflectioneileencodes2017-01-301-5/+47
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Each reflection should be responsible for returning the scopes needed to query against the db.
* | | | | Merge pull request #27787 from y-yagi/show_correct_class_name_in_migration_errorRafael França2017-01-302-3/+4
|\ \ \ \ \ | | | | | | | | | | | | show correct class name in migration inherited directly error
| * | | | | show correct class name in migration inherited directly erroryuuji.yaginuma2017-01-242-3/+4
| |/ / / / | | | | | | | | | | | | | | | Follow up to 249f71a
* | | | | 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.