aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24167 from ↵Jeremy Daer2016-03-231-3/+12
|\ | | | | | | | | | | kamipo/append_sql_mode_instead_of_overwriting_in_strict_mode Append sql_mode instead of overwriting in strict mode
| * Append sql_mode instead of overwriting in strict modeRyuta Kamizono2016-03-131-3/+12
| | | | | | | | For keep the default SQL mode.
* | Merge pull request #22518 from ↵Arthur Nogueira Neves2016-03-181-1/+1
|\ \ | | | | | | | | | | | | RochesterinNYC/better-error-message-for-includes-relations-missing Improve error message for missing relations for includes and eager_load
| * | Improve clarity of error message for missing includes and eager_loadJames Wen2016-01-281-1/+1
| | | | | | | | | | | | relations
* | | Creates development and test databases in db:migrate taskRafael Mendonça França2016-03-142-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a334425caff9b2140d5e99fcfc2eb8c4ab10bdfa. The main reason is that now the workflow is inconsistent when using spring. When using spring `RAILS_ENV` is always set, so only one database is created. This means that in development `bin/rake db:create` and `bundle exec rake db:create` have different results. It also breaks the `bin/setup` script since `bin/rake db:setup db:test:prepare` will fail.
* | | [ci skip] Fix the FinderMethods#find documentakihiro172016-03-141-2/+2
| |/ |/| | | | | We should use #find_or_initialize_by and #find_or_create_by because #first_or_initialize and #first_or_create methods are not the public API
* | Merge pull request #23797 from ↵Rafael França2016-03-111-3/+3
|\ \ | | | | | | | | | | | | kamipo/case_sensitive_comparison_for_non_string_column The BINARY Operator is only needed for string columns
| * | The BINARY Operator is only needed for string columnsRyuta Kamizono2016-02-221-3/+3
| | | | | | | | | | | | Follow up to #13040.
* | | Merge pull request #24054 from kamipo/extract_default_primary_keyRafael França2016-03-114-20/+20
|\ \ \ | | | | | | | | Extract `default_primary_key?` to refactor `column_spec_for_primary_key`
| * | | Extract `default_primary_key?` to refactor `column_spec_for_primary_key`Ryuta Kamizono2016-03-114-20/+20
| | | |
* | | | Merge pull request #24087 from kamipo/dump_bigint_instead_of_integer_limit_8Rafael França2016-03-112-6/+6
|\ \ \ \ | | | | | | | | | | Dump `bigint` instead of `integer` with `limit: 8` for schema dumper
| * | | | Dump `bigint` instead of `integer` with `limit: 8` for schema dumperRyuta Kamizono2016-03-112-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby create_table "big_numbers", force: :cascade do |t| t.integer "bigint_column", limit: 8 end ``` After: ```ruby create_table "big_numbers", force: :cascade do |t| t.bigint "bigint_column" end ```
* | | | Merge pull request #23677 from kamipo/passing_table_name_to_column_initializeRafael França2016-03-118-29/+32
|\ \ \ \ | |/ / / |/| | | Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`
| * | | Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`Ryuta Kamizono2016-03-085-17/+11
| | | |
| * | | Initialize `column.table_name` immediately for `column.serial?` correctly ↵Ryuta Kamizono2016-03-087-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working Currently the results of `column.serial?` is not correct. For `column.serial?` correctly working, initialize `column.table_name` immediately.
* | | | Merge pull request #23958 from kamipo/fix_bigserial_appears_with_limit_8Rafael França2016-03-111-0/+4
|\ \ \ \ | | | | | | | | | | Fix bigserial appears with limit 8 for schema dumper
| * | | | Fix bigserial appears with limit 8 for schema dumperRyuta Kamizono2016-03-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", limit: 8, null: false end ``` After: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", null: false end ```
* | | | | Fixed comments of add_foreign_key methodSalman Afzal Siddiqui2016-03-101-2/+2
| | | | | | | | | | | | | | | The comments of add_foreign_key method was displaying incorrect constraint name.
* | | | | use same name to type objectyuuji.yaginuma2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | Follow up to #24079
* | | | | Execute default_scope defined by abstract class within the scope of subclassMehmet Emin İNAÇ2016-03-081-1/+2
| |/ / / |/| | |
* | | | Merge pull request #24034 from kamipo/remove_outdated_commentArthur Nogueira Neves2016-03-071-1/+0
|\ \ \ \ | | | | | | | | | | Remove outdated comment [ci skip]
| * | | | Remove outdated comment [ci skip]Ryuta Kamizono2016-03-041-1/+0
| |/ / / | | | | | | | | | | | | Currently column options handled by the type map in Rails 4.2.
* | | | Merge pull request #23993 from kamipo/no_need_to_extract_limit_for_booleanSean Griffin2016-03-072-5/+1
|\ \ \ \ | | | | | | | | | | No need to extract a limit for a boolean type
| * | | | No need to extract a limit for a boolean typeRyuta Kamizono2016-03-042-5/+1
| | | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-03-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/association_basics.md
| * | | | | [ci skip] Fix `'id'` to be fixed-width fontyui-knk2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown below, we should use <tt>...</tt> for string literal ``` $ echo "+'id'+" | rdoc --pipe <p>+&#39;id&#39;+</p> $ echo "<tt>'id'</tt>" | rdoc --pipe <p><code>&#39;id&#39;</code></p> ```
* | | | | | This code won't workAkira Matsuda2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Fix typo `--ssl-cipher`Ryuta Kamizono2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #22543.
* | | | | | Merge pull request #24079 from y-yagi/chage_date_time_to_datetimeSean Griffin2016-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | chage `date_time` type ` to `datetime`
| * | | | | | chage `date_time` type ` to `datetime`yuuji.yaginuma2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are using `datetime` in migration, better to use `datetime` is I think that confusion is less.
* | | | | | | make attributes API example to work [ci skip]yuuji.yaginuma2016-03-061-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | There is a need to pass the keyword arguments to `attribute` method.
* | | | | | fix typo in attribute example [ci skip]yuuji.yaginuma2016-03-051-1/+1
| | | | | |
* | | | | | A small documentation fix about autosave associations [ci skip]Mehmet Emin İNAÇ2016-03-051-1/+1
| | | | | |
* | | | | | start hiding the `scope_chain` data structureAaron Patterson2016-03-042-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a predicate method that doesn't need to build a scope chain, but also hides the data structure used for representing the scope chain.
* | | | | | don't build the reflection chain to calculate `nested?`Aaron Patterson2016-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know a reflection can be considered as `nested?` if the source reflection or the through reflection are also through reflections (since the through reflection will also add another join table). This allows us to avoid traversing the entire reflection tree just to calculate whether or not there will be more join tables.
* | | | | | remove useless ivarAaron Patterson2016-03-041-1/+0
| |_|/ / / |/| | | |
* | | | | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-031-1/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23934. This is a forward port of ac832a43b4d026dbad28fed196d2de69ec9928ac Previously the scope of all associations with extensions were wrapped in an instance dependent proc. This made it impossible to preload such associations.
* | | | Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the end of [this] page. [ci skip] [this]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Persistence/ClassMethods.html#method-i-create
* | | | Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sqlRafael França2016-03-021-0/+3
|\ \ \ \ | | | | | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`
| * | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`Ryuta Kamizono2016-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Originally, `{insert|update|delete}_sql` is protected methods. We can use the `{insert|update|delete}` public methods instead.
* | | | | remove trailing whitespace.Yves Senn2016-03-021-1/+1
| | | | |
* | | | | Remove not needed `exec_insert` in mysql2 adapterRyuta Kamizono2016-03-021-4/+0
|/ / / / | | | | | | | | | | | | Simply it is sufficient to use the method in the super class.
* | | | Merge pull request #23961 from ↵Rafael França2016-03-013-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/exclude_name_and_type_from_prepare_column_options Exclude `:name` and `:type` from `prepare_column_options`
| * | | | Exclude `:name` and `:type` from `prepare_column_options`Ryuta Kamizono2016-02-293-8/+8
| | | | | | | | | | | | | | | | | | | | Actually `:name` and `:type` are not column options.
* | | | | Merge pull request #23953 from ↵Rafael França2016-03-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_tests_failure_with_prepared_statements_false Fix tests failure with `prepared_statements: false`
| * | | | | Fix `NoMethodError: undefined method `preparable'`Ryuta Kamizono2016-02-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error occurs with `prepared_statements: false`: ``` $ ARCONN=postgresql bundle exec ruby -w -Itest test/cases/associations_test.rb Using postgresql Run options: --seed 27753 ...E.................................... Finished in 0.713115s, 56.0919 runs/s, 91.1494 assertions/s. 1) Error: AssociationsTest#test_force_reload_is_uncached: NoMethodError: undefined method `preparable' for #<Arel::Visitors::PostgreSQL:0x007f8699702570> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `block in select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:83:in `cache_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/querying.rb:39:in `find_by_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:699:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/association_relation.rb:32:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:580:in `load' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:260:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:256:in `to_a' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:458:in `get_records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:473:in `find_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:412:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:45:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:983:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/delegation.rb:39:in `each' test/cases/associations_test.rb:116:in `block (2 levels) in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:32:in `cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/query_cache.rb:9:in `cache' test/cases/associations_test.rb:115:in `block in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/reporting.rb:36:in `silence' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/instance_delegator.rb:19:in `silence' test/cases/associations_test.rb:114:in `test_force_reload_is_uncached' ```
* | | | | Merge pull request #23954 from kamipo/fix_undefined_method_fieldsRafael França2016-03-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`
| * | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`Ryuta Kamizono2016-02-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exec_query` raises `NoMethodError` when executing no result queries (`INSERT`, `UPDATE`, `DELETE`, and all DDL) in mysql2 adapter. ``` irb(main):002:0> conn.execute("create table t(a int)") (43.3ms) create table t(a int) => nil irb(main):003:0> conn.execute("insert into t values (1)") (19.3ms) insert into t values (1) => nil irb(main):004:0> conn.exec_query("insert into t values (1)") SQL (28.6ms) insert into t values (1) NoMethodError: undefined method `fields' for nil:NilClass ```
* | | | | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-012-9/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add option to error on ignored order or limit
| * | | | | Add initial support for allowing an error on order or limit of queries being ↵Scott Ringwelski2016-02-022-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignored in batches add some documentation and add 4 tests regarding error vs. warning behavior fix a typo when referring to the message go back to default in tests so that ordering is not important. use a constant instead of method. fix assert_nothing_raised call. use self.klass to allow per class configuration remove logger warn assets as that is tested elsewhere. pass error_on_ignore through find_each and find_in_batches also. add blocks to the finds so that the code is actually executed put the setting back to default in an ensure Add a changelog entry