aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken proc syntax for 1.9.3Arthur Neves2014-05-091-1/+1
|
* Documentation, add examples of using an Enum scopeZac2014-05-091-2/+4
| | | When scanning the Enum API page I found it easy to miss that scopes are generated. Adding an example clarifies use and has more... *pop*...
* test, regression test for has_many with instance dependent scope.Yves Senn2014-05-092-0/+12
|
* Reverts "Fix bugs with changed attributes tracking when transaction gets ↵Arthur Neves2014-05-093-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | rollback" We are reverting these commits, because there are other caveats related to dirty attributes not being restored when a transaction is rollback. For instance, nested transactions cannot proper restore the dirty attributes state after a rollback. At the moment, the dirty attributes are scoped by the transaction. When we call `.save` on a record, the dirty attributes will be reset even if the transaction gets rollback. [related #13166] [related #15018] [related #15016] [closes #15019] This reverts commits * bab48f0a3d53a08bc23ea0887219e8deb963c3d9 * b0fa7cf3ff8432cc2eef3682b34763b7f8c93cc8. * 73fb39b6faa9de593ae75ad4e3b8e065ea0e53af * 37c238927fbed059de3f26a90d8923fb377568a5. * 8d8d4f1560264cd1c74364d67fa0501f6dd2c4fa Revert "Merge pull request #13166 from bogdan/transaction-magic"
* set a constant for the "anonymous" habtm model fixes #15022Aaron Patterson2014-05-082-0/+11
| | | | | I wanted the middle model to be anonymous, but we have to give it a name for marshal support. :'(
* test, regression test for unparsable PostgreSQL defaults.Yves Senn2014-05-081-0/+17
| | | | | This test was inspired by #14866. That PR would break this functionality and we should make sure we notice that in the future.
* Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fixCarlos Antonio da Silva2014-05-084-1/+30
|\ | | | | Habtm relation size calculation fix. Fixes #14913, Fixes #14914.
| * Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-084-1/+30
| | | | | | | | | | HABTM should fall back to using the normal CollectionAssociation's size calculation if the collection is not cached or loaded. This addresses both #14913 and #14914 for master.
* | test, reset changed state in PG's uuid tests.Yves Senn2014-05-081-2/+4
|/ | | | | | | | | | | | | This resulted in some unrelated errors on Traivs: 1) Error: PostgresqlUUIDTest#test_treat_blank_uuid_as_nil: ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR: column "thingy" of relation "uuid_data_type" does not exist LINE 1: INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNIN... ^ : INSERT INTO "uuid_data_type" ("thingy") VALUES ($1) RETURNING "id" /cc @zuhao
* Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|
* Add CHANGELOG entry for #14989Rafael Mendonça França2014-05-071-0/+5
| | | | Closes #14989
* Return a non zero code when db has never been setup on statusPaul B2014-05-071-2/+1
|
* Keep track of dirty attrs after after rollback.Arthur Neves2014-05-074-20/+11
| | | | [related #13166]
* Merge pull request #13166 from bogdan/transaction-magicRafael Mendonça França2014-05-073-1/+62
|\ | | | | | | [Regression 3.2 -> 4.0] Fix bugs with changed attributes tracking when transaction gets rollback
| * Fix bugs with changed attributes tracking when transaction gets rollbackBogdan Gusiev2013-12-043-1/+62
| |
* | test, persist inherited class with different table name. Refs #14971.Yves Senn2014-05-071-0/+14
| | | | | | | | | | This case prevents against regressions. The change was suggested in a recent PR but the all our tests passed.
* | Follow-up to #14990 [ci skip]Jon Atack2014-05-071-10/+9
| | | | | | | | | | | | | | | | Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip]
* | Merge pull request #14982 from eric-chahin/GBV_refactorRafael Mendonça França2014-05-062-8/+6
|\ \ | | | | | | Refactored AssociationScope#get_bind_values
| * | Refactor AssociationScope#get_bind_valuesEric Chahin2014-05-052-8/+6
| | | | | | | | | | | | Added #join_id_for(owner) to reflection to avoid accessing the source_macro
* | | Fixed grammarFred Wu2014-05-061-1/+1
| | |
* | | refactor and clean up delete_all methodeileencodes2014-05-051-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly.
* | | Add support for module-level table_suffix in modelsJenner LaFave2014-05-054-1/+63
|/ / | | | | | | | | This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec.
* | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2014-05-051-3/+3
| |
* | Merge pull request #14978 from bogdan/relation-joinRafael Mendonça França2014-05-055-2/+17
|\ \ | | | | | | | | | [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
| * | Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-055-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
* | | Get rid of unused method in AR Post test modelCarlos Antonio da Silva2014-05-051-4/+0
|/ /
* | Arel master is 6.0.0Rafael Mendonça França2014-05-051-1/+1
| |
* | Invert the if/else clauseRafael Mendonça França2014-05-041-1/+1
| | | | | | | | The case where the value is present is more common
* | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exceptionRafael Mendonça França2014-05-043-1/+20
|\ \ | | | | | | | | | | | | | | | | | | Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md
| * | Fix exception when logging SQL w/ nil binary value.James Coleman2014-05-023-1/+20
| | |
* | | Convert column name to string only onceKuldeep Aggarwal2014-05-041-1/+2
| | |
* | | Use the reader attribute rather than the instance var when possibleCarlos Antonio da Silva2014-05-041-2/+2
| | |
* | | Simplify building options hash in rename column method for mysqlCarlos Antonio da Silva2014-05-041-5/+6
| | |
* | | Get rid of conditional since column_for handles raising nowCarlos Antonio da Silva2014-05-041-7/+4
| | | | | | | | | | | | | | | column_for will raise in case column is not found for the given table, so there is no need to handle that here.
* | | Simplify unless conditional with ORCarlos Antonio da Silva2014-05-041-4/+2
| | |
* | | Convert column name to string only onceCarlos Antonio da Silva2014-05-041-1/+2
| | |
* | | refactor, move `column_for` to `AbstractAdapter` for better reuse.Yves Senn2014-05-044-17/+11
| | |
* | | Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"Yves Senn2014-05-031-107/+95
| | | | | | | | | | | | | | | This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502.
* | | Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-031-95/+107
|\ \ \ | | | | | | | | Reorganize ActiveRecord's rake tasks
| * | | Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]Arun Agrawal2014-05-031-95/+107
| | | |
* | | | Remove duplicated fixture additionCarlos Antonio da Silva2014-05-031-1/+1
| | | |
* | | | Refactor test to not care about the specific result of valid?Carlos Antonio da Silva2014-05-031-3/+4
|/ / / | | | | | | | | | | | | | | | Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that.
* | | Merge pull request #14952 from gregmolnar/schema_loadYves Senn2014-05-031-1/+1
|\ \ \ | | | | | | | | make `db:structure:load` listed with `rake -T`
| * | | make `db:structure:load` listed with `rake -T`Greg Molnar2014-05-021-1/+1
| | | |
* | | | docs, restructure newly added part to `includes`. [ci skip]Yves Senn2014-05-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #14139. /cc @carlosantoniodasilva
* | | | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-035-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | Fixed custom validation context bug for child associations
| * | | | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]
* | | | | Test typecasting on instance rather than class itselfAkshay Vishnoi2014-05-031-1/+1
| | | | |
* | | | | Add missing require to fix test :bomb:Carlos Antonio da Silva2014-05-021-0/+1
| | | | |
* | | | | Move dup destroyed test to specific file that tests dup logicCarlos Antonio da Silva2014-05-022-9/+10
| |/ / / |/| | | | | | | | | | | | | | | Also change other related test to use existing record rather than creating new one.