aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-091-16/+17
|
* Merge pull request #9630 from robertjwhitney/update_collection_docsCarlos Antonio da Silva2013-03-091-2/+2
|\ | | | | Update documentation for collection<< to reflect behavior for new parent objects.
| * Update documentation for collection<< to reflect << on new records.Robert Whitney2013-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection<< does not automatically fire update sql unless the parent object is not a new record (and thus has a primary key). eg: p = Post.new p.comments << Comment.new does not call update sql until: p.save at which point it saves the parent object and then the collection object. changes that to the
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-101-1/+1
|\ \ | |/ |/|
| * TypppoAkira Matsuda2013-03-061-1/+1
| |
* | Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
| | | | | | | | | | During insertion of "# This migration comes from ... " comment at the beginning of a migration, presence of magic comment was not considered.
* | Refactored nested associations so they are more readable. Added commentswangjohn2013-03-081-26/+54
| | | | | | | | which make it clearer about what's going on.
* | Fix changelog indent, remove self from method call in changelog/doc examplesCarlos Antonio da Silva2013-03-082-4/+6
| | | | | | | | [ci skip]
* | The console --sandbox transaction should not be joinableJon Leighton2013-03-081-1/+2
| | | | | | | | Thanks @neerajdotname for noticing this bug.
* | Make sure options is a hashRafael Mendonça França2013-03-081-1/+3
| |
* | Avoid short-circuit returnRafael Mendonça França2013-03-081-5/+9
| |
* | Merge pull request #9497 from route/subclass_from_attrsRafael Mendonça França2013-03-084-2/+22
|\ \ | | | | | | | | | | | | | | | | | | Fix ActiveRecord `subclass_from_attrs` when eager_load is false. Conflicts: activerecord/CHANGELOG.md
| * | Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-064-2/+22
| | | | | | | | | | | | | | | It cannot find subclass because all classes are loaded automatically when it needs.
* | | Refactored test case with standard variable namingAnupam Choudhury2013-03-081-40/+40
| | |
* | | Fix rails console --sandboxJon Leighton2013-03-081-2/+2
| | | | | | | | | | | | | | | | | | I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515.
* | | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-083-0/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the index name explicitly provided in a migration when reverting. Fixes #8868 Conflicts: activerecord/CHANGELOG.md
| * | | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-073-0/+32
| | | | | | | | | | | | | | | | schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858. this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
* | | | Merge pull request #8966 from ↵Rafael Mendonça França2013-03-086-3/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfabianski/disable_prepared_statement_when_preparing_a_query Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md
| * | | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-086-3/+33
| |/ / /
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 07:57:23 +0000