aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Sidekiq.options to set initial waitAndrew White2015-09-211-1/+1
| | | | | | | | | | The INITIAL_WAIT constant has moved to the Sidekiq::Poller class but rather than setting the constant directly we can override it via the `:poll_interval_average` option. This was causing random build failures because the test was waiting for 10 seconds for the job to execute but the initial wait was a random value between 10 and 15 seconds.
* Run `rake db:migrate` for all Active Job integration testsAndrew White2015-09-211-1/+2
| | | | | | If db/schema.rb doesn't exist then we get warnings from the dummy Rails application so run it for all adapters even if they're not using the database to store jobs.
* Silence logging in Active Job unit testsAndrew White2015-09-211-0/+1
|
* Use master version of Turbolinks gemAndrew White2015-09-212-4/+10
| | | | | Since `alias_method_chain` is deprecated we need to use the master version of the Turbolinks gem as it has support for using `Module#prepend`.
* Short-circuit `blank?` on date and time valuesAndrew White2015-09-217-1/+48
| | | | | | | The concept of a blank date or time doesn't make sense so we can short circuit the calls for `blank?` on these classes to gain small speed boost. Fixes #21657
* Merge pull request #21684 from amitsuroliya/correct_resultAndrew White2015-09-211-6/+4
|\ | | | | Applying right result of examples in ActiveSupport Multibyte [ci skip]
| * Applying right result of examples in ActiveSupport Multibyte [ci skip]amitkumarsuroliya2015-09-211-6/+4
| |
* | 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 #21694 from harrykiselev/patch-2Jeremy Daer2015-09-201-0/+1
|\ \ \ | | | | | | | | Docs typo: missing `end` in routing.rb
| * | | Update routing.rbHarry V. Kiselev2015-09-201-0/+1
| | | | | | | | | | | | forgotten end of the block
* | | | 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-216-6/+6
| |
* | TypppoAkira Matsuda2015-09-211-3/+3
| |
* | :scissors: empty line at the top of filesAkira Matsuda2015-09-219-9/+0
| |
* | Merge pull request #21689 from ↵Andrew White2015-09-202-1/+2
|\ \ | | | | | | | | | | | | y-yagi/fix_application_controller_require_dependency_path fix application_controller require_dependency path generated by the scaffold generator
| * | fix application_controller require_dependency path generated by the scaffold ↵yuuji.yaginuma2015-09-202-1/+2
| |/ | | | | | | | | | | | | generator This is follow up to #6643. In #6643, the controller generator only had been fixed, in this commit to fix the scaffold generator.
* | Merge pull request #21691 from amitsuroliya/guide_fixesKasper Timm Hansen2015-09-201-3/+3
|\ \ | | | | | | fix `to_time` output in ActiveSupport guide.
| * | fix `to_time` output in ActiveSupport guide. Since ↵amitkumarsuroliya2015-09-201-3/+3
|/ / | | | | | | | | https://github.com/rails/rails/commit/48583f8bf74d1cefefea3cd6591bd546a9eaff6c , to_time returns times formatted as YYYY-MM-DD HH:MM:SS UTC [ci skip] `to_time` method returns in `YYYY-MM-DD HH:MM:SS UTC` format after this commit https://github.com/rails/rails/commit/48583f8bf74d1cefefea3cd6591bd546a9eaff6c .
* | Merge pull request #21690 from amitsuroliya/typo_fixRobin Dupret2015-09-201-2/+2
|\ \ | | | | | | correcting word smpt -> smtp in ActionMailer guide [ci skip]
| * | correcting word smpt -> smtp in ActionMailer guide [ci skip]amitkumarsuroliya2015-09-201-2/+2
|/ / | | | | `smpt.gmail.com` should be `smtp.gmail.com`
* | Merge pull request #21685 from y-yagi/remove_force_reload_option_from_guideClaudio B.2015-09-191-12/+20
|\ \ | |/ |/| remove association reload option from guide [ci skip]
| * remove association reload option from guide [ci skip]yuuji.yaginuma2015-09-201-12/+20
|/ | | | The option was deprecated in 6eae366d0d2e5d5211eeaf955f56bd1dc6836758
* 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 #21677 from ronakjangir47/send_file_headers_testJeremy Daer2015-09-191-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added test for `send_file_headers` called with nil content type
| * | | | | | | | Added test for `send_file_headers` called with nil content typeRonak Jangir2015-09-191-1/+12
| | | | | | | | |
* | | | | | | | | Merge pull request #21683 from hmistry/aj_travisJeremy Daer2015-09-192-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Run Beanstalkd integration tests in ActiveJob