aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-082-3/+2
| | | | | | | Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip]
* Write a more comprehensive CHANGELOG message [ci skip]Jon Leighton2013-03-081-3/+45
|
* Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-083-6/+22
|\ | | | | 7365 merging scopes for where clauses
| * Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-073-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently Post.active.inactive will result in Post.inactive since the last where clause wins when scopes are merged. This pull request will merge all scopes ( barring defaul scope) using AND. The default scope will be overridden if another scope acts on the same where clause. closes #7365
* | SQLite3 3.6.8+ supports savepointsNeeraj Singh2013-03-071-1/+2
|/ | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132
* Merge pull request #9597 from senny/9110_serialized_not_null_defaultRafael Mendonça França2013-03-074-0/+13
|\ | | | | test case for `serialize` default values.
| * test case for `serialize` default values.Yves Senn2013-03-074-0/+13
| | | | | | | | Closes #9110
* | Merge pull request #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-075-3/+39
|\ \ | |/ |/| | | | | | | | | cache_key consults updated_on timestamp if present Conflicts: activerecord/CHANGELOG.md
| * cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-265-3/+39
| | | | | | | | | | - Extract max timestamp retrieval for cache_key - Update changelog for cache_key changes
* | Merge pull request #9474 from HonoreDB/masterRafael Mendonça França2013-03-073-0/+21
|\ \ | | | | | | | | | | | | | | | | | | More helpful error message when instantiating an abstract class Conflicts: activerecord/CHANGELOG.md
| * | More helpful error message when instantiating an abstract classAaron Weiner2013-03-033-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling a literal ActiveRecord::Base.new raises NoMethodError, since it ends up calling Class.abstract_class? which does not exist. Similarly, instantiating an actual abstract class hits the database, when conventionally it should immediately throw NotImplementedError. ActiveRecord::Base can't be made abstract without breaking many, many things, so check for it separately.
* | | Refactored and removed unnecessary lines in the test caseAnupam Choudhury2013-03-071-3/+3
| | |
* | | Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1aRafael Mendonça França2013-03-071-8/+0
| | | | | | | | | | | | | | | | | | It was added because a regression caused by a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca Closes #9255
* | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-063-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | Closes #9518. The rake task used to fail silently and left an empty `structure.sql`. It's confusing for users to get to the root of the problem. The warning message tells them where to look.
* | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-066-35/+2
| | | | | | | | | | | | | | | | | | | | | As of ccc6910c we use `mysqldump` to create the `structure.sql`. The old `#structure_dump` code is still in AR but never used. I removed all relevant parts from the code-base.
* | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-064-11/+92
|\ \ \ | | | | | | | | Transactions can be turned off per Migration
| * | | transactions can be turned off per Migration.Yves Senn2013-03-054-8/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9483. There are SQL Queries that can't run inside a transaction. Since the Migrator used to wrap all Migrations inside a transaction there was no way to run these queries within a migration. This patch adds `self.disable_ddl_transaction!` to the migration to turn transactions off when necessary.
| * | | transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | The cleanup commit a85625d broke the test-case. The schema was no longer modified so there was no way to check that the rollback actually happened.
* | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-053-5/+4
|\ \ \ \ | | | | | | | | | | Remove unused return value, because collecting_queries_for_explain isn't public API.
| * | | | Remove unused return value, because collecting_queries_for_explain isn't ↵kennyj2013-03-063-5/+4
| |/ / / | | | | | | | | | | | | public API.
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-053-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typoCarson McDonald2013-03-051-1/+1
| | | |
| * | | Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
| | | |
| * | | change log4r link to most recent, updated locationMike Munroe2013-02-281-1/+1
| | | |
* | | | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-053-1/+32
| | | |
* | | | `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-042-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9459. The PR #6597 unified the configuration for `include_root_in_json` in AM and AR to `false`. Later on with the refactoring commit: e030f26 the value in AR was set to `true` but I think this was not on purpose. With this commit both AM and AR will have the same configuration for `include_root_in_json`, which is `false`.
* | | | rewrite tests to have no side-effects on `include_root_in_json`.Yves Senn2013-03-041-33/+55
| | | |
* | | | Fixed typo in active record's changelogDimko2013-03-041-3/+3
| | | |
* | | | Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4
| | | |
* | | | Use 1.9 hash style in changelog and doc examples [ci skip]Carlos Antonio da Silva2013-03-042-6/+6
| | | |
* | | | Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-033-0/+254
|\ \ \ \ | | | | | | | | | | Introduce relation #unscope
| * | | | Created an unscope method for removing relations from a chain ofwangjohn2013-03-033-0/+254
| | |/ / | |/| | | | | | | | | | | | | | relations. Specific where values can be unscoped, and the unscope method still works when relations are merged or combined.
* | | | Merge pull request #9532 from neerajdotname/fix-sql-in-exampleCarlos Antonio da Silva2013-03-031-1/+2
|\ \ \ \ | |/ / / |/| | | In example fix sql that is generated from scoping
| * | | fix the sql that is generated from scopingNeeraj Singh2013-03-031-1/+2
| | | |
* | | | Remove hard coded references to Active Record in railtiesJosé Valim2013-03-023-4/+4
| | | |
* | | | Merge pull request #9431 from troyk/patch-2Andrew White2013-03-023-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
| * | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-013-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an AR model a timestamptz attribute would return a ruby string and AR tests did not check for any type casting. Previous tests would pass only because an assert_equal was being used on a Time.utc object, which will parse the right side of the eq to a valid Time instance for comparision. switch to test instance of Time instead of ActiveSupport::TimeWithZone
* | | | | deal with `#append` and `#prepend` on association collections.Yves Senn2013-03-013-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7364. Collection associations behave similar to Arrays. However there is no way to prepend records. And to append one should use `<<`. Before this patch `#append` and `#prepend` did not add the record to the loaded association. `#append` now behaves like `<<` and `#prepend` is not defined.
* | | | | don't use non-ascii ' chars in documentationYves Senn2013-03-011-4/+4
|/ / / /
* | | | Support creating a table migration generatorSammy Larbi2013-03-014-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes you want to create a table without an associated model and test, which is also not a join table. With this commit, you can now do that. Example: rails g migration create_posts title:string or rails g migration CreatePosts title:string This commit also moves the template the model generator uses for the migration to the migration templates folder, as it seems a more sensible place for it now that it is shared code.
* | | | Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-013-0/+13
| | | |
* | | | Support PostgreSQL specific column types when using `change_table`.Yves Senn2013-02-285-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9480. We use `TableDefinition` for `#create_table` and `Table` for `#change_table`. The PostgreSQL sepcifc types were only defined on `TableDefinition` so I also added them to `Table`.
* | | | update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-3/+3
| | | |
* | | | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric"Steve Klabnik2013-02-278-50/+18
|/ / / | | | | | | | | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97.
* | | Merge pull request #9218 from Fivell/masterCarlos Antonio da Silva2013-02-272-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calculation of db_runtime property in ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime. Previously, after raising ActionView::MissingTemplate, db_runtime was not populated. Closes #9218, Fixes #9215. Conflicts: activerecord/CHANGELOG.md
| * | | fix db_runtime attribute value after raising ActionView::MissingTemplate ↵Igor2013-02-272-1/+10
| | | | | | | | | | | | | | | | exception
* | | | Fix default output for postgres network address typesErik Peterson2013-02-263-9/+20
| | | |
* | | | Fix touching an invalid parent record for belongs_toOlek Janiszewski2013-02-263-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the parent of a `belongs_to` record fails to be saved due to validation errors, `touch` will be called on a new record, which causes an exception (see https://github.com/rails/rails/pull/9320). Example: class Owner < ActiveRecord::Base validates_presence_of :name end class Pet < ActiveRecord::Base belongs_to :owner, touch: true end pet = Pet.new(owner: Owner.new) # Before, this line would raise ActiveRecord::ActiveRecordError # "can not touch on a new record object" pet.save
* | | | Update CHANGELOGSRafael Mendonça França2013-02-261-5/+12
| |/ / |/| |