aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #16028 from ↵Rafael Mendonça França2014-07-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md
| * | | | | Add `:all` argument to `count` in `reset_counters`Cade Truitt2014-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this fix, if an association had a scope with a `select`, calls to `reset_counters` would generate invalid SQL and throw: ActiveRecord::StatementInvalid: [$DB_ADAPTER]: wrong number of arguments to function COUNT() References #10710, #13648
* | | | | | Merge pull request #16049 from matthewd/find-via-reloadMatthew Draper2014-07-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | After find-via-reload, the record is not new
| * | | | | | After find-via-reload, the record is not newMatthew Draper2014-07-051-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #16037 from sgrif/sg-money-quotingRafael Mendonça França2014-07-042-11/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove unneccessary special case for money in quoting
| * | | | | Remove unneccessary special case for money in quotingSean Griffin2014-07-032-11/+4
| | | | | |
* | | | | | Merge pull request #16036 from sgrif/sg-datetime-infinityRafael Mendonça França2014-07-032-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not rely on the column type when quoting infinity
| * | | | | | Do not rely on the column type when quoting infinitySean Griffin2014-07-032-3/+2
| |/ / / / /
* / / / / / Use the type object for type casting HStore columnsSean Griffin2014-07-033-55/+34
|/ / / / /
* / / / / Fix typo in commentCade Truitt2014-07-021-1/+1
|/ / / /
* | | | Merge pull request #16015 from sgrif/sg-ensure-initializedRafael Mendonça França2014-07-022-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pk initialization logic onto `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb
| * | | | Move pk initialization logic onto `AttributeSet`Sean Griffin2014-07-022-4/+7
| | | | | | | | | | | | | | | | | | | | Better encapsulates its internals from `ActiveRecord::Base`.
* | | | | Quote range strings when quoting PG rangesSean Griffin2014-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs.
* | | | | Fix SQL injection when querying against ranges and bitstringsRafael Mendonça França2014-07-022-4/+5
| | | | | | | | | | | | | | | | | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482.
* | | | | Don't error when `dup`ing a record with no PKSean Griffin2014-07-022-2/+7
|/ / / /
* | | | Revert "Merge pull request #15394 from ↵Rafael Mendonça França2014-07-022-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md
* | | | Tiny follow-up to #15987 and 088b4c3e [ci skip]Robin Dupret2014-07-021-4/+4
| | | |
* | | | do not hold on to a stale connection object. fixes #15998Aaron Patterson2014-07-011-4/+9
|/ / /
* | | Don't add a second method for attribute existenceSean Griffin2014-06-301-6/+1
| | | | | | | | | | | | | | | We already had one in the public API that people can use more easily for the transition
* | | Move STI docs off of the main Base document, leaving a noteSean Griffin2014-06-302-28/+34
| | |
* | | Update documentation on STI change handlingjamesprior2014-06-301-0/+9
| | | | | | | | | Documenting a potential source of confusion about how STI classes handle changes.
* | | Merge pull request #15981 from sgrif/sg-simplify-defaultsRafael Mendonça França2014-06-293-21/+9
|\ \ \ | | | | | | | | Simplify creation of default attributes on AR instance
| * | | Simplify creation of default attributes on AR instanceSean Griffin2014-06-294-21/+10
| | | | | | | | | | | | | | | | `AttributeSet#dup` has all the behavior we need.
* | | | Merge pull request #15977 from sgrif/sg-remove-array-hackGodfrey Chan2014-06-291-24/+0
|\ \ \ \ | | | | | | | | | | Remove array workaround in PG quoting
| * | | | Remove array workaround in PG quotingSean Griffin2014-06-291-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer need to do fancy legwork to make sure arrays use a type object, now that schema methods use a real type object.
* | | | | Remove unused `array_member` from PG quoting for HStore columnsSean Griffin2014-06-292-12/+9
|/ / / / | | | | | | | | | | | | | | | | Hstore no longer needs additional quoting to be used in an array, the array type handles it sufficiently.
* | | | Merge pull request #15983 from sgrif/sg-inline-pointGodfrey Chan2014-06-293-19/+9
|\ \ \ \ | | | | | | | | | | Use the type object when sending point columns to the DB
| * | | | Use the type object when sending point columns to the DBSean Griffin2014-06-293-19/+9
| | | | |
* | | | | Merge pull request #15976 from sgrif/sg-attribute-existsGodfrey Chan2014-06-291-2/+7
|\ \ \ \ \ | |/ / / / |/| | | | Don't encourage usage of `columns_hash`
| * | | | Don't encourage usage of `columns_hash`Sean Griffin2014-06-291-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://github.com/plataformatec/simple_form/pull/1094, we should not encourage usage of `columns_hash`, and instead provide an alternate method to determine whether or not an attribute exists. The language `attribute` was chosen over `column` since these are in the `AttributeMethods` module.
* | | | Merge pull request #15982 from sgrif/sg-attr-set-map-valuesGodfrey Chan2014-06-292-7/+4
|\ \ \ \ | | | | | | | | | | Use `Hash#transform_values` to clean up `AttributeSet`
| * | | | Use `Hash#transform_values` to clean up `AttributeSet`Sean Griffin2014-06-292-7/+4
| |/ / /
* / / / Use the type object for sending JSON to the databaseSean Griffin2014-06-293-22/+10
|/ / /
* | | Always pass a column with a type object to quoteSean Griffin2014-06-286-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | The only case where we got a column that was not `nil`, but did not respond to `cast_type` was when type casting the default value during schema creation. We can look up the cast type, and add that object to the column definition. Will allow us to consistently rely on the type objects for type casting in all directions.
* | | rename sequence only if it existsAbdelkader Boudih2014-06-271-3/+3
| | |
* | | Merge pull request #12450 from iantropov/masterRafael Mendonça França2014-06-273-5/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug, when ':dependent => :destroy' violates foreign key constraints Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/has_one.rb
| * | | Fix bug, when ':dependent => :destroy' option violates foreign key ↵Ivan Antropov2013-10-263-9/+18
| | | | | | | | | | | | | | | | constraints, issue #12380
* | | | Merge pull request #15788 from sgrif/sg-mutable-stringsRafael Mendonça França2014-06-271-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | Detect in-place modifications on Strings
| * | | | Detect in-place modifications on StringsSean Griffin2014-06-171-1/+16
| | | | |
* | | | | Merge pull request #8639 from bogdan/valid-with-bangRafael Mendonça França2014-06-271-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add AR::Base#valid! method
| * | | | | Add AR::Base#validate! methodBogdan Gusiev2014-06-231-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acts same as valid? but raises AR::RecordInvalid exception if validation fails
* | | | | | Merge pull request #15940 from DNNX/databases-rake-refactoringRafael Mendonça França2014-06-273-31/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | databases.rake refactoring
| * | | | | | Use AR::SchemaMigration.table_exists? call instead of longish AR::Base...etc,etcViktar Basharymau2014-06-271-1/+1
| | | | | | |
| * | | | | | Extract AR::SchemaMigration.normalized_versions methodViktar Basharymau2014-06-272-2/+5
| | | | | | |
| * | | | | | db:migrate:status refactoring: Rewrite hand-crafted SQL query with ↵Viktar Basharymau2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#pluck
| * | | | | | Use Array#flat_map and Array#grep in db:migrate:status taskViktar Basharymau2014-06-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows the code to be more declarative and elegant.
| * | | | | | Add explaining variables to db:migrate:statusViktar Basharymau2014-06-271-2/+2
| | | | | | |
| * | | | | | Replace String index juggling with Pathname goodness in db:fixtures:loadViktar Basharymau2014-06-271-1/+1
| | | | | | |
| * | | | | | db:fixtures:load refactoring: remove unnecessary loopViktar Basharymau2014-06-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::FixtureSet.create_fixtures` can accept an array of fixture_files.
| * | | | | | Extract `fixture_files` variable in fixtures:load rake taskViktar Basharymau2014-06-271-1/+7
| | | | | | |