aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-223-3/+13
|\ | | | | | | | | | | | | Dump UUID default functions to schema.rb [2nd version]. Fixes #10751. Conflicts: activerecord/CHANGELOG.md
| * Migration dump UUID default functions to schema.rb. Fixes #10751.kennyj2013-07-103-3/+12
| |
| * Fix typo.kennyj2013-07-101-1/+1
| |
* | Give the credits [ci skip]Rafael Mendonça França2013-09-221-0/+2
| |
* | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-223-3/+50
|\ \ | | | | | | | | | | | | | | | | | | Fixed a bug in when using has_many association with :inverse_of option and UUID primary key. Conflicts: activerecord/CHANGELOG.md
| * | Fixed a bug in when using has_many association with :inverse_of option and ↵kennyj2013-05-083-3/+48
| | | | | | | | | | | | UUID primary key.
* | | Merge pull request #12311 from kennyj/fix_typo_about_uuidRafael Mendonça França2013-09-211-1/+1
|\ \ \ | | | | | | | | Fix typo. This test isn't executed even in the postgresql.
| * | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| | | |
* | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-2/+10
|/ / / | | | | | | | | | | | | | | | | | | This will make easier to hook protected_attributes gem in our code without making that gem fragile to change in Rails code base. Closes #12243
* | | remove unused variableAaron Patterson2013-09-181-1/+0
| | |
* | | support objects with blank string primary keysAaron Patterson2013-09-182-1/+7
| | |
* | | ActiveRecord::Base#<=> has been removed. Primary keys may not be in order,Aaron Patterson2013-09-183-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or even be numbers, so sorting by id doesn't make sense. Please use `sort_by` and specify the attribute you wish to sort with. For example, change: Post.all.to_a.sort to: Post.all.to_a.sort_by(&:id)
* | | do what the superclass does in the case that objects do not matchAaron Patterson2013-09-182-0/+10
| | |
* | | Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-164-6/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Collapse where constraints to the Arel::Nodes::And node Conflicts: activerecord/CHANGELOG.md
| * | | Collapse where constraints to one where constraintPaul Nikitochkin2013-09-134-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove duplication with joining arel where constraints with `AND`, all constraints on `build_arel` are collapsed into one head node: `Arel::Nodes::And` Closes: #11963
* | | | Removes unused code related to DatabaseTasks.kennyj2013-09-161-4/+0
| | | |
* | | | Merge pull request #12129 from Empact/deprecate-array-bang-delegationRafael Mendonça França2013-09-125-147/+265
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the delegation of Array bang methods in ActiveRecord::Delegation Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/relation_test.rb
| * | | | Deprecate the delegation of Array bang methods in ActiveRecord::DelegationBen Woosley2013-09-043-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary means of returning results for Array bang methods is to modify the array in-place. When you call these methods on a relation, that array is created, modified, and then thrown away. Only the secondary return value is exposed to the caller. Removing this delegation is a straight-forward way to reduce user error by forcing callers to first explicitly call #to_a in order to expose the array to be acted on by the bang method.
| * | | | Pull the RelationMutationTests from cases/relation_test to ↵Ben Woosley2013-09-032-135/+139
| | | | | | | | | | | | | | | | | | | | cases/relation/mutation_test.
* | | | | Merge pull request #12137 from lann/fix_association_first_lastRafael Mendonça França2013-09-123-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CollectionAssociation first/last with integer fetch with query Conflicts: activerecord/CHANGELOG.md
| * | | | | Make CollectionAssociation first/last with integer fetch with queryLann Martin2013-09-093-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first or last is called with an integer on an unloaded association, the entire collection is loaded. This differs surprisingly from the behavior of Relation#first/last, which translate the call into a limit query. For large collections this can make a big difference in performance. Change CollectionAssociation#fetch_first_or_last_using_find? to make this kind of call delegate to Relation.
* | | | | | Add CHANGELOG entry for #11698Rafael Mendonça França2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #11698 from dmathieu/sqlite_tasks_without_railsRafael Mendonça França2013-09-123-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Let the SQLite rake tasks run without rails
| * | | | | | let the sqlite task run without railsDamien Mathieu2013-08-073-2/+4
| | | | | | |
* | | | | | | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-123-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Relation#from to accept other relations with bind values. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-083-0/+12
| | | | | | | |
* | | | | | | | Remove unnecessary loopVipul A M2013-09-131-5/+2
| | | | | | | |
* | | | | | | | Disable prepared statements in the unprepared_statement blockRafael Mendonça França2013-09-121-2/+3
| | | | | | | |
* | | | | | | | Fix typo on instance variable get callCarlos Antonio da Silva2013-09-121-1/+1
| | | | | | | |
* | | | | | | | these are not real developer objects, so counting them doesn't makeAaron Patterson2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sense. Let's load the object to ensure it's an array and count the array.
* | | | | | | | Remove conditional adding a new methodRafael Mendonça França2013-09-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the point we want to add the reflection we already know the reflection is of the AggregateReflection type so we can call a specific method
* | | | | | | | Fix inverted conditionalRafael Mendonça França2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, I should had run the tests
* | | | | | | | Remove invalid commentRafael Mendonça França2013-09-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not valid anymore after 08477a651648ba4417ded128aa37b9ae0dcbc9ce
* | | | | | | | Check if the SQL is not a prepared statementRafael Mendonça França2013-09-1110-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the adapter is with prepared statement disabled and the binds array is not empty the connection adapter will try to set the binds values and will fail. Now we are checking if the adapter has the prepared statement disabled. Fixes #12023
* | | | | | | | Merge pull request #12188 from SamSaffron/masterAaron Patterson2013-09-114-12/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Perf: avoid dupes add fallback logic for coders
| * | | | | | | | Perf: avoid dupes add fallback logic for codersSam2013-09-114-12/+16
| | | | | | | | |
* | | | | | | | | Merge pull request #12135 from dylanahsmith/avoid_empty_transactionRafael Mendonça França2013-09-113-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid empty transaction from setting has_one association on new record. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | Avoid empty transaction from setting has_one association on new record.Dylan Thacker-Smith2013-09-113-1/+9
| | | | | | | | | |
* | | | | | | | | | WhitespacesRafael Mendonça França2013-09-111-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12185 from SamSaffron/join_depRafael Mendonça França2013-09-111-1/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Reduce allocations when extracting AR models
| * | | | | | | | | | Reduce allocations when extracting AR modelsSam2013-09-111-1/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #12194 from thedarkone/readonly-merger-fixRafael Mendonça França2013-09-113-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Relation#merge should not lose readonly(false) flag.
| * | | | | | | | | | | Relation#merge should not lose readonly(false) flag.thedarkone2013-09-113-1/+17
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code ignores the `false` value because `false.blank? # => true`.
* | / / / / / / / / / fix deleting join models with no pkAaron Patterson2013-09-112-6/+62
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | add a comment for sanity of other people to comeAaron Patterson2013-09-101-0/+8
| | | | | | | | | |
* | | | | | | | | | ask the association for records rather than calling `send`Aaron Patterson2013-09-101-1/+2
| | | | | | | | | |
* | | | | | | | | | More unused associations in AR test modelsAkira Matsuda2013-09-108-13/+0
| | | | | | | | | |
* | | | | | | | | | :scissors: [ci skip]Carlos Antonio da Silva2013-09-101-1/+1
| | | | | | | | | |
* | | | | | | | | | change function def self.table_name to self.table_nameRajarshi Das2013-09-102-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key
* | | | | | | | | | Clean up unused associations in AR test modelAkira Matsuda2013-09-101-3/+0
|/ / / / / / / / /