Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove @state.parent assignment on commit | Arthur Neves | 2014-07-29 | 1 | -2/+1 |
| | | | | | | | | | This piece of code was introduced on 67d8bb963d5d51fc644d6b1ca20164efb4cee6d7 , which was calling `committed?` in the `transaction_state` before calling the `committed!` method. However on 7386ffc781fca07a0c656db49fdb54678caef809, the `committed?` check was removed and replaced by a `finalized?`, which only checks if the state is not nil. Thus we can remove that line. | ||||
* | remove blank lines in the start of the ActiveRecord files | Ponomarev Nikolay | 2014-07-29 | 1 | -1/+0 |
| | |||||
* | Extract the transaction class to a local variable | Rafael Mendonça França | 2014-07-28 | 1 | -6/+2 |
| | |||||
* | Merge pull request #16284 from arthurnn/transactions | Rafael Mendonça França | 2014-07-28 | 3 | -62/+81 |
|\ | | | | | | | Transactions refactoring | ||||
| * | savepoint_name should return nil for non-savepoint transactions | Arthur Neves | 2014-07-28 | 2 | -4/+7 |
| | | | | | | | | Also add test to assets the savepoint name | ||||
| * | Transactions refactoring | Arthur Neves | 2014-07-28 | 3 | -38/+65 |
| | | | | | | | | | | | | | | Add a transaction manager per connection, so it can controls the connection responsibilities. Delegate transaction methods to transaction_manager | ||||
| * | Remove finishing? method from transaction. | Arthur Neves | 2014-07-24 | 2 | -24/+13 |
| | | | | | | | | | | | | | | | | | | | | The finishing variable on the transaction object was a work-around for the savepoint name, so after a rollback/commit the savepoint could be released with the previous name. related: 9296e6939bcc786149a07dac334267c4035b623a 60c88e64e26682a954f7c8cd6669d409ffffcc8b | ||||
* | | Merge pull request #16290 from a3gis/master | Zachary Scott | 2014-07-25 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Fix documentation of SQLite3Adapter.columns where SQLite3Column was removed in e781aa31fc52a7c696115302ef4d4e02bfd1533b | ||||
| * | | Fix documentation of SQlite3Adapter.columns | a3gis | 2014-07-25 | 1 | -1/+1 |
| | | | | | | | | | As of https://github.com/rails/rails/commit/e781aa31fc52a7c696115302ef4d4e02bfd1533b SQLite3Column has been dropped. | ||||
* | | | Add support for Postgresql JSONB | Philippe Creux | 2014-07-24 | 4 | -0/+29 |
| |/ |/| | | | | | [Philippe Creux, Chris Teague] | ||||
* | | Merge pull request #16280 from a3gis/master | Matthew Draper | 2014-07-24 | 1 | -2/+2 |
|\| | | | | | Fixes #16265 and correct documentation typo | ||||
| * | Fix documentation typo in ConnectionSpecification::Resolve.spec | a3gis | 2014-07-24 | 1 | -1/+1 |
| | | |||||
| * | Fixes #16265 | a3gis | 2014-07-24 | 1 | -1/+1 |
| | | |||||
* | | pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`. | Yves Senn | 2014-07-24 | 1 | -1/+9 |
|/ | | | | | | | | | | | | Closes #16261. [Matthew Draper, Yves Senn] Using `DEFAULT NULL` results in the same behavior as `DROP DEFAULT`. However, PostgreSQL will cast the default to the columns type, which leaves us with a default like "default NULL::character varying". /cc @matthewd | ||||
* | Merge pull request #16231 from Envek/type_in_references | Yves Senn | 2014-07-22 | 2 | -4/+25 |
|\ | | | | | | | | | | | * Allow to specify a type for foreign key column in migrations * unified the docs * some cleanup in CHANGELOG | ||||
| * | Allow to specify a type for foreign key column in migrations | Andrey Novikov | 2014-07-22 | 2 | -2/+10 |
|/ | | | | [Andrey Novikov & Łukasz Sarnacki] | ||||
* | Merge pull request #15944 from seuros/uuid | Rafael Mendonça França | 2014-07-16 | 1 | -1/+10 |
|\ | | | | | | | | | | | | | Treat invalid uuid as nil Conflicts: activerecord/CHANGELOG.md | ||||
| * | Treat invalid uuid as nil | Abdelkader Boudih | 2014-07-14 | 1 | -1/+10 |
| | | |||||
* | | Predicate methods don't need to return `true` / `false` | Rafael Mendonça França | 2014-07-15 | 1 | -1/+1 |
| | | |||||
* | | Fix version detection for RENAME INDEX support. Fixes #15931. | Jeff Browning | 2014-07-15 | 3 | -6/+18 |
|/ | |||||
* | Merge pull request #16136 from sgrif/sg-pg-bit-string | Matthew Draper | 2014-07-12 | 2 | -13/+33 |
|\ | | | | | Don't rely on the column SQL type for bit string quoting | ||||
| * | Don't rely on the column SQL type for bit string quoting | Sean Griffin | 2014-07-11 | 2 | -13/+33 |
| | | |||||
* | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-12 | 1 | -14/+22 |
|\ \ | |/ |/| | Use a type object for type casting behavior on SQLite3 | ||||
| * | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-11 | 1 | -14/+22 |
| | | |||||
* | | Merge pull request #16071 from sgrif/sg-pg-type-cast | Rafael Mendonça França | 2014-07-08 | 1 | -15/+0 |
|\ \ | | | | | | | Remove PG's definition of `type_cast` | ||||
| * | | Remove PG's definition of `type_cast` | Sean Griffin | 2014-07-06 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | All cases except for `nil` in an array have been removed. `nil` in an array is handled by the Array type object. | ||||
* | | | Merge pull request #16072 from sgrif/sg-xml-quoting | Rafael Mendonça França | 2014-07-08 | 4 | -4/+42 |
|\ \ \ | | | | | | | | | Don't rely on the sql type to quote XML columns in PG | ||||
| * | | | Don't rely on the sql type to quote XML columns in PG | Sean Griffin | 2014-07-06 | 4 | -4/+42 |
| |/ / | |||||
* / / | Remove the `text?` predicate from the type objects | Sean Griffin | 2014-07-06 | 1 | -4/+0 |
|/ / | | | | | | | | | | | | | This was only used for uniqueness validations. The first usage was in conjunction with `limit`. Types which cast to string, but are not considered text cannot have a limit. The second case was only with an explicit `:case_sensitive => true` option given by the user. | ||||
* | | Change back occurrences of SQLite(3) to sqlite3 when referring to the | Zachary Scott | 2014-07-06 | 2 | -5/+5 |
| | | | | | | | | adapter, fixed from #16057 [ci skip] | ||||
* | | Merge pull request #16057 from akshay-vishnoi/doc_change | Zachary Scott | 2014-07-06 | 2 | -3/+3 |
|\ \ | | | | | | | [ci skip] /sqlite/i --> SQLite | ||||
| * | | [ci skip] /sqlite/i --> SQLite | Akshay Vishnoi | 2014-07-06 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #16065 from matthewd/mysql-explicit-non-strict | Matthew Draper | 2014-07-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | If our connection is explicitly non-strict, tell MySQL | ||||
| * | | | If our connection is explicitly non-strict, tell MySQL | Matthew Draper | 2014-07-06 | 1 | -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. | ||||
* | | | | Use the type object for quoting PG Ranges | Sean Griffin | 2014-07-05 | 4 | -48/+34 |
| | | | | |||||
* | | | | Revert "Use a type object for type casting behavior on SQLite3" | Matthew Draper | 2014-07-05 | 1 | -37/+13 |
|/ / / | |||||
* | | | Merge pull request #16003 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-05 | 1 | -13/+37 |
|\ \ \ | | | | | | | | | Use a type object for type casting behavior on SQLite3 | ||||
| * | | | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-01 | 1 | -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 #16037 from sgrif/sg-money-quoting | Rafael Mendonça França | 2014-07-04 | 1 | -7/+0 |
|\ \ \ | |_|/ |/| | | Remove unneccessary special case for money in quoting | ||||
| * | | Remove unneccessary special case for money in quoting | Sean Griffin | 2014-07-03 | 1 | -7/+0 |
| | | | |||||
* | | | 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 |
|/ / | |||||
* | | 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. | ||||
* | 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. | ||||
* | Use the type object when sending point columns to the DB | Sean Griffin | 2014-06-29 | 3 | -19/+9 |
| | |||||
* | Use the type object for sending JSON to the database | Sean Griffin | 2014-06-29 | 3 | -22/+10 |
| |