aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* push some validation up to the factory methodAaron Patterson2013-07-311-4/+5
|
* use bind values for model typesAaron Patterson2013-07-311-2/+3
|
* Merge pull request #11606 from vipulnsward/refactor_array_parserRafael Mendonça França2013-07-301-15/+22
|\ | | | | Refactor `ArrayParser`
| * Refactor `ArrayParser`Vipul A M2013-07-261-15/+22
| | | | | | | | | | * Constantize parse token * Remove extra param passed to `parse_data`
* | Merge pull request #11668 from neerajdotname/make_test_order_independent_2Rafael Mendonça França2013-07-302-3/+6
|\ \ | | | | | | Make test order independent
| * | assert_no_queries should ignore certain sqlsNeeraj Singh2013-07-301-1/+3
| | | | | | | | | | | | | | | postgresql test if randomly executed then executes "SHOW max_identifier_length". Hence the need to ignore certain predefined sqls that deal with system calls.
| * | assert_no_queries should allow to ignore some queriesNeeraj Singh2013-07-301-2/+3
| | |
* | | all `scope_chain` methods allocate new arrays, no need to dupAaron Patterson2013-07-301-1/+1
| | |
* | | Merge branch 'revert-order-prepending'Rafael Mendonça França2013-07-306-17/+32
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
| * | | Revert change on ActiveRecord::Relation#order method that prepends newRafael Mendonça França2013-07-296-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/masterRafael Mendonça França2013-07-295-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 predicatesgrif2013-07-285-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 onceAaron Patterson2013-07-291-1/+2
| |/ / |/| |
* | | Merge pull request #11651 from ↵Carlos Antonio da Silva2013-07-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | neerajdotname/log_should_mimick_original_log_method interceptor should mimick original method
| * | | interceptor should mimick original methodNeeraj Singh2013-07-291-1/+1
| | | | | | | | | | | | | | | | This fix also makes the test order independent.
* | | | Merge pull request #11649 from ↵Carlos Antonio da Silva2013-07-291-30/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | neerajdotname/use_method_with_active_record_default_timezone use method with_active_record_default_timezone
| * | | | use method with_active_record_default_timezoneNeeraj Singh2013-07-291-30/+20
| |/ / /
* / / / remove duplicate methodNeeraj Singh2013-07-291-7/+0
|/ / / | | | | | | | | | This method is already present in helper.rb
* | | Merge pull request #11608 from arunagw/ruby-from-rubygemsAaron Patterson2013-07-281-2/+1
|\ \ \ | |/ / |/| | grab executable from rubygems
| * | grab executable from rubygemsArun Agrawal2013-07-261-2/+1
| | | | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* | | Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails"Akira Matsuda2013-07-291-1/+1
| | |
* | | Revert "fix order dependent test related to migration"Akira Matsuda2013-07-291-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit 10259c3e906da2191ef0d43cd664a3b5504d9f8c. reason: this causes rake test_mysql and test_mysql2 fail
* | | Properly repair validations when dynamically addedAkira Matsuda2013-07-291-24/+30
| | |
* | | Clear class ivar before testingAkira Matsuda2013-07-291-0/+2
| | |
* | | Unneeded assertionAkira Matsuda2013-07-291-1/+1
| | |
* | | Don't rewrite AR connection#commit_db_transaction method globallyAkira Matsuda2013-07-291-4/+4
| | |
* | | Merge pull request #11641 from ankit8898/test_cleanupRafael Mendonça França2013-07-282-2/+2
|\ \ \ | | | | | | | | Cleanup of class_name
| * | | Cleanup of class_nameAnkit Gupta2013-07-282-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ça2013-07-281-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration
| * | | | fix order dependent test related to migrationNeeraj Singh2013-07-281-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ça2013-07-281-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone
| * | | | make test order independent by resetting timezoneNeeraj Singh2013-07-281-0/+2
| |/ / /
* | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_orderRafael Mendonça França2013-07-281-0/+4
|\ \ \ \ | | | | | | | | | | reset default timezone and make test order independent
| * | | | reset default timezone and make test order independentNeeraj Singh2013-07-281-0/+4
| |/ / /
* | | | Merge pull request #11638 from ↵Rafael Mendonça França2013-07-281-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | neerajdotname/make_order_independent_association_test make test not depend on order
| * | | make test not depend on orderNeeraj Singh2013-07-281-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 testNeeraj Singh2013-07-281-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.flattenKarunakar (Ruby)2013-07-251-1/+1
| |
* | Merge pull request #11582 from steveklabnik/add_binSteve Klabnik2013-07-251-1/+1
|\ \ | | | | | | rake -> bin/rake
| * | rake -> bin/rakeSteve Klabnik2013-07-241-1/+1
| | |
* | | :scissors: [ci skip]Carlos Antonio da Silva2013-07-251-1/+1
| | |
* | | change function def self.table_name to self.table_nameRajarshi Das2013-07-252-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 modelsAkira Matsuda2013-07-258-13/+0
| | |
* | | Clean up unused associations in AR test modelAkira Matsuda2013-07-251-3/+0
| |/ |/|
* | Cleanup task for informing about hstoreVipul A M2013-07-251-6/+3
|/
* Fix indentation.kennyj2013-07-241-8/+8
|
* Simplify select_one method.kennyj2013-07-241-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_mapCarlos Antonio da Silva2013-07-231-3/+3
|
* oops!Aaron Patterson2013-07-231-1/+1
|
* eliminate conditional in JoinHelperAaron Patterson2013-07-232-2/+2
|