aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add support for generate scaffold password:digestSam Ruby2013-03-132-1/+8
| | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture
* Also quote extension name in disable_extensionStephen Touset2013-03-121-1/+1
| | | A patch was committed recently which quoted the extension name in the SQL for `enable_extension`. But the same wasn't done for `disable_extension`.
* Merge pull request #9676 from neerajdotname/9567-destroy-should-call-destroy-allRafael Mendonça França2013-03-121-2/+3
|\ | | | | dependent: :destroy should call destroy_all
| * dependent: :destroy should call destroy_allNeeraj Singh2013-03-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit https://github.com/rails/rails/pull/9668 shows warning when `delete_all` is invoked with `:dependent` option `:destroy`. Unfortunately invoking `Post.destroy_all` invokes `post.comments.delete_all` as part of `has_many` callbacks. This commit ensures that instead `post.comments.destroy_all` is invoked and in the process no warning is generated. See issue #9567 for details .
* | Pass column to quote when copying a sqlite table.Matthew M. Boedicker2013-03-111-1/+9
| | | | | | | | To make quote escape binary data correctly it needs the column passed in.
* | Fix typo [ci skip]Carlos Antonio da Silva2013-03-111-1/+1
|/
* promotes change_column_null to the migrations APIXavier Noria2013-03-111-0/+20
|
* quick pass over the RDoc of schema_statements.rb [ci skip]Xavier Noria2013-03-111-122/+190
|
* documents how to DROP DEFAULT [ci skip]Xavier Noria2013-03-111-3/+7
|
* Merge pull request #9668 from neerajdotname/9567-delete-all-warningXavier Noria2013-03-111-0/+9
|\ | | | | Show warning message if delete_all is firing callbacks
| * Show warning message if delete_all is firing callbacksNeeraj Singh2013-03-111-0/+9
| | | | | | | | | | | | `post.comments.delete_all` will fire callbacks if :dependent option is :destroy . It will be fixed in Rails 4.1 . In the meantime display a warning . Look at #9567 for details .
* | default the reaping frequency to 10 secondsAaron Patterson2013-03-111-1/+1
|/
* document habtm join-table name with custom prefix [ci skip].Yves Senn2013-03-101-0/+2
| | | | | | Closes #9643. The logic was introduced with 46492949
* Change uniq validation with conditions examples to use where with hashesCarlos Antonio da Silva2013-03-091-3/+3
| | | | Take the opportunity to showcase where.not.
* Merge pull request #9633 from senny/5321_make_it_lazyCarlos Antonio da Silva2013-03-091-3/+7
|\ | | | | | | | | | | Uniqueness validation uses a proc to specify the `:conditions` option. This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
| * Uniqueness validation uses a proc to specify the `:conditions` option.Yves Senn2013-03-091-3/+7
| | | | | | | | | | This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
* | Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-errorCarlos Antonio da Silva2013-03-091-1/+1
|\ \ | |/ |/| | | | | | | Bugfix for enable_extension in postgresql_adapter. The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp).
| * fixes enable_extension bug in postgresql_adapterDarren Woodley2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp). removes CHANGELOG entry Deemed unnecessary.
* | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-094-6/+7
| | | | | | | | | | This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals.
* | 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-091-3/+12
| |/ |/| | | | | | | 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-081-1/+2
| | | | | | | | [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-081-2/+3
|\ \ | | | | | | | | | | | | | | | | | | 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-061-2/+3
| | | | | | | | | | | | | | | It cannot find subclass because all classes are loaded automatically when it needs.
* | | 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-081-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+6
| | | | | | | | | | | | | | | | 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-084-3/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfabianski/disable_prepared_statement_when_preparing_a_query Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md
| * | | | Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-084-3/+14
| |/ / /
* | | | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip]
* | | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-081-3/+13
|\ \ \ \ | |/ / / |/| | | 7365 merging scopes for where clauses
| * | | Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-071-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-072-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cache_key consults updated_on timestamp if present Conflicts: activerecord/CHANGELOG.md
| * | | cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-262-1/+7
| | | | | | | | | | | | | | | | | | | | - 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-071-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More helpful error message when instantiating an abstract class Conflicts: activerecord/CHANGELOG.md
| * | | | More helpful error message when instantiating an abstract classAaron Weiner2013-03-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-7/+37
|\ \ \ \ \ | |_|_|/ / |/| | | | Transactions can be turned off per Migration
| * | | | transactions can be turned off per Migration.Yves Senn2013-03-051-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-052-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | 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-062-3/+3
| |/ / / | | | | | | | | | | | | public API.