Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #16028 from ↵ | Rafael Mendonça França | 2014-07-04 | 1 | -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 Truitt | 2014-07-02 | 1 | -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-reload | Matthew Draper | 2014-07-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | After find-via-reload, the record is not new | |||||
| * | | | | | | After find-via-reload, the record is not new | Matthew Draper | 2014-07-05 | 1 | -0/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #16037 from sgrif/sg-money-quoting | Rafael Mendonça França | 2014-07-04 | 2 | -11/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove unneccessary special case for money in quoting | |||||
| * | | | | | Remove unneccessary special case for money in quoting | Sean Griffin | 2014-07-03 | 2 | -11/+4 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #16036 from sgrif/sg-datetime-infinity | Rafael Mendonça França | 2014-07-03 | 2 | -3/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not rely on the column type when quoting infinity | |||||
| * | | | | | | Do not rely on the column type when quoting infinity | Sean Griffin | 2014-07-03 | 2 | -3/+2 | |
| |/ / / / / | ||||||
* / / / / / | Use the type object for type casting HStore columns | Sean Griffin | 2014-07-03 | 3 | -55/+34 | |
|/ / / / / | ||||||
* / / / / | Fix typo in comment | Cade Truitt | 2014-07-02 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #16015 from sgrif/sg-ensure-initialized | Rafael Mendonça França | 2014-07-02 | 2 | -4/+7 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pk initialization logic onto `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb | |||||
| * | | | | Move pk initialization logic onto `AttributeSet` | Sean Griffin | 2014-07-02 | 2 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | Better encapsulates its internals from `ActiveRecord::Base`. | |||||
* | | | | | Quote range strings when quoting PG ranges | Sean Griffin | 2014-07-02 | 1 | -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 bitstrings | Rafael Mendonça França | 2014-07-02 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482. | |||||
* | | | | | Don't error when `dup`ing a record with no PK | Sean Griffin | 2014-07-02 | 2 | -2/+7 | |
|/ / / / | ||||||
* | | | | Revert "Merge pull request #15394 from ↵ | Rafael Mendonça França | 2014-07-02 | 2 | -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 Dupret | 2014-07-02 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | do not hold on to a stale connection object. fixes #15998 | Aaron Patterson | 2014-07-01 | 1 | -4/+9 | |
|/ / / | ||||||
* | | | Don't add a second method for attribute existence | Sean Griffin | 2014-06-30 | 1 | -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 note | Sean Griffin | 2014-06-30 | 2 | -28/+34 | |
| | | | ||||||
* | | | Update documentation on STI change handling | jamesprior | 2014-06-30 | 1 | -0/+9 | |
| | | | | | | | | | Documenting a potential source of confusion about how STI classes handle changes. | |||||
* | | | Merge pull request #15981 from sgrif/sg-simplify-defaults | Rafael Mendonça França | 2014-06-29 | 3 | -21/+9 | |
|\ \ \ | | | | | | | | | Simplify creation of default attributes on AR instance | |||||
| * | | | Simplify creation of default attributes on AR instance | Sean Griffin | 2014-06-29 | 4 | -21/+10 | |
| | | | | | | | | | | | | | | | | `AttributeSet#dup` has all the behavior we need. | |||||
* | | | | Merge pull request #15977 from sgrif/sg-remove-array-hack | Godfrey Chan | 2014-06-29 | 1 | -24/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove array workaround in PG quoting | |||||
| * | | | | Remove array workaround in PG quoting | Sean Griffin | 2014-06-29 | 1 | -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 columns | Sean Griffin | 2014-06-29 | 2 | -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-point | Godfrey Chan | 2014-06-29 | 3 | -19/+9 | |
|\ \ \ \ | | | | | | | | | | | Use the type object when sending point columns to the DB | |||||
| * | | | | Use the type object when sending point columns to the DB | Sean Griffin | 2014-06-29 | 3 | -19/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #15976 from sgrif/sg-attribute-exists | Godfrey Chan | 2014-06-29 | 1 | -2/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Don't encourage usage of `columns_hash` | |||||
| * | | | | Don't encourage usage of `columns_hash` | Sean Griffin | 2014-06-29 | 1 | -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-values | Godfrey Chan | 2014-06-29 | 2 | -7/+4 | |
|\ \ \ \ | | | | | | | | | | | Use `Hash#transform_values` to clean up `AttributeSet` | |||||
| * | | | | Use `Hash#transform_values` to clean up `AttributeSet` | Sean Griffin | 2014-06-29 | 2 | -7/+4 | |
| |/ / / | ||||||
* / / / | Use the type object for sending JSON to the database | Sean Griffin | 2014-06-29 | 3 | -22/+10 | |
|/ / / | ||||||
* | | | Always pass a column with a type object to quote | Sean Griffin | 2014-06-28 | 6 | -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 exists | Abdelkader Boudih | 2014-06-27 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #12450 from iantropov/master | Rafael Mendonça França | 2014-06-27 | 3 | -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 Antropov | 2013-10-26 | 3 | -9/+18 | |
| | | | | | | | | | | | | | | | | constraints, issue #12380 | |||||
* | | | | Merge pull request #15788 from sgrif/sg-mutable-strings | Rafael Mendonça França | 2014-06-27 | 1 | -1/+16 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Detect in-place modifications on Strings | |||||
| * | | | | Detect in-place modifications on Strings | Sean Griffin | 2014-06-17 | 1 | -1/+16 | |
| | | | | | ||||||
* | | | | | Merge pull request #8639 from bogdan/valid-with-bang | Rafael Mendonça França | 2014-06-27 | 1 | -1/+17 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add AR::Base#valid! method | |||||
| * | | | | | Add AR::Base#validate! method | Bogdan Gusiev | 2014-06-23 | 1 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acts same as valid? but raises AR::RecordInvalid exception if validation fails | |||||
* | | | | | | Merge pull request #15940 from DNNX/databases-rake-refactoring | Rafael Mendonça França | 2014-06-27 | 3 | -31/+37 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | databases.rake refactoring | |||||
| * | | | | | | Use AR::SchemaMigration.table_exists? call instead of longish AR::Base...etc,etc | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Extract AR::SchemaMigration.normalized_versions method | Viktar Basharymau | 2014-06-27 | 2 | -2/+5 | |
| | | | | | | | ||||||
| * | | | | | | db:migrate:status refactoring: Rewrite hand-crafted SQL query with ↵ | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#pluck | |||||
| * | | | | | | Use Array#flat_map and Array#grep in db:migrate:status task | Viktar Basharymau | 2014-06-27 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows the code to be more declarative and elegant. | |||||
| * | | | | | | Add explaining variables to db:migrate:status | Viktar Basharymau | 2014-06-27 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Replace String index juggling with Pathname goodness in db:fixtures:load | Viktar Basharymau | 2014-06-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | db:fixtures:load refactoring: remove unnecessary loop | Viktar Basharymau | 2014-06-27 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::FixtureSet.create_fixtures` can accept an array of fixture_files. | |||||
| * | | | | | | Extract `fixture_files` variable in fixtures:load rake task | Viktar Basharymau | 2014-06-27 | 1 | -1/+7 | |
| | | | | | | |