Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9565 from kennyj/remove_unused_return_value | Xavier Noria | 2013-03-05 | 3 | -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 ↵ | kennyj | 2013-03-06 | 3 | -5/+4 |
| | | | | | | | | public API. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-05 | 3 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Fix typo | Carson McDonald | 2013-03-05 | 1 | -1/+1 |
| | | |||||
| * | Fix WhereChain docs to mention only not | Ernie Miller | 2013-03-04 | 1 | -1/+1 |
| | | |||||
| * | change log4r link to most recent, updated location | Mike Munroe | 2013-02-28 | 1 | -1/+1 |
| | | |||||
* | | assigning '0.0' to a nullable numeric column does not make it dirty | Yves Senn | 2013-03-05 | 3 | -1/+32 |
| | | |||||
* | | `ActiveRecord::Base.include_root_in_json` is `false` by default. | Yves Senn | 2013-03-04 | 2 | -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 Senn | 2013-03-04 | 1 | -33/+55 |
| | | |||||
* | | Fixed typo in active record's changelog | Dimko | 2013-03-04 | 1 | -3/+3 |
| | | |||||
* | | Remove .all usage from unscope doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 1 | -4/+4 |
| | | |||||
* | | Use 1.9 hash style in changelog and doc examples [ci skip] | Carlos Antonio da Silva | 2013-03-04 | 2 | -6/+6 |
| | | |||||
* | | Merge pull request #9200 from wangjohn/unscoping_activerecord_merging | Jeremy Kemper | 2013-03-03 | 3 | -0/+254 |
|\ \ | | | | | | | Introduce relation #unscope | ||||
| * | | Created an unscope method for removing relations from a chain of | wangjohn | 2013-03-03 | 3 | -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-example | Carlos Antonio da Silva | 2013-03-03 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | In example fix sql that is generated from scoping | ||||
| * | | fix the sql that is generated from scoping | Neeraj Singh | 2013-03-03 | 1 | -1/+2 |
| | | | |||||
* | | | Remove hard coded references to Active Record in railties | José Valim | 2013-03-02 | 3 | -4/+4 |
| | | | |||||
* | | | Merge pull request #9431 from troyk/patch-2 | Andrew White | 2013-03-02 | 3 | -4/+8 |
|\ \ \ | | | | | | | | | | | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time | ||||
| * | | | Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time | Troy Kruthoff | 2013-03-01 | 3 | -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 Senn | 2013-03-01 | 3 | -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 documentation | Yves Senn | 2013-03-01 | 1 | -4/+4 |
|/ / / | |||||
* | | | Support creating a table migration generator | Sammy Larbi | 2013-03-01 | 4 | -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 entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Wrong exception is occured when raising no translatable exception | kennyj | 2013-03-01 | 3 | -0/+13 |
| | | | |||||
* | | | Support PostgreSQL specific column types when using `change_table`. | Yves Senn | 2013-02-28 | 5 | -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 Senn | 2013-02-28 | 1 | -3/+3 |
| | | | |||||
* | | | Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric" | Steve Klabnik | 2013-02-27 | 8 | -50/+18 |
|/ / | | | | | | | | | This reverts commit 408227d9c5ed7de26310d72a1a99c1ee02311c63, reversing changes made to dca0b57d03deffc933763482e615c3cf0b9a1d97. | ||||
* | | Merge pull request #9218 from Fivell/master | Carlos Antonio da Silva | 2013-02-27 | 2 | -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 ↵ | Igor | 2013-02-27 | 2 | -1/+10 |
| | | | | | | | | | | | | exception | ||||
* | | | Fix default output for postgres network address types | Erik Peterson | 2013-02-26 | 3 | -9/+20 |
| | | | |||||
* | | | Fix touching an invalid parent record for belongs_to | Olek Janiszewski | 2013-02-26 | 3 | -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 CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -5/+12 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-26 | 3 | -3/+3 |
|\ \ | |||||
| * | | Typo fix | Carson McDonald | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | BELONGS TO ASSOCIATION | Typo fix | libin | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
| * | | Corrected link anchor and added colons for continuity | Doug Yun | 2013-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9414 from senny/9275_order_with_symbol_and_join | Rafael Mendonça França | 2013-02-26 | 4 | -2/+34 |
|\ \ \ | | | | | | | | | 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 Senn | 2013-02-25 | 4 | -3/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 methods | Akira Matsuda | 2013-02-26 | 3 | -3/+3 |
| | | | | |||||
* | | | | Are was release | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | removes redundant require | Xavier Noria | 2013-02-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | It turns out this file is required in active_record.rb. | ||||
* | | | | typo | Xavier Noria | 2013-02-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | AR loads activerecord-deprecated_finders, no need to add it to the Gemfile | Xavier Noria | 2013-02-25 | 2 | -6/+7 |
| | | | | |||||
* | | | | New CHANGELOG entries always on top [ci skip] | Rafael Mendonça França | 2013-02-25 | 1 | -4/+4 |
| | | | | |||||
* | | | | Do not override attributes on `dup` by default scopes | Hiroshige Umino | 2013-02-26 | 3 | -1/+13 |
| | | | | |||||
* | | | | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 |
| | | | | |||||
* | | | | :scissors: | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | some minor AR changelog modifications [ci skip] | Yves Senn | 2013-02-25 | 1 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #9409 from wangjohn/adding_documentation_to_touch | Carlos Antonio da Silva | 2013-02-25 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | Added documentation to touch throwing an error | ||||
| * | | | Added documentation about how touch now throws an error when one tries | wangjohn | 2013-02-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | to use it on an unpersisted object. |