aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20569 from theSteveMitchell/masterYves Senn2015-09-223-15/+31
|\ | | | | | | Check mysql structure_load for errors
| * Check response of structure_load for mysql_database_tasks and make ↵Steve Mitchell2015-09-182-12/+35
| | | | | | | | structure_dump consistent
* | Eliminate `test_tables_quoting` following seems to be left in #21687Ronak Jangir2015-09-211-8/+0
| |
* | Skip the test added in 9cc324a on buggy versions of SQliteSean Griffin2015-09-212-17/+22
| | | | | | | | See 7dcfc25e7c52682a4343c2ba7188a69e7c06c936 for more details
* | Ensure aliased attributes passed to `select` are quoted if using `from`Sean Griffin2015-09-214-1/+21
| | | | | | | | | | | | Fixes #21488 [Sean Griffin & johanlunds]
* | We still need the `Helpers` constant in the `ActiveRecord` namespaceSean Griffin2015-09-211-0/+1
| | | | | | | | | | | | | | We should probably review the usage of these constants and decide whether we want to be more transparent about which things come from Active Model vs Active Record, as this is meaningful information as to whether there is database specific behavior or not.
* | Move the appropriate type tests to the Active Model suiteSean Griffin2015-09-215-292/+0
| | | | | | | | | | | | | | | | | | Any tests for a type which is not overridden by Active Record, and does not test the specifics of the attributes API interacting in more complex ways have no reason to be in the Active Record suite. Doing this revealed that the implementation of the date and time types in AM was actually completely broken, and incapable of returning any value other than `nil`.
* | Simplify the implementation of Active Model's type registrySean Griffin2015-09-211-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Things like decorations, overrides, and priorities only matter for Active Record, so the Active Model registry can be implemented much more simply. At this point, I wonder if having Active Record's registry inherit from Active Model's is even worth the trouble? The Active Model class was also missing test cases, which have been backfilled. This removes the error when two types are registered with the same name, but given that Active Model is meant to be significantly more generic, I do not think this is an issue for now. If we want, we can raise an error at the point that someone tries to register it.
* | Various stylistic nitpicksSean Griffin2015-09-216-42/+40
| | | | | | | | | | | | | | We do not need to require each file from AM individually, the type module does that for us. Even if the classes are extremely small right now, I'd rather keep any custom classes needed by AR in their own files, as they can easily have more complex changes in the future.
* | `TypeMap` and `HashLookupTypeMap` shouldn't be in Active ModelSean Griffin2015-09-213-4/+90
| | | | | | | | | | | | These are used by the connection adapters to convert SQL type information into the appropriate type object, and makes no sense outside of the context of Active Record
* | Move ActiveRecord::Type to ActiveModelKir Shatrov2015-09-2128-825/+78
| | | | | | | | The first step of bringing typecasting to ActiveModel
* | Merge pull request #21693 from joshuapinter/patch-1Jeremy Daer2015-09-201-0/+2
|\ \ | | | | | | Add title for key lengths for multiple keys.
| * | Add title for key lengths for multiple keys.Joshua Pinter2015-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Previously there was no separator between the two code examples so it looked like: ```ruby CREATE INDEX by_name ON accounts(name(10)) add_index(:accounts, [:name, :surname], name: 'by_name_surname', length: {name: 10, surname: 15}) ```
* | | Merge pull request #20009 from kamipo/foreign_keys_in_createJeremy Daer2015-09-203-17/+33
|\ \ \ | | | | | | | | Support for foreign keys in create table
| * | | Support for foreign keys in create tableRyuta Kamizono2015-09-203-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If foreign keys specified in create table, generated SQL is slightly more efficient. Definition: ``` create_table :testings do |t| t.references :testing_parent, foreign_key: true end ``` Before: ``` CREATE TABLE "testings" ("id" serial primary key, "testing_parent_id" integer); ALTER TABLE "testings" ADD CONSTRAINT "fk_rails_a196c353b2" FOREIGN KEY ("testing_parent_id") REFERENCES "testing_parents" ("id"); ``` After: ``` CREATE TABLE "testings" ("id" serial primary key, "testing_parent_id" integer, CONSTRAINT "fk_rails_a196c353b2" FOREIGN KEY ("testing_parent_id") REFERENCES "testing_parents" ("id")); ```
* | | | Merge pull request #21687 from kamipo/refactor_table_existsAndrew White2015-09-203-27/+10
|\ \ \ \ | |_|/ / |/| | | Refactor `table_exists?` in AbstractMysqlAdapter
| * | | Refactor `table_exists?` in AbstractMysqlAdapterRyuta Kamizono2015-09-203-27/+10
| |/ / | | | | | | | | | | | | | | | `table_exists?` calls `tables` twice when passed `'dbname.tblname'` arg. This change is that `table_exists?` execute only once query always and extra args of `tables` is removed.
* | | :hocho: TyposAkira Matsuda2015-09-211-1/+1
| | |
* | | :scissors: empty line at the top of filesAkira Matsuda2015-09-212-2/+0
|/ /
* | Merge pull request #17696 from kamipo/unsigned_integer_supportJeremy Daer2015-09-195-9/+144
|\ \ | | | | | | | | | Add `unsigned` support for numeric data types in MySQL
| * | Add `unsigned` types for numeric data types in MySQLRyuta Kamizono2015-09-184-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of using `unsigned` as the type: create_table :foos do |t| t.unsigned_integer :unsigned_integer t.unsigned_bigint :unsigned_bigint t.unsigned_float :unsigned_float t.unsigned_decimal :unsigned_decimal, precision: 10, scale: 2 end
| * | Add `unsigned` support for numeric data types in MySQLRyuta Kamizono2015-09-185-9/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos do |t| t.integer :unsigned_integer, unsigned: true t.bigint :unsigned_bigint, unsigned: true t.float :unsigned_float, unsigned: true t.decimal :unsigned_decimal, unsigned: true, precision: 10, scale: 2 end
* | | Merge pull request #19086 from kamipo/move_explain_into_abstract_mysql_adapterJeremy Daer2015-09-194-78/+113
|\ \ \ | | | | | | | | | | | | Move `explain` into `AbstractMysqlAdapter`
| * | | Move `explain` into `AbstractMysqlAdapter`Ryuta Kamizono2015-03-014-78/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Common methods in both mysql adapters are should be added to `AbstractMysqlAdapter`, but some methods had been added to `Mysql2Adapter`. (8744632f, 0306f82e, #14359) Some methods already moved from `Mysql2Adapter` to `AbstractMysqlAdapter`. (#17601, #17998) Common methods in both mysql adapters are remaining only the `explain` method in `Mysql2Adapter`.
* | | | Merge pull request #20645 from kamipo/fix_mysql_set_type_bugJeremy Daer2015-09-192-1/+10
|\ \ \ \ | | | | | | | | | | Fix undesired type lookup with `SET` in MySQL
| * | | | Fix infinite loop and lookup miss when `SET` type includes other typesRyuta Kamizono2015-06-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the following problems: * cause infinit type lookup loop when SET includes aliased types * For example: when SET('set') includes aliased type `set`, then aliased `varchar('set')` by type lookup, but type lookup infinit matching same rule. * cause type lookup miss when SET includes registered types * For example: when SET('time') includes registered type `time`, then aliased `varchar('time')` by type lookup, then matching `time` type.
| * | | | Fix the MySQL column type `SET` registration bugTaishi Kasuga2015-06-201-0/+4
| | | | |
* | | | | Merge pull request #21589 from ↵Jeremy Daer2015-09-192-16/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/eliminate_duplicated_visit_table_definition Eliminate the duplication code of `visit_TableDefinition`
| * | | | | Eliminate the duplication code of `visit_TableDefinition`Ryuta Kamizono2015-09-162-18/+13
| | | | | |
* | | | | | Merge pull request #21609 from kamipo/do_not_dump_view_as_tableJeremy Daer2015-09-197-1/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Do not dump a view as a table in sqlite3, mysql and mysql2 adapters
| * | | | | | Do not dump a view as a table in sqlite3, mysql and mysql2 adaptersRyuta Kamizono2015-09-132-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now in sqlite3, mysql and mysql2 adapters, SchemaDumper dump a view as a table. It is incorrect behavior. This change excludes a view in schema.rb.
| * | | | | | Add `#views` and `#view_exists?` methods on connection adaptersRyuta Kamizono2015-09-136-0/+88
| | | | | | |
* | | | | | | Merge pull request #21607 from kamipo/remove_unnecessary_display_widthJeremy Daer2015-09-197-15/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unnecessary display width
| * | | | | | | Remove unnecessary display widthRyuta Kamizono2015-09-167-15/+16
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The **(11)** does not affect the storage size of the data type, which for an INT will always be 4 bytes. It affects the **display width**. http://www.tocker.ca/2015/07/02/proposal-to-deprecate-mysql-integer-display-width-and-zerofill.html
* | | | | | | Merge pull request #21608 from ↵Jeremy Daer2015-09-192-10/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/eliminate_duplicated_options_include_default_method Eliminate the duplicated `options_include_default?` method
| * | | | | | | Eliminate the duplicated `options_include_default?` methodRyuta Kamizono2015-09-132-10/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Follow up 7ba2cd06.
* | | | | | | Merge pull request #21664 from kamipo/reduce_call_create_table_infoJeremy Daer2015-09-191-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Reduce the calling `create_table_info` query
| * | | | | | | Reduce the calling `create_table_info` queryRyuta Kamizono2015-09-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently in schema dumping, `create_table_info` query is called twice for each tables. It means if 100 tables exists, the query is called 200 times. This change is that the query is called once for each tables in schema dumping.
* | | | | | | | Merge pull request #21681 from kamipo/should_test_both_mysql_adaptersJeremy Daer2015-09-194-22/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Should test both mysql adapters
| * | | | | | | | Should test both mysql adaptersRyuta Kamizono2015-09-204-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some test cases are testing only mysql adapter. We should test mysql2 adapter also.
* | | | | | | | | Merge pull request #21614 from kamipo/correctly_dump_composite_primary_keyJeremy Daer (Kemper)2015-09-1910-37/+114
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Correctly dump composite primary key
| * | | | | | | | Correctly dump composite primary keyRyuta Kamizono2015-09-2010-37/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :barcodes, primary_key: ["region", "code"] do |t| t.string :region t.integer :code end
* | | | | | | | | Remove `@connection` in `StatementPool`Ryuta Kamizono2015-09-206-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `@connection` in `StatementPool` is only used for PG adapter. No need for abstract `StatementPool` class.
* | | | | | | | | Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.Jerry D'Antonio2015-09-193-11/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thread_safe gem is being deprecated and all its code has been merged into the concurrent-ruby gem. The new class, Concurrent::Map, is exactly the same as its predecessor except for fixes to two bugs discovered during the merge.
* | | | | | | | Merge pull request #21650 from mcfiredrill/nodoc-raw-write-attributeArthur Nogueira Neves2015-09-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nodoc raw_write_attribute
| * | | | | | | | nodoc raw_write_attributeTony Miller2015-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is this supposed to be public API? If so, I can document it instead. :memo:
* | | | | | | | | Merge pull request #21666 from ronakjangir47/enum_refactoringGodfrey Chan2015-09-181-21/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | DRY enum conflict detection
| * | | | | | | | | DRY enum conflict detectionRonak Jangir2015-09-181-21/+13
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-182-2/+2
|\| | | | | | | | | | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| | | | | | | | |