aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #32366 from utilum/use_current_configAndrew White2018-03-301-1/+1
|\ | | | | Use current_config in structure_dump
| * Use current_config in structure_dumputilum2018-03-291-1/+1
| | | | | | | | This looks like a typo from 0f0aa6a275876502e002c054896734d6536ba5cd
* | Merge pull request #32384 from riseshia/remove-expired-documentAndrew White2018-03-301-15/+1
|\ \ | | | | | | Remove expired explanation [ci skip]
| * | Remove expired explanation [ci skip]Shia2018-03-301-15/+1
| | | | | | | | | | | | Override callback doesn't work anymore.
* | | Remove shadowing variable warningAndrew White2018-03-301-2/+2
|/ /
* | Fix intermittent CI failure due to setting explicit `person.id = 10`Ryuta Kamizono2018-03-301-4/+0
| | | | | | | | https://travis-ci.org/rails/rails/jobs/360109429
* | Merge pull request #32338 from eugeneius/dont_clobber_foreign_keyRyuta Kamizono2018-03-302-2/+4
|\ \ | | | | | | Don't unset foreign key when preloading missing record
| * | Don't unset foreign key when preloading missing recordEugene Kenny2018-03-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a belongs to association's target is set, its foreign key is now updated to match the new target. This is the correct behaviour when a new record is assigned, but not when the existing record is preloaded. As long as we mark the association as loaded, we can skip setting the target when the record is missing and avoid clobbering the foreign key.
* | | Short circuit the scoping delegation for `relation.all`Ryuta Kamizono2018-03-301-0/+1
| |/ |/| | | | | | | Previously `relation.all` behaves as `relation.scoping { klass.all }`. But it is just enough to `relation.spawn`.
* | Merge pull request #30956 from CJStadler/with-lock-changed-deprecationRafael França2018-03-284-1/+24
| | | | | | | | Fix deprecation warnings from with_lock
* | Merge pull request #32299 from davidstosik/expose-fk-ignore-patternGuillermo Iguaran2018-03-276-2/+36
|\ \ | | | | | | Expose foreign key name ignore pattern in configuration
| * | Move fk_ignore_pattern from config.active_record to SchemaDumperDavid Stosik2018-03-225-9/+11
| | | | | | | | | | | | | | | This makes more sense, as the foreign key ignore pattern is only used by the schema dumper.
| * | Test config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+8
| | |
| * | Document config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+4
| | |
| * | Expose foreign key name ignore pattern in configurationDavid Stosik2018-03-197-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumping the database schema, Rails will dump foreign key names only if those names were not generate by Rails. Currently this is determined by checking if the foreign key name is `fk_rails_` followed by a 10-character hash. At [Cookpad](https://github.com/cookpad), we use [Departure](https://github.com/departurerb/departure) (Percona's pt-online-schema-change runner for ActiveRecord migrations) to run migrations. Often, `pt-osc` will make a copy of a table in order to run a long migration without blocking it. In this copy process, foreign keys are copied too, but [their name is prefixed with an underscore to prevent name collision ](https://www.percona.com/doc/percona-toolkit/LATEST/pt-online-schema-change.html#cmdoption-pt-online-schema-change-alter-foreign-keys-method). In the process described above, we often end up with a development database that contains foreign keys which name starts with `_fk_rails_`. That name does not match the ignore pattern, so next time Rails dumps the database schema (eg. when running `rake db:migrate`), our `db/schema.rb` file ends up containing those unwanted foreign key names. This also produces an unwanted git diff that we'd prefer not to commit. In this PR, I'd like to suggest a way to expose the foreign key name ignore pattern to the Rails configuration, so that individual projects can decide on a different pattern of foreign keys that will not get their names dumped in `schema.rb`.
* | | Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-dbEileen M. Uchitelle2018-03-266-22/+271
|\ \ \ | |_|/ |/| | Part 1 Easy Multi db in Rails: Add basic rake tasks for multi db setup
| * | Refactor configs_for and friendseileencodes2018-03-216-56/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the configs_for and DatabaseConfig struct into it's own file. I was considering doing this in a future refactoring but our set up forced me to move it now. You see there are `mattr_accessor`'s on the Core module that have default settings. For example the `schema_format` defaults to Ruby. So if I call `configs_for` or any methods in the Core module it will reset the `schema_format` to `:ruby`. By moving it to it's own class we can keep the logic contained and avoid this unfortunate issue. The second change here does a double loop over the yaml files. Bear with me... Our tests dictate that we need to load an environment before our rake tasks because we could have something in an environment that the database.yml depends on. There are side-effects to this and I think there's a deeper bug that needs to be fixed but that's for another issue. The gist of the problem is when I was creating the dynamic rake tasks if the yaml that that rake task is calling evaluates code (like erb) that calls the environment configs the code will blow up because the environment is not loaded yet. To avoid this issue we added a new method that simply loads the yaml and does not evaluate the erb or anything in it. We then use that yaml to create the task name. Inside the task name we can then call `load_config` and load the real config to actually call the code internal to the task. I admit, this is gross, but refactoring can't all be pretty all the time and I'm working hard with `@tenderlove` to refactor much more of this code to get to a better place re connection management and rake tasks.
| * | Add tests for new rake taskseileencodes2018-03-211-1/+128
| | |
| * | Update schema/structure dump tasks for multi dbeileencodes2018-03-212-14/+36
| | | | | | | | | | | | | | | | | | | | | Adds the ability to dump the schema or structure files for mulitple databases. Loops through the configs for a given env and sets a filename based on the format, then establishes a connection for that config and dumps into the file.
| * | Add ability to create/drop/migrate all dbs for a given enveileencodes2018-03-212-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `each_current_configuration` is used by create, drop, and other methods to find the configs for a given environment and returning those to the method calling them. The change here allows for the database commands to operate on all the configs in the environment. Previously we couldn't slice the hashes and iterate over them becasue they could be two tier or could be three tier. By using the database config structs we don't need to care whether we're dealing with a three tier or two tier, we can just parse all the configs based on the environment. This makes it possible for us to run `bin/rails db:create` and it will create all the configs for the dev and test environment ust like it does for a two tier - it creates the db for dev and test. Now `db:create` will create `primary` for dev and test, and `animals` for dev and test if our database.yml looks like: ``` development: primary: etc animals: etc test: primary: etc animals: etc ``` This means that `bin/rails db:create`, `bin/rails db:drop`, and `bin/rails db:migrate` will operate on the dev and test env for both primary and animals ds.
| * | Add create/drop/migrate db tasks for each database in the environmenteileencodes2018-03-211-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a three-tier yaml file like this: ``` development: primary: database: "development" animals: database: "development_animals" migrations_paths: "db/animals_migrate" ``` This will add db create/drop/and migrate tasks for each level of the config under that environment. ``` bin/rails db:drop:primary bin/rails db:drop:animals bin/rails db:create:primary bin/rails db:create:animals bin/rails db:migrate:primary bin/rails db:migrate:animals ```
| * | Add DatabaseConfig Struct and associated methodseileencodes2018-03-211-0/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing around and parsing hashes is easy if you know that it's a two tier config and each key will be named after the environment and each value will be the config for that environment key. This falls apart pretty quickly with three-tier configs. We have no idea what the second tier will be named (we know the first is primary but we don't know the second), we have no easy way of figuring out how deep a hash we have without iterating over it, and we'd have to do this a lot throughout the code since it breaks all of Active Record's assumptions regarding configurations. These methods allow us to pass around objects instead. This will allow us to more easily parse the configs for the rake tasks. Evenually I'd like to replace the Active Record connection management that passes around config hashes to use these methods as well but that's much farther down the road. `walk_configs` takes an environment, specification name, and a config and turns them into DatabaseConfig struct objects so we can ask the configs questions like: ``` db_config.spec_name => animals db_config.env_name => development db_config.config { :adapter => mysql etc } ``` `db_configs` loops through all given configurations and returns an array of DatabaseConfig structs for each config in the yaml file. and lastly `configs_for` takes an environment and either returns the spec name and config if a block is given or returns an array of DatabaseConfig structs just for the given environment.
* | Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefixAndrew White2018-03-245-6/+50
|\ \ | | | | | | Add custom prefix to ActiveRecord::Store accessors
| * | Add custom prefix to ActiveRecord::Store accessorsTan Huynh2018-03-235-6/+50
| | | | | | | | | | | | | | | | | | Add a prefix option to ActiveRecord::Store.store_accessor and ActiveRecord::Store.store. This option allows stores to have identical keys with different accessors.
* | | Fix that `touch(:updated_at)` causes multiple assignments on the columnRyuta Kamizono2018-03-232-1/+11
|/ / | | | | | | | | | | | | The multiple assignments was caused by 37a1dfa due to lost the `to_s` normalization for given names. Fixes #32323.
* | Add `QueryingMethodsDelegationTest` to cover query methods delegationRyuta Kamizono2018-03-221-0/+28
| | | | | | | | | | It makes to ease to detect a future regression as long as the methods are covered by this test.
* | Merge pull request #32221 from composerinteralia/batch-predicate-builderRyuta Kamizono2018-03-221-10/+16
|\ \ | | | | | | Use PredicateBuilder for bind params in Relation::Batches
| * | Use PredicateBuilder for bind params in BatchesDaniel Colson2018-03-111-10/+16
| | | | | | | | | | | | | | | | | | Using the PredicateBuilder to build the bind attributes allows Batch to drop its dependency on Relation::QueryAttribute and Arel::Nodes::BindParam
* | | Support mysql2 0.4.x and 0.5.xAaron Stone2018-03-201-1/+1
| |/ |/|
* | Merge pull request #32278 from ↵Eileen M. Uchitelle2018-03-191-2/+2
|\ \ | | | | | | | | | | | | saveriomiroddi/add_mysql_json_to_activerecord_store_documentation Add MySQL JSON reference to ActiveRecord::Store documentation
| * | Add MySQL JSON reference to ActiveRecord::Store documentationSaverio Miroddi2018-03-171-2/+2
| | | | | | | | | | | | | | | | | | The current documentation explicitly mentions only PostgreSQL (hstore/json) for use with `.store_accessor`, making it somewhat confusing what to choose on a MySQL 5.7+ setup (which introduced a json data type).
* | | Fix failing `QuotingTest#test_quoted_time_utc`bogdanvlviv2018-03-191-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test fails in specific time. Example: If run this test on the machine with time 01:00 am UTC+2, this test will fail. Changing representing of 2000-01-01 01:00 am UTC+2 to UTC+0 change the day, month and even year in our case, so substitution `"2000-01-01 "` to `""` isn't possible. ``` Failure: ActiveRecord::ConnectionAdapters::QuotingTest#test_quoted_time_utc Expected: "1999-12-31 23:01:27" Actual: "23:01:27" ``` Related to 7c479cbf
* | Merge pull request #32271 from eileencodes/fix-three-tier-default-connectionEileen M. Uchitelle2018-03-163-1/+52
|\ \ | | | | | | Fix default connection handling with three-tier config
| * | Fix connection handling with three-tier configeileencodes2018-03-163-1/+52
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you had a three-tier config, the `establish_connection` that's called in the Railtie on load can't figure out how to access the default configuration. This is because Rails assumes that the config is the first value in the hash and always associated with the key from the environment. With a three tier config however we need to go one level deeper. This commit includes 2 changes. 1) removes a line from `resolve_all` which was parsing out the the environment from the config so instead of getting ``` { :development => { :primary => { :database => "whatever" } }, :animals => { :database => "whatever-animals" } }, etc with test / prod } ``` We'd instead end up with a config that had no attachment to it's envioronment. ``` { :primary => { :database => "whatever" } :animals => { :database => "whatever-animals" } etc - without test and prod } ``` Not only did this mean that Active Record didn't know how to establish a connection, it didn't have the other necessary configs along with it in the configs list. So fix this I removed the line that deletes these configs. The second thing this commit changes is adding this line to `establish_connection` ``` spec = spec[spec_name.to_sym] if spec[spec_name.to_sym] ``` When you have a three-tier config and don't pass any hash/symbol/env etc to `establish_connection` the resolver will automatically return both the primary and secondary (in this case animals db) configurations. We'll get an `database configuration does not specify adapter` error because AR will try to establish a connection on the `primary` key rather than the `primary` key's config. It assumes that the `development` or default env automatically will return a config hash, but with a three-tier config we actually get a key and config `primary => config`. This fix is a bit of a bandaid because it's not the "correct" way to handle this situation, but it does solve our immediate problem. The new code here is saying "if the config returned from the resolver (I know it's called spec in here but we interchange our meanings a LOT and what is returned is a three-tier config) has a key matching the "primary" spec name, grab the config from the spec and pass that to the estalbish_connection method". This works because if we pass `:animals` or a hash, or `:primary` we'll already have the correct configuration to connect with. This fixes the case where we want Rail to connect with the default connection. Coming soon is a refactoring that should eliminate the need to do this but I need this fix in order to write the multi-db rake tasks that I promised in my RailsConf submission. `@tenderlove` and I are working on the refactoring of the internals for connection management but it won't be ready for a few weeks and this issue has been blocking progress.
* | :scissors:Rafael Mendonça França2018-03-161-1/+0
| | | | | | | | [ci skip]
* | Fix multiline expression indexes for postgresql (#31621)fatkodima2018-03-163-3/+3
| |
* | Merge pull request #31250 from ↵Kasper Timm Hansen2018-03-155-9/+66
|\ \ | | | | | | | | | | | | lsylvester/only-preload-misses-on-multifetch-cache Only preload misses on multifetch cache
| * | Only preload misses on multifetch cacheLachlan Sylvester2018-03-065-9/+66
| | |
* | | Merge pull request #32220 from rails/fix-time-columns-on-sqlite3Andrew White2018-03-156-5/+81
|\ \ \ | | | | | | | | Time column improvements
| * | | Ensure that leading date is stripped by quoted_timeAndrew White2018-03-112-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #24542, quoted_time was introduced to strip the leading date component for time columns because it was having a significant effect in mariadb. However, it assumed that the date component was always 2000-01-01 which isn't the case, especially if the source wasn't another time column.
| * | | Normalize date component when writing to time columnsAndrew White2018-03-112-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For legacy reasons Rails stores time columns on sqlite as full timestamp strings. However because the date component wasn't being normalized this meant that when they were read back they were being prefixed with 2001-01-01 by ActiveModel::Type::Time. This had a twofold result - first it meant that the fast code path wasn't being used because the string was invalid and second it was corrupting the second fractional component being read by the Date._parse code path. Fix this by a combination of normalizing the timestamps on writing and also changing Active Model to be more lenient when detecting whether a string starts with a date component before creating the dummy time value for parsing.
| * | | Apply time column precision on assignmentAndrew White2018-03-112-0/+36
| | |/ | |/| | | | | | | | | | | | | | | | In #20317, datetime columns had their precision applied on assignment but that behaviour wasn't applied to time columns - this commit fixes that. Fixes #30301.
* / | Remove changelog header for unreleased versionRafael Mendonça França2018-03-131-2/+0
|/ / | | | | | | | | | | We only add the header when releasing to avoid some conflicts. [ci skip]
* | Merge pull request #32213 from ↵Ryuta Kamizono2018-03-092-1/+6
|\ \ | | | | | | | | | | | | | | | yujideveloper/feature/delegate-ar-base-pick-to-all Add `delegate :pick, to: :all`
| * | Add `delegate :pick, to: :all`Yuji Hanamura2018-03-092-1/+6
|/ /
* | Revert "PERF: Recover `changes_applied` performance (#31698)"Sean Griffin2018-03-062-2/+5
| | | | | | | | This reverts commit a19e91f0fab13cca61acdb1f33e27be2323b9786.
* | Fix dependence on has_one/belongs_to relationshipsFernando Gorodscy2018-03-064-1/+58
|/ | | | | | | | | | | | | | | | | | | | | | | | | | When a class has a belongs_to or has_one relationship with dependent: :destroy option enabled, objects of this class should not be deleted if it's dependents cannot be deleted. Example: class Parent has_one :child, dependent: :destroy end class Child belongs_to :parent, inverse_of: :child before_destroy { throw :abort } end c = Child.create p = Parent.create(child: c) p.destroy p.destroyed? # expected: false; actual: true; Fixes #32022
* update comment to reflect new supported patterns [ci skip]Xavier Noria2018-03-061-0/+4
|
* whitelist NULLS { FIRST | LAST } in order clausesXavier Noria2018-03-062-1/+28
|
* Fix that after commit callbacks on update does not triggered when optimistic ↵Ryuta Kamizono2018-03-063-53/+42
| | | | | | | | | | | | | | | | | | locking is enabled This issue is caused by `@_trigger_update_callback` won't be updated due to `_update_record` in `Locking::Optimistic` doesn't call `super` when optimistic locking is enabled. Now optimistic locking concern when updating is supported by `_update_row` low level API, therefore overriding `_update_record` is no longer necessary. Removing the method just fix the issue. Closes #29096. Closes #29321. Closes #30823.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 03:47:31 +0000