aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-063-10/+11
| | | | adapter, fixed from #16057 [ci skip]
* Merge pull request #16057 from akshay-vishnoi/doc_changeZachary Scott2014-07-063-5/+5
|\ | | | | [ci skip] /sqlite/i --> SQLite
| * [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-063-5/+5
| |
* | active_record: Type cast booleans and durations for string columns.Dylan Thacker-Smith2014-07-065-5/+49
| |
* | Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"Godfrey Chan2014-07-055-76/+2
| | | | | | | | | | | | This reverts commit a03097759bd7103bb9db253e7ba095f011453f75. This needs more work before it would work correctly on master.
* | Merge pull request #16059 from jenncoop/json-serialized-attrGodfrey Chan2014-07-055-2/+76
| | | | | | | | | | | | | | | | Fixed issue with ActiveRecord serialize object as JSON Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/serialization.rb
* | Merge pull request #16065 from matthewd/mysql-explicit-non-strictMatthew Draper2014-07-061-2/+2
|\ \ | | | | | | If our connection is explicitly non-strict, tell MySQL
| * | If our connection is explicitly non-strict, tell MySQLMatthew Draper2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We default to making the connection strict, but have historically relied on the MySQL default when we want it to be non-strict. On some (recent?) versions of MySQL, new connections default to being strict, so if we've been told 'strict:false', we're obliged to pass that on. This fixes a test failure that we've seen turn up on relatively-new development machines, so we do already have a test covering it.
* | | Fix mysql/mysql2 failing with FK constraint errorsGodfrey Chan2014-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | One of the author fixture we have ("david") references an author address by ID. Since we disable FK checks when inserting fixtures, this is all fine until we try to update it, at which point MySQL would complain about the missing row referenced by the `author_address_id`. [Godfrey Chan, Matthew Draper]
* | | Re-enable foriegn key tests on MySQLGodfrey Chan2014-07-052-5/+1
| | | | | | | | | | | | This reverts commit e84799d, e31104c and e6ca8e2
* | | Use the type object for quoting PG RangesSean Griffin2014-07-056-54/+40
| | |
* | | CHANGELOG and release notes entry for #16056Sean Griffin2014-07-041-0/+5
| | |
* | | Add a `required` option to singular associationsSean Griffin2014-07-044-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to defining the association, a `required` association will also have its presence validated. Before: ```ruby belongs_to :account validates_presence_of :account ``` After: ```ruby belongs_to :account, required: true ``` This helps to draw a distinction between types of validations, since validations on associations are generally for data integrity purposes, and aren't usually set through form inputs.
* | | Revert "Use a type object for type casting behavior on SQLite3"Matthew Draper2014-07-051-37/+13
|/ /
* | Fix typoRafael Mendonça França2014-07-041-1/+1
| |
* | Merge pull request #16003 from sgrif/sg-refactor-sqlite3-stringsMatthew Draper2014-07-051-13/+37
|\ \ | | | | | | Use a type object for type casting behavior on SQLite3
| * | Use a type object for type casting behavior on SQLite3Sean Griffin2014-07-011-13/+37
| | | | | | | | | | | | | | | Note: I'm not sure we actually need to be logging when this happens. This code would be a fair bit cleaner if we didn't need to log it.
* | | Merge pull request #16028 from ↵Rafael Mendonça França2014-07-043-1/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-023-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-0/+19
|\ \ \ \ | | | | | | | | | | After find-via-reload, the record is not new
| * | | | After find-via-reload, the record is not newMatthew Draper2014-07-053-0/+19
| | |_|/ | |/| |
* | | | Merge pull request #16037 from sgrif/sg-money-quotingRafael Mendonça França2014-07-043-11/+28
|\ \ \ \ | |/ / / |/| | | Remove unneccessary special case for money in quoting
| * | | Remove unneccessary special case for money in quotingSean Griffin2014-07-033-11/+28
| | | |
* | | | Merge pull request #16036 from sgrif/sg-datetime-infinityRafael Mendonça França2014-07-033-3/+46
|\ \ \ \ | | | | | | | | | | Do not rely on the column type when quoting infinity
| * | | | Do not rely on the column type when quoting infinitySean Griffin2014-07-033-3/+46
| |/ / /
* / / / Use the type object for type casting HStore columnsSean Griffin2014-07-034-66/+39
|/ / /
* / / 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-023-2/+19
| | | | | | | | | | | | | | | 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-023-4/+16
| | | | | | | | | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482.
* | | Don't error when `dup`ing a record with no PKSean Griffin2014-07-023-2/+19
|/ /
* | Revert "Merge pull request #15394 from ↵Rafael Mendonça França2014-07-023-15/+2
| | | | | | | | | | | | | | | | | | | | 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-012-6/+14
| |
* | Add regression tests for keys on nested associationseileencodes2014-07-011-0/+32
|/ | | | | | This adds the regressions tests from issue #15893 to master. It's checking that both strings and symbols are accepted as keys for nested associations.
* 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
| |/