aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-141-1/+1
| | | | Fixes #14383.
* Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
|\ | | | | Update callbacks executed on AR::Base#touch [skip ci]
| * Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | | | | | | | | | As of https://github.com/rails/rails/pull/12031 after_commit and after_rollback are also executed
* | Allow custom JDBC urlsschneems2014-03-141-2/+2
|/ | | | mitigates #14323
* Avoid duplicated conditionalsCarlos Antonio da Silva2014-03-141-2/+1
|
* No need to binds be optionalRafael Mendonça França2014-03-131-2/+2
|
* Make select_all on query cache accept a Relation without binds.Arthur Neves2014-03-132-12/+10
| | | | | [fixes #14361] [related #13886]
* passing an instance of an AR object to `find` is deprecatedAaron Patterson2014-03-131-1/+5
| | | | please pass the id of the AR object by calling `.id` on the model first.
* passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-132-2/+9
| | | | | Pass the id of the object to the method by calling `.id` on the AR object.
* make tests pass on Ruby 2.2Aaron Patterson2014-03-131-4/+4
| | | | | | Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593
* Use Sqlite3 adapter in examplesJulian Simioni2014-03-121-2/+2
| | | | | | | | | | | | | | | | Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip]
* Enhance docs for update_attribute [ci-skip]Mohamed Wael Khobalatte2014-03-121-0/+2
|
* Merge pull request #13040 from kamipo/case_sensitive_comparisonRafael Mendonça França2014-03-123-2/+14
|\ | | | | | | | | | | | | Only use BINARY for mysql case sensitive uniqueness check when column has a case insensitive collation. Conflicts: activerecord/CHANGELOG.md
| * Only use BINARY for mysql case sensitive uniqueness check when column has a ↵Ryuta Kamizono2013-11-263-2/+14
| | | | | | | | case insensitive collation.
* | MySQL 5.6 and later supports microsecond precision in datetime.Tatsuhiko Miyagawa2014-03-121-0/+8
| | | | | | | | | | You might want to branch it to include this only for 5.6, but passing these values to < 5.6 doesn't cause issues either.
* | Merge pull request #14345 from arthurnn/revert_14052Godfrey Chan2014-03-111-3/+3
|\ \ | | | | | | Fixes STI when 2+ levels deep.
| * | Fixes STI when 2+ levels deep.Arthur Neves2014-03-101-3/+3
| | | | | | | | | | | | | | | | | | PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined.
* | | `change_table` supports `citext`. Follow up to #12523.Yves Senn2014-03-111-0/+4
| | |
* | | register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-112-1/+9
|/ / | | | | | | citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed.
* | Merge pull request #8313 from alan/only_save_changed_has_one_objectsRafael Mendonça França2014-03-101-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md
| * | Save has_one associations only if record has changesAlan Kennedy2013-10-311-2/+3
| | | | | | | | | | | | | | | | | | Prevents save related callbacks such as `after_commit` being triggered when `has_one` objects are already persisted and have no changes.
* | | WhitespacesRafael Mendonça França2014-03-101-2/+2
| | |
* | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-093-5/+5
|\ \ \ | | | | | | | | Replace additional instances of map.flatten with flat_map
| * | | Replace map.flatten with flat_map in activerecordErik Michaels-Ober2014-03-033-5/+5
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * | | | fix typo app -> alldmathieu2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Thank you @bquorning
| * | | | unscope doesn't remove only the default_scope, but all of them.dmathieu2014-03-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip] Closes rails/rails#14294
* | | | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | | | | get rid of intermediate arrays.Yves Senn2014-03-051-2/+3
| | | | | | | | | | | | | | | | | | | | origin: https://github.com/rails/rails/commit/f6aeb8b1a3687c8523e4a56309fe3736011b2935#commitcomment-5569649
* | | | | we only need to support `asc` and `ASC`. No need for mixed cases. #14263Yves Senn2014-03-051-13/+14
| | | | | | | | | | | | | | | | | | | | This is a result of the discussion at https://github.com/rails/rails/pull/14263/files#r10291489
* | | | | Merge pull request #14263 from robin850/allow_passing_string_to_order_hashYves Senn2014-03-051-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Follow up of #10732 - Allow string hash values on AR order method
| * | | | | Allow string hash values on AR order methodMarcelo Casiraghi2014-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior has almost no performance impact: String not allowed 66.910000 0.030000 66.940000 ( 67.024976) String allowed 69.360000 0.030000 69.390000 ( 69.503096) Benchmarked with http://git.io/Y0YuRw.
* | | | | | Merge pull request #14261 from MSch/bound-parameters-for-existsAaron Patterson2014-03-041-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make exists? use bound values.
| * | | | | Make exists? use bound values.Martin Schürrer2014-03-041-1/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we build a query with an inline value that is a numeric (e.g. because it's out of range for an int4) PostgreSQL doesn't use an index on the column, since it's now comparing numerics and not int4s. This leads to a _very_ slow query. When we use bound parameters instead of inline values PostgreSQL raises numeric_value_out_of_range since no automatic coercion happens.
* / | | | Add Enum type to postgresql adapter's oids to prevent unknown OID warnings.Dieter Komendera2014-03-042-0/+12
|/ / / /
* | | | Fix warnings due to:Vipul A M2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | - unused variable in PG Adapter. - Ambiguous argument warning from range_test for use - to + Infinity range without brackets.
* | | | Remove unnecessary db call when replacing.Arthur Neves2014-02-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When replacing a has_many association with the same one, there is no need to do a round-trip to the db to create/and drop a new transaction. [fixes #14220]
* | | | Merge pull request #14230 from kuldeepaggarwal/doc-selectRobin Dupret2014-02-281-4/+4
|\ \ \ \ | | | | | | | | | | Correct `select` examples and doc, ref [522c0fd] [ci skip]
| * | | | [ci skip] correct select examples and doc, ref [522c0fd]Kuldeep Aggarwal2014-03-011-4/+4
| | | | |
* | | | | `includes` uses SQL parsing when String joins are involved.Yves Senn2014-02-281-1/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of 22b3481ba2aa55fad1f9a5db94072312b345fb55. The current implementation of `references_eager_loaded_tables?` needs to know every table involved in the query. With the current API this is not possible without SQL parsing. While a2dab46cae35a06fd5c5500037177492a047c252 deprecated SQL parsing for `includes`. It did not issue deprecation warnings when String joins are involved. This resulted in a breaking change after the deprecated behavior was removed (22b3481ba2aa55fad1f9a5db94072312b345fb55). We will need to rethink the usage of `includes`, `preload` and `eager_load` but for now, this brings back the old *working* behavior.
* | | | Fix a bug affecting validations of enum attributesTheMonster2014-02-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where any enum attribute of a model would be evaluated always as 0 when calling the database on validations. This fix converts the value of the enum attribute to its integer value rather than the string before building the relation as the bug occured when the string finally gets converted to integer using string.to_i which converts it to 0. [Vilius Luneckas, Ahmed AbouElhamayed]
* | | | Replace "data store" with database [ci skip]Robin Dupret2014-02-271-1/+1
| | | | | | | | | | | | | | | | Active Record is specifically for databases. Refs #12101.
* | | | Merge pull request #14211 from loganhasson/masterXavier Noria2014-02-261-12/+12
|\ \ \ \ | | | | | | | | | | [ci skip] Move association class method notes
| * | | | [ci skip] Move association class method notesLogan Hasson2014-02-261-12/+12
| | | | | | | | | | | | | | | | | | | | Make explanation of association class methods clearer by moving notes to beginning of each example section.
* | | | | let `insert_record` actuall save the object.Aaron Patterson2014-02-252-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `before_add` callbacks are fired before the record is saved on `has_and_belongs_to_many` assocations *and* on `has_many :through` associations. Before this change, `before_add` callbacks would be fired before the record was saved on `has_and_belongs_to_many` associations, but *not* on `has_many :through` associations. Fixes #14144
* | | | | Merge remote-tracking branch ↵Jon Leighton2014-02-251-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'chancancode/fix_instance_method_already_implemented' Conflicts: activerecord/CHANGELOG.md
| * | | | | Fixed STI classes not defining an attribute method if there is aGodfrey Chan2014-02-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicting private method defined on its ancestors. The problem is that `method_defined_within?(name, klass, superklass)` only works correclty when `klass` and `superklass` are both `Class`es. If both `klass` and `superklass` are both `Class`es, they share the same inheritance chain, so if a method is defined on `klass` but not `superklass`, this method must be introduced at some point between `klass` and `superklass`. This does not work when `superklass` is a `Module`. A `Module`'s inheritance chain contains just itself. So if a method is defined on `klass` but not on `superklass`, the method could still be defined somewhere upstream, e.g. in `Object`. This fix works by avoiding calling `method_defined_within?` with a module while still fufilling the requirement (checking that the method is defined withing `superclass` but not is not a generated attribute method). 4d8ee288 is likely an attempted partial fix for this problem. This unrolls that fix and properly check the `superclass` as intended. Fixes #11569.
* | | | | | Merge pull request #14152 from ↵Aaron Patterson2014-02-251-9/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/fix-ar-wtf-why-is-there-no-environment Handle missing environment from non empty config
| * | | | | | Handle missing environment from non empty configschneems2014-02-211-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using a `DATABASE_URL` and a `database.yml`. The connection information in `DATABASE_URL` should be merged into whatever environment we are in. As released in 4.1.0rc1 if someone has a database.yml but is missing a key like production: ```yml development: host: localhost ``` Then the check for blank config will return false so the information from the `DATABASE_URL` will not be used when attempting to connect to the `production` database and the connection will incorrectly fail. This commit fixes this problem and adds a test for the behavior. In addition the ability to specify a connection url in a `database.yml` like this: ``` production: postgres://localhost/foo ``` Was introduced in 4.1.0rc1 though should not be used, instead using a url sub key ``` production: url: postgres://localhost/foo ``` This url sub key was also introduced in 4.1.0rc1 though the `production: postgres://localhost/foo` was not removed. As a result we should not test this behavior.
* | | | | | | Add missing parantheses in index_exists?Yannick Schutz2014-02-251-1/+1
| | | | | | |