aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-263-3/+3
|\ \
| * | Typo fixCarson McDonald2013-02-251-1/+1
| | |
| * | BELONGS TO ASSOCIATION | Typo fixlibin2013-02-251-1/+1
| | |
| * | Corrected link anchor and added colons for continuityDoug Yun2013-02-191-1/+1
| | |
* | | Merge pull request #9414 from senny/9275_order_with_symbol_and_joinRafael Mendonça França2013-02-264-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 Senn2013-02-254-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 methodsAkira Matsuda2013-02-263-3/+3
| | | |
* | | | Are was releaseRafael Mendonça França2013-02-251-1/+1
| | | |
* | | | removes redundant requireXavier Noria2013-02-251-2/+0
| | | | | | | | | | | | | | | | It turns out this file is required in active_record.rb.
* | | | typoXavier Noria2013-02-251-1/+1
| | | |
* | | | AR loads activerecord-deprecated_finders, no need to add it to the GemfileXavier Noria2013-02-252-6/+7
| | | |
* | | | New CHANGELOG entries always on top [ci skip]Rafael Mendonça França2013-02-251-4/+4
| | | |
* | | | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-263-1/+13
| | | |
* | | | Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-252-2/+2
| | | |
* | | | :scissors:Rafael Mendonça França2013-02-251-1/+1
| | | |
* | | | some minor AR changelog modifications [ci skip]Yves Senn2013-02-251-3/+7
| | | |
* | | | 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.