aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22345 from GUI/fix-multi-schema-structure-dumpYves Senn2015-11-301-2/+2
|\ | | | | | | | | | | | | | | | | Fix rake db:structure:dump on Postgres when multiple schemas are used Conflicts: activerecord/CHANGELOG.md Closes #22346.
| * Fix rake db:structure:dump on Postgres when multiple schemas are used.Nick Muerdter2015-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If postgresql is being used and there are multiple schemas listed on the `schema_search_path`, then `structure.sql` dumps (triggered by `rake db:structure:dump` or `config.active_record.schema_format = :sql`) began failing in Rails 4.2.5. This is due to the changes made in https://github.com/rails/rails/pull/17885 The problem is that multiple schemas were getting getting passed to `Kernel.system` as a single, space delimited string argument (for example, "--schema=foo --schema=bar"). However, with the updated array style of calling `Kernel.system`, these need to be passed as separate arguments (for example, "--schema=foo", "--schema=bar"). If they get passed as a single string, then the underlying pg_dump program isn't sure how to interpret that single argument and you'll get an error reporting: "pg_dump: No matching schemas were found"
* | Merge pull request #22451 from kamipo/refactor_abstract_adapter_initializeKasper Timm Hansen2015-11-304-8/+7
|\ \ | | | | | | Refactor `AbstractAdapter#initialize`
| * | Refactor `AbstractAdapter#initialize`Ryuta Kamizono2015-11-304-8/+7
| | | | | | | | | | | | `pool` in args is unused anymore. And `config` is used in all adapters.
* | | Merge pull request #18155 from bogdan/collection_association_double_element_fixSean Griffin2015-11-291-4/+8
|\ \ \ | |/ / |/| | Bugfix collection association #create method
| * | Bugfix collection association #create method …Bogdan Gusiev2015-11-231-4/+8
| | | | | | | | | | | | | | | When same association is loaded in the model creation callback The new object is inserted into association twice
* | | `connection_options` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-293-3/+3
| | | | | | | | | | | | Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
* | | Revert "Add prepared statements support for `Mysql2Adapter`"Sean Griffin2015-11-263-145/+151
| | |
* | | Merge pull request #22415 from kamipo/prepared_statements_for_mysql2_adapterSean Griffin2015-11-263-151/+145
|\ \ \ | | | | | | | | Add prepared statements support for `Mysql2Adapter`
| * | | Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2015-11-263-151/+145
| | | |
* | | | Docs: ActiveRecord::QueryMethods#joinsJared Beck2015-11-251-2/+22
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #22304 from ↵Yves Senn2015-11-241-6/+12
|\ \ \ | | | | | | | | | | | | | | | | kamipo/schema_dumping_support_for_postgresql_geometric_types Add schema dumping support for PostgreSQL geometric data types
| * | | Add schema dumping support for PostgreSQL geometric data typesRyuta Kamizono2015-11-241-6/+12
| | | |
* | | | Merge pull request #22214 from ↵Rafael França2015-11-244-15/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/not_passing_native_database_types_to_table_definition Not passing `native_database_types` to `TableDefinition`
| * | | | Not passing `native_database_types` to `TableDefinition`Ryuta Kamizono2015-11-084-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `native_database_types` only used in `TableDefinition` for look up the default `:limit` option. But this is duplicated process with `type_to_sql`. Passing `native_database_types` is not needed.
* | | | | Merge pull request #22388 from ↵Sean Griffin2015-11-233-9/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/set_field_encoding_is_only_needed_for_mysql_adapter `set_field_encoding` is only needed for `MysqlAdapter`
| * | | | | `set_field_encoding` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-243-9/+8
| | |/ / / | |/| | | | | | | | | | | | | Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
* | | | | Merge pull request #21000 from twalpole/find_or_parameter_issuesSean Griffin2015-11-232-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Update and fix forbidden attributes test issues caused by AC::Parameters change
| * | | | Update and fix forbidden attributes testsThomas Walpole2015-11-032-1/+6
| | | | | | | | | | | | | | | | | | | | Add AC::Parameters tests for WhereChain#not
* | | | | Remove blanket array delegation from `Relation`Sean Griffin2015-11-231-14/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As was pointed out by #17128, our blacklist of mutation methods was non-exhaustive (and would need to be kept up to date with each new version of Ruby). Now that `Relation` includes `Enumerable`, the number of methods that we actually need to delegate are pretty small. As such, we can change to explicitly delegating the few non-mutation related methods that `Array` has which aren't on `Enumerable`
* | | | Merge pull request #22362 from radar/toggle-documentationClaudio B2015-11-201-0/+8
|\ \ \ \ | |_|_|/ |/| | | Add example for AR::Persistence#toggle
| * | | Add example for AR::Persistence#toggleRyan Bigg2015-11-211-0/+8
| | | |
* | | | Revert "Allow specifying the default table options for mysql adapters"Sean Griffin2015-11-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8246b593bff71f2cebf274c133bb8917f1e094c8. There was concern about this modifying the behavior of past migrations. We're going to add an way to modify the migration generator instead.
* | | | Allow specifying the default table options for mysql adaptersSean Griffin2015-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's often the case that you want to have an option that you cannot specify at the database level, but want applied to *all* tables that you create. For example, you might want to specify `ROW_FORMAT=DYNAMIC` to not have to limit text columns to length 171 for indexing when using utf8mb4. This allows an easy way to specify this in your database configuration. While this change affects both MySQL and MySQL2, the test only covers MySQL2, as the legacy mysql adapter appears to always return ASCII strings, and is tangential to what we're actually doing.
* | | | Rename 'key' to 'lock_id' or 'lock_name' for advisory lockingSam Davies2015-11-184-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - key was a poor choice of name. A key implies something that will unlock a lock. The concept is actually more like a 'lock identifier' - mysql documentation calls this a 'lock name' - postgres documentation calls it a 'lock_id' - Updated variable names to reflect the preferred terminology for the database in question
* | | | Raise ArgumentError when passing a truthy value to mergeAndrew White2015-11-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | In b71e08f we started raising when nil or false was passed to merge to fix #12264, however we should also do this for truthy values that are invalid like true.
* | | | Merge pull request #22257 from yui-knk/fix_merge_to_not_call_to_proc_for_hashAndrew White2015-11-171-3/+5
|\ \ \ \ | | | | | | | | | | Make `AR::SpawnMethods#merge!` to check an arg is a Proc
| * | | | Make `AR::SpawnMethods#merge!` to check an arg is a Procyui-knk2015-11-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Ruby ( 2.3.0dev trunk 52520), `Hash#to_proc` is defined (https://github.com/ruby/ruby/commit/fbe967ec02cb65a7efa3fb8f3d747cf6f620dde1), and many tests have been failed with `ArgumentError: wrong number of arguments (given 0, expected 1)`. Because we call `Hash#to_proc` with no args in `#merge!`. This commit changes order of conditionals to not call `Hash#to_proc`.
* | | | | Merge pull request #22300 from yui-knk/fix_21893Sean Griffin2015-11-161-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Except keys of `build_record`'s argument from `create_scope` in initi…
| * | | | | Except keys of `build_record`'s argument from `create_scope` in ↵yui-knk2015-11-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize_attributes If argument of `build_record` has key and value which is same as default value of database, we should also except the key from `create_scope` in `initialize_attributes`. Because at first `build_record` initialize record object with argument of `build_record`, then assign attributes derived from Association's scope. In this case `record.changed` does not include the key, which value is same as default value of database, so we should add the key to except list. Fix #21893.
* | | | | | Merge pull request #22302 from ↵Yves Senn2015-11-162-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_not_needed_native_database_types_entries Remove not needed `NATIVE_DATABASE_TYPES` entries
| * | | | | | Remove not needed `NATIVE_DATABASE_TYPES` entriesRyuta Kamizono2015-11-162-4/+0
| |/ / / / /
* / / / / / Freeze association foreign keys to reduce allocationsSean Griffin2015-11-151-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string returned here will ultimately get used as a key of a hash in the attribute set once the attributes are being built. When you give a non-frozen string to `Hash#[]`, it will be duped. Be freezing we can significantly reduce the number of times we end up allocating `"user_id"` This does not include any additional tests, as this should not have any public facing implications. If you are mutating the result of `Reflection#foreign_key`, please stop.
* / / / / Deprecate `#table_exists?`, `#tables` and passing arguments to `#talbes`yui-knk2015-11-096-12/+77
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on #21509, how views is treated by `#tables` are differ by each adapters. To fix this different behavior, after Rails 5.0 is released, deprecate `#tables`. And `#table_exists?` would check both tables and views. To make their behavior consistent with `#tables`, after Rails 5.0 is released, deprecate `#table_exists?`.
* | | | Improve support for non Active Record objects on `validates_associated`Kassio Borges2015-11-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Skipping `marked_for_destruction?` when the associated object does not responds to it make easier to validate virtual associations built on top of Active Model objects and/or serialized objects that implement a `valid?` instance method.
* | | | Update belongs_to.rbEhsan Yousefi2015-11-081-2/+1
| | | | | | | | | | | | There is no need to to assign reflection name to a variable, because it's called once.
* | | | docs, get rid of artifact in `RecordFetchWarning` docs.Yves Senn2015-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] There was a `ActiveRecord::Relation::RecordFetchWarning::ActiveSupport` artifact caused by subscribing to AS notifications.
* | | | docs, nodoc `EnumType`. [ci skip]Yves Senn2015-11-071-1/+1
| |_|/ |/| | | | | | | | | | | This type is backed by a class macro. Documentation related to the type casting behavior should be added in the macro description.
* | | docs, `ActiveRecord::JoinDependency` is not part of the public API.Yves Senn2015-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip] While `JoinDependency` and `JoinDependency::Aliases` were nodoced, the inner `Table` class made them appear in the API.
* | | docs, `ActiveRecord::TypeCaster` is not part of the public API.Yves Senn2015-11-073-3/+3
| | | | | | | | | | | | [ci skip]
* | | Ensure `#reset_column_information` clears child classes as wellSean Griffin2015-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added a redundant test for this under the attributes API as well, as that also causes this bug to manifest through public API (and demonstrates that calling `reset_column_information` on the child classes would be insufficient) Since children of a class should always share a table with their parent, just reloading the schema from the cache should be sufficient here. `reload_schema_from_cache` should probably become public and `# :nodoc:`, but I'd rather avoid the git churn here. Fixes #22057
* | | Avoids mutating the original response in connection management middlewareKevin Buchanan2015-11-061-4/+3
| | |
* | | Require only necessary concurrent-ruby classes.Jerry D'Antonio2015-11-043-3/+3
| | |
* | | Remove incorrect commentsAndrew White2015-11-041-4/+0
| |/ |/| | | | | | | | | Columns are no longer stored in an attribute since b8a533d. [ci skip]
* | Deprecate exception#original_exception in favor of exception#causeYuki Nishijima2015-11-038-17/+25
| |
* | Make `db:migrate:status` to render `1_some.rb` format migrate files.yui-knk2015-11-022-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `1_valid_people_have_last_names.rb` and `20150823202140_create_users.rb` are valid migration file name. But `1_valid_people_have_last_names.rb` is rendered as `********** NO FILE **********` when `rake db:migrate:status`. Fix to this bug, this commit includes * define some API private methdos and a Constant `match_to_migration_filename?`, `parse_migration_filename`, and `MigrationFilenameRegexp` * use these methods in `db:migrate:status` task Example: These files are in `db/migrate` * 1_valid_people_have_last_names.rb * 20150819202140_irreversible_migration.rb * 20150823202140_add_admin_flag_to_users.rb * 20150823202141_migration_tests.rb * 2_we_need_reminders.rb * 3_innocent_jointable.rb we can migrate all of them. Before ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 ********** NO FILE ********** up 002 ********** NO FILE ********** up 003 ********** NO FILE ********** up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ``` After ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 Valid people have last names up 002 We need reminders up 003 Innocent jointable up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ```
* | Define `sanitize_sql_for_order` for AR and use it inside `preprocess_order_args`yui-knk2015-11-022-5/+17
| | | | | | | | This commit follows up of 6a6dbb4c51fb0c58ba1a810eaa552774167b758a.
* | Allow bigint with default nil for avoiding auto increment primary keyRyuta Kamizono2015-11-022-3/+6
| | | | | | | | Such as #10404, #18206.
* | Remove `DEFAULT_CHARSET` and `DEFAULT_COLLATION` in `MySQLDatabaseTasks`Ryuta Kamizono2015-11-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6ca7e4e75408bc42f515fc7206d6c6ff0dce7c6. The default collation of utf8 in MySQL is the `utf8_general_ci`, and this should not be changed. This is because, the better collation in the all locales is not exists, optimal collation in own application is not known other than themselves. The `utf8_unicode_ci` is known as Japanese killer in Japan, there are serious impacts in search of Japanese. MySQL implements the `utf8_unicode_ci` according to the Unicode Collation Algorithm (UCA) described at http://www.unicode.org/reports/tr10/, but the `utf8_unicode_ci` have only partial support for the UCA, only primary level key comparison implemented (also known as L1 (Base characters) comparison). Because L1 (Base characters) comparison does not distinguish between the presence or absence of the accent, if distinction of the accent is important there is a serious impact (e.g. Japanese). Example: ``` > SHOW CREATE TABLE `dicts`\G *************************** 1. row *************************** Table: dicts Create Table: CREATE TABLE `dicts` ( `word` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `meaning` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci 1 row in set (0.00 sec) > INSERT INTO `dicts` VALUES ('ハハ', 'mother'), ('パパ', 'father'); Query OK, 2 rows affected (0.00 sec) > SELECT * FROM `dicts` WHERE `word` = 'ハハ'; +--------+---------+ | word | meaning | +--------+---------+ | ハハ | mother | | パパ | father | +--------+---------+ 2 rows in set (0.00 sec) > CREATE UNIQUE INDEX `unique_index_word` ON `dicts`(`word`); ERROR 1062 (23000): Duplicate entry 'ハハ' for key 'unique_index_word' ``` We should omit the collation entirely rather than providing a default. Then the choice is the responsibility of the server and MySQL distribution.
* | Merge pull request #22125 from k0kubun/left_joinsSean Griffin2015-10-303-2/+4
|\ \ | | | | | | Alias left_joins to left_outer_joins