Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5535 from markmcspadden/issue_5527_rollbacks | Aaron Patterson | 2012-05-16 | 1 | -0/+37 |
|\ | | | | | Allow manual rollbacks in after_save to reset object correctly | ||||
| * | Allow manual rollbacks in after_save to reset object correctly | Mark McSpadden | 2012-03-21 | 1 | -0/+37 |
| | | |||||
* | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless | Aaron Patterson | 2012-05-16 | 1 | -1/+5 |
| | | | | | | | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast. | ||||
* | | Merge pull request #6136 from mhfs/sqlbypass_fixes | Aaron Patterson | 2012-05-16 | 1 | -0/+5 |
|\ \ | | | | | | | Bring SqlByPassTest to light and fix broken tests | ||||
| * | | Rename test file so that the test suite matches it, implement `persisted?` ↵ | Marcelo Silveira | 2012-05-16 | 1 | -0/+5 |
| | | | | | | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error). | ||||
* | | | Merge pull request #6349 from erichmenge/patch-raise-type-errors | Aaron Patterson | 2012-05-16 | 3 | -6/+33 |
|\ \ \ | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272 | ||||
| * | | | Integer limit out of range should be allowed to raise. Closes #6272 | Erich Menge | 2012-05-16 | 3 | -6/+33 |
| |/ / | |||||
* | | | Merge pull request #6336 from erichmenge/patch-pluck-fragment | Carlos Antonio da Silva | 2012-05-16 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column | ||||
| * | | | Fixes issue where SQL fragments prevented type casting based on column type. | Erich Menge | 2012-05-16 | 1 | -0/+3 |
| |/ / | |||||
* | | | Remove unneeded tests | Piotr Sarnacki | 2012-05-16 | 1 | -12/+0 |
| | | | |||||
* | | | SQLite3 doesn't actually support the 'time' type. | Erich Menge | 2012-05-15 | 3 | -3/+15 |
|/ / | |||||
* | | Merge pull request #6325 from kennyj/fix_5832-3 | Carlos Antonio da Silva | 2012-05-15 | 1 | -5/+1 |
|\ \ | | | | | | | Remove unnecessary assertions. | ||||
| * | | Remove unnecessary assertions. We should only test the before_seq isn't same ↵ | kennyj | 2012-05-16 | 1 | -5/+1 |
| | | | | | | | | | | | | to the after_seq when using sequencer. | ||||
* | | | Restore support for Model.pluck('sql fragment') | Jeremy Kemper | 2012-05-15 | 1 | -0/+8 |
|/ / | |||||
* | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 1 | -0/+8 |
| | | |||||
* | | MySQL doesn't allow default values for blobs. | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5807 from Antiarchitect/store-improvement | Rafael Mendonça França | 2012-05-13 | 3 | -1/+39 |
|\ \ | | | | | | | Custom coders support for ActiveRecord::Store. | ||||
| * | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵ | Andrey Voronkov | 2012-05-09 | 3 | -1/+39 |
| | | | | | | | | | | | | used out of the box. | ||||
* | | | fix todo: use minitest skip instead of return nil | Francesco Rodriguez | 2012-05-13 | 1 | -9/+8 |
| | | | |||||
* | | | Merge pull request #6193 from mhfs/fix_oracle_spec | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix failing AR test on Oracle | ||||
| * | | | Fix failing test on Oracle. Having a duplicated column specified in a | Marcelo Silveira | 2012-05-07 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147). | ||||
* | | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -1/+1 |
| | | | |||||
* | | | Remove #=== quirk | Jon Leighton | 2012-05-11 | 2 | -11/+0 |
| | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this. | ||||
* | | | CollectionProxy < Relation | Jon Leighton | 2012-05-11 | 5 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps bring the interfaces of CollectionProxy and Relation closer together, and reduces the delegation backflips we need to perform. For example, first_or_create is defined thus: class ActiveRecord::Relation def first_or_create(...) first || create(...) end end If CollectionProxy < Relation, then post.comments.first_or_create will hit the association's #create method which will actually add the new record to the association, just as post.comments.create would. With the previous delegation, post.comments.first_or_create expands to post.comments.scoped.first_or_create, where post.comments.scoped has no knowledge of the association. | ||||
* | | | Return false for exists? with new records - fixes #6199. | Andrew White | 2012-05-10 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb | Jeremy Kemper | 2012-05-09 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Rename variables and remove unused code in fixtures.rb | ||||
| * | | | Rename some variables | Alexey Muranov | 2012-05-09 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | Rename some parameters and instance and local variables, mostly in fixtures.rb. Also remove an unused assignment to an instance variable. There are minor code changes. | ||||
* | | | Allow to run `connection_adapters/quoting_test.rb` independently | Piotr Sarnacki | 2012-05-09 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly | ||||
| * | | | Fixed bug in Quoting that caused classes to be quoted incorrectly | Ryan Oblak | 2012-03-09 | 1 | -0/+11 |
| | | | | |||||
* | | | | make both cached and record_updated accessors in one line | Hemant Kumar | 2012-05-09 | 1 | -2/+1 |
| | | | | |||||
* | | | | after_commit :on => :update should be called when save is | Hemant Kumar | 2012-05-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | called from after_commit callback | ||||
* | | | | Fix transaction state not changing when after record gets commited | Hemant Kumar | 2012-05-09 | 1 | -0/+25 |
| |/ / |/| | | |||||
* | | | Merge pull request #6173 from mhfs/takes_instead_first | Jeremy Kemper | 2012-05-05 | 2 | -1/+13 |
|\ \ \ | | | | | | | | | Use `take` instead of `first` to avoid unwanted implicit ordering. Closes #6147. | ||||
| * | | | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147) | Marcelo Silveira | 2012-05-05 | 2 | -1/+13 |
| | | | | |||||
* | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 3 | -1/+32 |
|\ \ \ \ | | | | | | | | | | | Use strict mode in mysql | ||||
| * | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 2 | -0/+29 |
| | | | | | |||||
| * | | | | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is ↵ | Michael Pearson | 2012-05-05 | 1 | -1/+3 |
| |/ / / | | | | | | | | | | | | | required to keep MySQL happy. | ||||
* | | | | Merge pull request #6054 from flexoid/column-fix | Jon Leighton | 2012-05-05 | 1 | -0/+28 |
|\ \ \ \ | | | | | | | | | | | Prevent creating valid time-like objects from blank string from db | ||||
| * | | | | Prevent creating valid time-like objects from blank string from db | Egor Lynko | 2012-05-05 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | Issue #6045 | ||||
* | | | | | Revert "Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 1 | -8/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5. | ||||
* | | | | Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 1 | -1/+8 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges | ||||
| * | | | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 1 | -1/+8 |
| | | | | |||||
* | | | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 2 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 1 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | ||||
| * | | | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 1 | -0/+12 |
| | | | | | |||||
* | | | | | extract deprecated dynamic methods | Jon Leighton | 2012-05-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | extract code from AR::Base | Jon Leighton | 2012-05-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | clean up implementation of dynamic methods. use method compilation etc. | Jon Leighton | 2012-05-04 | 2 | -109/+2 |
| |/ / / |/| | | | |||||
* | | | | Fix issue with private kernel methods and collection associations. Closes #2508 | Carlos Antonio da Silva | 2012-05-02 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing. |