aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add test for selected and disabled custom attributes in options_for_selectLaura Paredes2014-03-311-1/+21
|
* Do not overwrite selected and disabled attributesLaura Paredes2014-03-301-2/+2
|
* Merge pull request #14528 from planas/patch-1Rafael Mendonça França2014-03-301-0/+1
|\ | | | | Require yaml explicitly on #database_configuration
| * Require yaml explicitlyAdrià Planas2014-03-291-0/+1
| |
* | No need to call to_symRafael Mendonça França2014-03-301-2/+2
| | | | | | | | It is already called inside type_to_sql method.
* | Merge pull request #14474 from tgxworld/table_cleanup_after_each_testYves Senn2014-03-302-167/+198
|\ \ | |/ |/| Refactor test to use DdlHelper.
| * Refactor test to use DdlHelper.Guo Xiang Tan2014-03-292-167/+198
|/ | | | | | | Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order.
* Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-293-0/+47
|\ | | | | append link to bad code when error type is SyntaxError
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-273-0/+47
| |
* | Merge pull request #14524 from tgxworld/fix_unsubscribe_from_notificationsYves Senn2014-03-294-12/+12
|\ \ | | | | | | | | | Fix tests not unsubscribing from Notifications.
| * | Fix tests not unsubscribing from Notifications.Guo Xiang Tan2014-03-284-8/+8
| | | | | | | | | | | | See https://github.com/rails/rails/blob/master/activesupport/lib/active_support/notifications.rb#L131
* | | Merge pull request #14526 from chancancode/fix_ar_equalityXavier Noria2014-03-293-8/+9
|\ \ \ | | | | | | | | Ensure we are returning either `true` or `false` for `#==`
| * | | Ensure we are returning either `true` or `false` for `#==`Godfrey Chan2014-03-293-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | 460eb83d cused `ActiveRecord::Base#==` to sometimes return `nil` in some cases, this ensures we always return a boolean value. Also fixed a similar problem in AR reflections.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-294-2/+20
|\ \ \ \ | |/ / / |/| | |
| * | | copy edit [ci skip]Vijay Dev2014-03-291-1/+1
| | | |
| * | | Clarify environment_name for logsGaurish Sharma2014-03-271-1/+1
| | | | | | | | | | | | [ci skip]
| * | | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
| * | | Update documentation on group method to indicate it takes an arrayEarl St Sauver2014-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The group method also takes an array, however this isn't immediately clear by reading the source since it delegates this method. If you trace it back to the AREL building you can see that it does support an array. Shoutout to @betovelandia for pointing this out.
| * | | Fix misspelling in references docsSteven Harman2014-03-141-1/+1
| | | |
| * | | Updating select helper doc [ci skip]Rashmi Yadav2014-03-081-0/+10
| | | |
* | | | Merge pull request #14521 from kreynolds/replace-regexp-with-include-or-stringXavier Noria2014-03-284-4/+4
|\ \ \ \ | |_|/ / |/| | | Replace trivial regexp with string or include, twice as fast
| * | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-284-4/+4
|/ / /
* | | Merge pull request #12550 from Peeja/hash-wia-update-respects-to-hashRafael Mendonça França2014-03-283-3/+51
|\ \ \ | | | | | | | | HashWithIndifferentAccess#update respects #to_hash
| * | | HashWithIndifferentAccess better respects #to_hashPeter Jaros2014-03-283-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | In particular, `.new`, `#update`, `#merge`, `#replace` all accept objects which respond to `#to_hash`, even if those objects are not Hashes directly.
* | | | Add CHANGELOG entry for #12778 [ci skip]Rafael Mendonça França2014-03-281-0/+4
| | | |
* | | | Merge pull request #12778 from etehtsea/rake-default-fixRafael Mendonça França2014-03-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't load test env by default. Closes #13241
| * | | | Don't load test env by defaultKonstantin Shabanov2013-11-111-1/+1
| | | | |
* | | | | PostgreSQL, use `PostgreSQLColumn` in PG specific tests.Yves Senn2014-03-281-8/+8
| | | | |
* | | | | PostgreSQL, test-cases to lock down column default values.Yves Senn2014-03-283-0/+33
| | | | |
* | | | | Merge pull request #14515 from mzahir/fix_xml_warningYves Senn2014-03-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix warning for overshadowing XML variable
| * | | | | Fix warning for overshadowing XML variableMusannif Zahir2014-03-281-2/+2
|/ / / / /
* | | | | PostgreSQL, test cases to lock the current column types.Yves Senn2014-03-288-15/+68
| | | | |
* | | | | Merge pull request #14154 from al2o3cr/issue12770Aaron Patterson2014-03-274-4/+14
|\ \ \ \ \ | |_|/ / / |/| | | | Pass a base relation to build_default_scope when joining
| * | | | Pass a base relation to build_default_scope when joiningMatt Jones2014-02-214-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This allows the default scope to be built using the current table alias. Resolves #12770
* | | | | Merge pull request #14469 from tiegz/timestamp_inheritance_fixRafael Mendonça França2014-03-273-1/+23
| | | | | | | | | | | | | | | | | | | | Swap Timestamp/Callbacks order in ActiveRecord::Base
* | | | | Merge pull request #14505 from davefp/patch-1Carlos Antonio da Silva2014-03-271-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Adds explanation of :base attribute to errors.add [ci skip]
| * | | | | Adds explanation of :base attribute to errors.addDavid Underwood2014-03-271-0/+7
|/ / / / / | | | | | | | | | | [ci skip]
* | | | | Merge pull request #14393 from chrisfinne/persisted_exceptionRafael Mendonça França2014-03-274-1/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error
| * | | | | AR .persisted? throws SystemStackError for an unsaved model with achrisfinne2014-03-274-1/+16
|/ / / / / | | | | | | | | | | | | | | | custom primary_key that didn't save due to validation error
* | | | | Add CHANGELOG to Active Model too [ci skip]Rafael Mendonça França2014-03-271-0/+6
| | | | |
* | | | | Merge pull request #14456 from henrik/add-validate-methodRafael Mendonça França2014-03-275-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | ActiveRecord/ActiveModel '#validate' alias for 'valid?'
| * | | | | ActiveRecord/ActiveModel '#validate' alias for 'valid?'Henrik Nyh2014-03-275-0/+38
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unintuitive to call '#valid?' when you want to run validations but don't care about the return value. The alias in ActiveRecord isn't strictly necessary (the ActiveModel alias is still in effect), but it clarifies.
* | | | | require dependency to execute a single test from xml_serialization_testYves Senn2014-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the tests are executed in order, the dependency is loaded at the right time. However this makes it impossible to execute a single test later down the line. Let's require the dependecy at the beginning to get them working independent of the order. This resolves the following error: ``` $ ARCONN=postgresql ruby -Itest /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb -n test_to_xml Using postgresql Run options: -n test_to_xml --seed 51819 E Finished in 0.081320s, 12.2971 runs/s, 0.0000 assertions/s. 1) Error: DatabaseConnectedXmlSerializationTest#test_to_xml: NameError: uninitialized constant DatabaseConnectedXmlSerializationTest::REXML /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb:226:in `test_to_xml' ``` /cc @tgxworld fyi
* | | | | only run citext_test if the connection supports_extensions?.Yves Senn2014-03-271-52/+54
| | | | | | | | | | | | | | | | | | | | This will keep the test suite passing with older PG installations.
* | | | | Merge pull request #14494 from laurocaetano/test_case_for_fk_with_validate_falseRafael Mendonça França2014-03-261-1/+15
|\ \ \ \ \ | | | | | | | | | | | | Add a test case for save(validate: false) with invalid foreign key.
| * | | | | Add a test case for save(validate:false) with invalid foreign key.Lauro Caetano2014-03-271-1/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | It is supposed to raise ActiveRecord::InvalidForeignKey when the database has a fk constraint.
* | | | | Fix build with bundler 1.6Rafael Mendonça França2014-03-261-1/+1
| | | | |
* | | | | Edge Rails applications doesn't need to use arel masterRafael Mendonça França2014-03-261-2/+1
| | | | |
* | | | | Remove unused methodRafael Mendonça França2014-03-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This method is not being called anywhere in our code and a GitHub search show it is not being used in any project.
* | | | | Merge branch 'rm-create-with-index'Rafael Mendonça França2014-03-266-66/+125
|\ \ \ \ \ | |_|_|_|/ |/| | | |