aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-052-2/+2
|\ \ | |/ |/|
| * Fix typoCarson McDonald2013-03-051-1/+1
| |
| * Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
| |
* | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-051-1/+5
| |
* | `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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`.
* | 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-041-3/+3
| |
* | Merge pull request #9200 from wangjohn/unscoping_activerecord_mergingJeremy Kemper2013-03-031-0/+94
|\ \ | | | | | | Introduce relation #unscope
| * | Created an unscope method for removing relations from a chain ofwangjohn2013-03-031-0/+94
| | | | | | | | | | | | | | | 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-021-4/+1
|\ \ \ | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
| * | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::TimeTroy Kruthoff2013-03-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|/ / /
* | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-011-0/+2
| | |
* | | Support PostgreSQL specific column types when using `change_table`.Yves Senn2013-02-282-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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-273-13/+4
|/ / | | | | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97.
* | Merge pull request #9218 from Fivell/masterCarlos Antonio da Silva2013-02-271-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-1/+2
| | | | | | | | | | | | exception
* | | Fix default output for postgres network address typesErik Peterson2013-02-261-0/+11
| | |
* | | Fix touching an invalid parent record for belongs_toOlek Janiszewski2013-02-261-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-262-2/+2
|\ \
| * | Typo fixCarson McDonald2013-02-251-1/+1
| | |
| * | BELONGS TO ASSOCIATION | Typo fixlibin2013-02-251-1/+1
| | |
* | | Merge pull request #9414 from senny/9275_order_with_symbol_and_joinRafael Mendonça França2013-02-261-0/+5
|\ \ \ | | | | | | | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG.
| * | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG.Yves Senn2013-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9275. When `#order` is called with a Symbol this patch will prepend the quoted_table_name. Before the postgresql adapter failed to build queries containg a join and an order with a symbol. This expansion happens for all adapters.
* | | | No need to send public methodsAkira Matsuda2013-02-263-3/+3
| | | |
* | | | removes redundant requireXavier Noria2013-02-251-2/+0
| | | | | | | | | | | | | | | | It turns out this file is required in active_record.rb.
* | | | AR loads activerecord-deprecated_finders, no need to add it to the GemfileXavier Noria2013-02-251-0/+2
| | | |
* | | | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-261-1/+0
| | | |
* | | | Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-251-1/+1
| | | |
* | | | Merge pull request #9409 from wangjohn/adding_documentation_to_touchCarlos Antonio da Silva2013-02-251-0/+7
|\ \ \ \ | |/ / / |/| | | Added documentation to touch throwing an error
| * | | Added documentation about how touch now throws an error when one trieswangjohn2013-02-251-0/+7
| | | | | | | | | | | | | | | | to use it on an unpersisted object.
* | | | Merge pull request #9246 from Noemj/update_prepared_statementsAaron Patterson2013-02-241-3/+12
|\ \ \ \ | |/ / / |/| | | Changed update to use prepared statements
| * | | Changed update_record to use prepared statements.Noemj2013-02-111-3/+12
| | | |
* | | | Raising an ActiveRecordError when one tries to use .touch(name) on a newwangjohn2013-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | object that has not yet been persisted. This behavior follows the precedent set by update_columns.
* | | | Make explicit the method will raise an exceptionRafael Mendonça França2013-02-241-10/+10
| | | | | | | | | | | | | | | | Taking the wise advice of @carlosantoniodasilva
* | | | don't apply invalid ordering when preloading hmt associations.Yves Senn2013-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #8663. When preloading a hmt association there two possible scenarios: 1.) preload with 2 queries: first hm association, then hmt with id IN () 2.) preload with join: hmt association is loaded with a join on the hm association The bug was happening in scenario 1.) with a normal order clause on the hmt association. The ordering was also applied when loading the hm association, which resulted in the error. This patch only applies the ordering the the hm-relation if we are performing a join (2). Otherwise the order will only appear in the second query (1).
* | | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_secondsXavier Noria2013-02-245-87/+26
|\ \ \ \ | | | | | | | | | | remove config.auto_explain_threshold_in_seconds
| * | | | remove AR auto-explain (config.auto_explain_threshold_in_seconds)Yves Senn2013-02-245-87/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection.
* | | | | Updated doc to clarify about update_all and delete_allNeeraj Singh2013-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete_all will call callbacks if depdent option is specified as :destroy. This behavior is not very clear from the documetation and hence issue #7832 was raised. closes #7832
* | | | | Do not type cast all the database url values.Rafael Mendonça França2013-02-246-32/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | We should only type cast when we need to use. Related to 4b005fb371c2e7af80df7da63be94509b1db038c
* | | | Merge pull request #9356 from senny/988_multiple_actions_for_after_commitSteve Klabnik2013-02-241-14/+17
|\ \ \ \ | | | | | | | | | | multiple actions for :on option with `after_commit` and `after_rollback`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:38:24 +0000