Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'revert-order-prepending' | Rafael Mendonça França | 2013-07-30 | 6 | -17/+32 |
|\ | | | | | | | | | Conflicts: activerecord/CHANGELOG.md | ||||
| * | Revert change on ActiveRecord::Relation#order method that prepends new | Rafael Mendonça França | 2013-07-29 | 6 | -17/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order on the old ones The previous behavior added a major backward incompatibility since it impossible to have a upgrade path without major changes on the application code. We are taking the most conservative path to be consistent with the idea of having a smoother upgrade on Rails 4. We are reverting the behavior for what was in Rails 3.x and, if needed, we will implement a new API to prepend the order clauses in Rails 4.1. | ||||
* | | Merge pull request #10673 from sgrif/master | Rafael Mendonça França | 2013-07-29 | 5 | -35/+98 |
|\ \ | |/ |/| | Add ability to specify how a class is converted to Arel predicate when passed to where | ||||
| * | Add ability to specify how a class is converted to Arel predicate | sgrif | 2013-07-28 | 5 | -35/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability for rails apps or gems to have granular control over how a domain object is converted to sql. One simple use case would be to add support for Regexp. Another simple case would be something like the following: class DateRange < Struct.new(:start, :end) def include?(date) (start..end).cover?(date) end end class DateRangePredicate def call(attribute, range) attribute.in(range.start..range.end) end end ActiveRecord::PredicateBuilder.register_handler(DateRange, DateRangePredicate.new) More complex cases might include taking a currency object and converting it from EUR to USD before performing the query. By moving the existing handlers to this format, we were also able to nicely refactor a rather nasty method in PredicateBuilder. | ||||
* | | only calculate the klass once | Aaron Patterson | 2013-07-29 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #11651 from ↵ | Carlos Antonio da Silva | 2013-07-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | neerajdotname/log_should_mimick_original_log_method interceptor should mimick original method | ||||
| * | | interceptor should mimick original method | Neeraj Singh | 2013-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | This fix also makes the test order independent. | ||||
* | | | Merge pull request #11649 from ↵ | Carlos Antonio da Silva | 2013-07-29 | 1 | -30/+20 |
|\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/use_method_with_active_record_default_timezone use method with_active_record_default_timezone | ||||
| * | | | use method with_active_record_default_timezone | Neeraj Singh | 2013-07-29 | 1 | -30/+20 |
| |/ / | |||||
* / / | remove duplicate method | Neeraj Singh | 2013-07-29 | 1 | -7/+0 |
|/ / | | | | | | | This method is already present in helper.rb | ||||
* | | Merge pull request #11608 from arunagw/ruby-from-rubygems | Aaron Patterson | 2013-07-28 | 1 | -2/+1 |
|\ \ | |/ |/| | grab executable from rubygems | ||||
| * | grab executable from rubygems | Arun Agrawal | 2013-07-26 | 1 | -2/+1 |
| | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc | ||||
* | | Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails" | Akira Matsuda | 2013-07-29 | 1 | -1/+1 |
| | | |||||
* | | Revert "fix order dependent test related to migration" | Akira Matsuda | 2013-07-29 | 1 | -4/+0 |
| | | | | | | | | | | | | This reverts commit 10259c3e906da2191ef0d43cd664a3b5504d9f8c. reason: this causes rake test_mysql and test_mysql2 fail | ||||
* | | Properly repair validations when dynamically added | Akira Matsuda | 2013-07-29 | 1 | -24/+30 |
| | | |||||
* | | Clear class ivar before testing | Akira Matsuda | 2013-07-29 | 1 | -0/+2 |
| | | |||||
* | | Unneeded assertion | Akira Matsuda | 2013-07-29 | 1 | -1/+1 |
| | | |||||
* | | Don't rewrite AR connection#commit_db_transaction method globally | Akira Matsuda | 2013-07-29 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #11641 from ankit8898/test_cleanup | Rafael Mendonça França | 2013-07-28 | 2 | -2/+2 |
|\ \ | | | | | | | Cleanup of class_name | ||||
| * | | Cleanup of class_name | Ankit Gupta | 2013-07-28 | 2 | -2/+2 |
| | | | | | | | | | | | | Don't think class name is needed as by default belongs_to :select will be linked to Select class. | ||||
* | | | Merge pull request #11634 from ↵ | Rafael Mendonça França | 2013-07-28 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration | ||||
| * | | | fix order dependent test related to migration | Neeraj Singh | 2013-07-28 | 1 | -0/+4 |
| | |/ | |/| | | | | | | | | | | | | | If the order in which tests are executed is changed then test fails. This commit ensures that all migrations are run before ensuring that there are no pending migration. | ||||
* | | | Merge pull request #11635 from ↵ | Rafael Mendonça França | 2013-07-28 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone | ||||
| * | | | make test order independent by resetting timezone | Neeraj Singh | 2013-07-28 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_order | Rafael Mendonça França | 2013-07-28 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | reset default timezone and make test order independent | ||||
| * | | | reset default timezone and make test order independent | Neeraj Singh | 2013-07-28 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #11638 from ↵ | Rafael Mendonça França | 2013-07-28 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | neerajdotname/make_order_independent_association_test make test not depend on order | ||||
| * | | make test not depend on order | Neeraj Singh | 2013-07-28 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | `NestedThroughAssociationsTest` adds records to `member_details` table. When test performs `@member_details[0]` then the order of record is not guaranteed. Hence it is best to start with a clean slate by deleting unwanted records. | ||||
* / | fix order dependent test | Neeraj Singh | 2013-07-28 | 1 | -0/+5 |
|/ | | | | | `ReflectionTest` uses column information in tests and those tests break if tests are run in random order. | ||||
* | used flat_map instead of map.flatten | Karunakar (Ruby) | 2013-07-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #11582 from steveklabnik/add_bin | Steve Klabnik | 2013-07-25 | 1 | -1/+1 |
|\ | | | | | rake -> bin/rake | ||||
| * | rake -> bin/rake | Steve Klabnik | 2013-07-24 | 1 | -1/+1 |
| | | |||||
* | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-07-25 | 1 | -1/+1 |
| | | |||||
* | | change function def self.table_name to self.table_name | Rajarshi Das | 2013-07-25 | 2 | -5/+3 |
| | | | | | | | | | | | | change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key | ||||
* | | More unused associations in AR test models | Akira Matsuda | 2013-07-25 | 8 | -13/+0 |
| | | |||||
* | | Clean up unused associations in AR test model | Akira Matsuda | 2013-07-25 | 1 | -3/+0 |
| | | |||||
* | | Cleanup task for informing about hstore | Vipul A M | 2013-07-25 | 1 | -6/+3 |
|/ | |||||
* | Fix indentation. | kennyj | 2013-07-24 | 1 | -8/+8 |
| | |||||
* | Simplify select_one method. | kennyj | 2013-07-24 | 1 | -2/+1 |
| | | | | | | The select_all method always returns ActiveRecord::Result instance, and the ActiveRecord::Result includes Enumerable mixin. If #empty?, #first method returns nil. Thus we can simplify this method. | ||||
* | Refactor to use flat_map | Carlos Antonio da Silva | 2013-07-23 | 1 | -3/+3 |
| | |||||
* | oops! | Aaron Patterson | 2013-07-23 | 1 | -1/+1 |
| | |||||
* | eliminate conditional in JoinHelper | Aaron Patterson | 2013-07-23 | 2 | -2/+2 |
| | |||||
* | acually get the actual source reflection :cry::gun: | Aaron Patterson | 2013-07-23 | 2 | -9/+17 |
| | |||||
* | stop relying on side effects of const_missing | Aaron Patterson | 2013-07-23 | 2 | -7/+13 |
| | |||||
* | add a specific factory method rather than using new | Aaron Patterson | 2013-07-23 | 9 | -13/+11 |
| | |||||
* | factory methods should not have side effects. | Aaron Patterson | 2013-07-23 | 3 | -8/+11 |
| | | | | Move model mutation to the methods that are called on the model. | ||||
* | extract mutation from generation method | Aaron Patterson | 2013-07-23 | 2 | -4/+6 |
| | |||||
* | habtm can only ever be an association reflection | Aaron Patterson | 2013-07-22 | 1 | -2/+4 |
| | |||||
* | use the predicate method | Aaron Patterson | 2013-07-22 | 1 | -1/+1 |
| | |||||
* | AR::Base does not need to know how to create reflection objects | Aaron Patterson | 2013-07-22 | 3 | -21/+21 |
| |