aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Fix #10789. Now at last ::Logger doesn't support #silence method .kennyj2013-06-052-3/+10
|
* the typecast value should be passed to the serializer. fixes #10830Aaron Patterson2013-06-052-6/+5
|
* adding a test for #10830Aaron Patterson2013-06-051-0/+18
| | | | | Conflicts: activerecord/test/cases/adapters/postgresql/bytea_test.rb
* Revert "Merge pull request #4490 from EmmanuelOga/master"José Valim2013-06-043-19/+2
| | | | | | | | This behaviour doesn't actually make sense, the context of the child should not be affected by the parent. See #10492. This reverts commit 5f8274efe128ffeec8fa3179460f5167a078f007, reversing changes made to 81e837e810460d066a2e5fc5a795366ec8ab2313.
* Merge pull request #10825 from arunagw/remove-rake-packagetask-loadGuillermo Iguaran2013-06-021-1/+0
|\ | | | | No need to load 'rake/packagetask' as it's already in 'rubygems/package_task'
| * No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-021-1/+0
| | | | | | | | | | in 'rubygems/package_task'
* | Merge pull request #10824 from vipulnsward/wonderfulGuillermo Iguaran2013-06-021-1/+1
|\ \ | |/ |/| wonderfull => wonderful
| * wonderfull => wonderfulVipul A M2013-06-021-1/+1
| |
* | Remove unnecessary testcase for instance level stored_attributes.kennyj2013-06-021-5/+0
| |
* | Remove instance level serialized_attributes setting was deprecated.kennyj2013-06-022-13/+0
| |
* | Remove instance level attr_readonly setting was deprecated.kennyj2013-06-022-12/+0
| |
* | Remove behavior that deals with a string as third argument of `add_index`, ↵kennyj2013-06-022-38/+14
| | | | | | | | | | | | because this was deprecated. Some testcases is failed, so I replaced nil to empty hash in add_reference.
* | Remove #sum with a block was deprecated.kennyj2013-06-013-21/+1
| |
* | Remove ActiveSupport::Benchmarkable#silence was deprecated.kennyj2013-06-011-32/+0
|/
* revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]Xavier Noria2013-06-011-14/+38
| | | | | | | | | | | | | | * Inspect uses double quotes. * Inspect puts a hash as in #<User ...>. * Documents the return value, and makes explicit it can be an invalid record. * Documents the method is not atomic. * Documents a way to handle UNIQUE contraint violations in the event of a race condition. * Removes the "Examples" header according to our guidelines.
* rewrites AR's reload documentationXavier Noria2013-05-311-4/+38
| | | | | | | | | | | | | | * It is no longer true that options are passed to find. * Documents that ActiveRecord::RecordNotFound may be raised. * Documents that the reload happens in-place. * Documents that caches are wiped. * Documents that the method returns self. * Documents a couple of use cases.
* Fix word order in documentation for with_lockPedro Fayolle2013-05-301-1/+1
|
* Merge pull request #10767 from jmondo/masterCarlos Antonio da Silva2013-05-291-1/+1
|\ | | | | Use grep instead of select with === in QueryMethods
| * use grep over select for consistency and efficiencyJohn Gesimondo2013-05-281-1/+1
| | | | | | | | pass block directly to grep
* | Merge pull request #10766 from kylerippey/minor_schema_migration_refactorRafael Mendonça França2013-05-281-18/+24
|\ \ | | | | | | Minor refactor of ActiveRecord::SchemaMigration
| * | Minor refactor of ActiveRecord::SchemaMigration to remove references to ↵Kyle Rippey2013-05-261-18/+24
| |/ | | | | | | Base, override table_exists method, and switch to preferred style for class method definitions.
* | Merge pull request #10495 from senny/postgres_test_cleanupRafael Mendonça França2013-05-282-30/+30
|\ \ | | | | | | PostgreSQL specific test cleanup
| * | cleanup, assert on warning from postgres adapterYves Senn2013-05-081-1/+1
| | |
| * | cleanup, switch arguments in assert_equal callsYves Senn2013-05-081-29/+29
| | |
* | | test cleanup, replace `define_method` and `remove_method` with stubs.Yves Senn2013-05-281-5/+1
| | |
* | | `implicit_readonly` is being removed in favor of calling `readonly` explicitlyYves Senn2013-05-275-24/+25
| | |
* | | cleanup whitespace in `active_record/relation.rb`.Yves Senn2013-05-271-4/+4
| |/ |/|
* | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
|\ \ | | | | | | Fix the `:primary_key` option for `has_many` associations.
| * | Fix the `:primary_key` option for `has_many` associations.Yves Senn2013-05-234-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing records from a `has_many` association it used the `primary_key` defined on the association. Our test suite didn't fail because on all occurences of `:primary_key`, the specified column was available in both tables. This prevented the code from raising an exception but it still behaved badly. I added a test-case to prevent regressions that failed with: ``` 1) Error: HasManyAssociationsTest#test_has_many_assignment_with_custom_primary_key: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: essays.first_name: UPDATE "essays" SET "writer_id" = NULL WHERE "essays"."writer_id" = ? AND "essays"."first_name" IS NULL ```
* | | deprecate Validator#setup (to get rid of a respond_to call). validators do ↵Nick Sutterer2013-05-231-6/+1
|/ / | | | | | | their setup in their constructor now.
* | Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678Rafael Mendonça França2013-05-221-0/+6
| |
* | remove code duplicationNeeraj Singh2013-05-221-2/+3
| |
* | Merge pull request #10714 from tkhr/extract_test_from_base_test.rb_in_ARCarlos Antonio da Silva2013-05-224-45/+54
|\ \ | | | | | | Extract tests code out from AR's base_test.rb
| * | Extract AR::Persistence#becomes's test code out from base_test.rbTakehiro Adachi2013-05-222-13/+13
| | | | | | | | | | | | | | | The method got extracted out from AR::Base in commit d916c62cfc7c59ab6411407a05b946d3dd7535e9, but the tests never did.
| * | Extract AR::AttributeMethods#attribute_for_inspect's test code out from ↵Takehiro Adachi2013-05-222-8/+8
| | | | | | | | | | | | | | | | | | | | | base_test.rb The method itself got extracted out from ActiveRecored::Base in commit ceb33f84933639d3b61aac62e5e71fd087ab65ed, but the test code never did.
| * | Extract AR::Core#inspect and AR::Core.inspect's test code from base_test.rbTakehiro Adachi2013-05-222-24/+33
| | | | | | | | | | | | | | | The methods got moved to core.rb in commit b2c9ce341a1c907041f55461aefebb0321280cb5, but the tests never did.
* | | reverse comparison because of strange AS behaviorAaron Patterson2013-05-211-1/+1
| | | | | | | | | | | | http://tenderlovemaking.com/2013/05/21/one-danger-of-freedom-patches.html
* | | just set the default argument, a nil parent should be an errorAaron Patterson2013-05-211-2/+1
| | |
* | | fold the collection rather than multiple assigmentsAaron Patterson2013-05-211-3/+2
| | |
* | | use drop rather than calculate the array lengthAaron Patterson2013-05-211-1/+1
| | |
* | | Merge branch 'bindwhere'Aaron Patterson2013-05-212-20/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bindwhere: avoid creating a set if no where values are removed remove bind values for where clauses that were removed push partitioning up so bind elimination can get the removed wheres push partion logic down and initialization logic up partition the where values so we can access the removed ones
| * | | avoid creating a set if no where values are removedAaron Patterson2013-05-212-0/+14
| | | |
| * | | remove bind values for where clauses that were removedAaron Patterson2013-05-212-9/+18
| | | |
| * | | push partitioning up so bind elimination can get the removed wheresAaron Patterson2013-05-211-5/+3
| | | |
| * | | push partion logic down and initialization logic upAaron Patterson2013-05-211-15/+11
| | | |
| * | | partition the where values so we can access the removed onesAaron Patterson2013-05-201-1/+6
| |/ /
* | | Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_configRafael Mendonça França2013-05-211-1/+1
|\ \ \ | | | | | | | | the rake task `db:test:prepare` needs to load the configuration
| * | | the rake task `db:test:prepare` needs to load the configurationYves Senn2013-05-211-1/+1
| |/ / | | | | | | | | | Without loading the configuration the task will not perform any work.
* / / In batches test @total was assigned but not used. Use it in tests instead of ↵Alexander Balashov2013-05-211-7/+5
|/ / | | | | | | Post.count
* | eliminate some conditionalsAaron Patterson2013-05-201-3/+3
| |