aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of https://github.com/lifo/docrailsPablo Ifran2012-10-2252-260/+729
| |\ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/callbacks.rb
| | * read_attribute is public [ci skip]Francesco Rodriguez2012-10-211-1/+1
| | |
| | * add docs to AR::AttributeMethods::BeforeTypeCast [ci skip]Francesco Rodriguez2012-10-211-0/+23
| | |
| | * improve AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-6/+10
| | |
| | * fix typo and improve example [ci skip]Francesco Rodriguez2012-10-211-1/+3
| | |
| | * update AR::AttributeMethods::BeforeTypeCast docs [ci skip]Francesco Rodriguez2012-10-211-0/+18
| | |
| | * Fix AR::AttributeMethods#[] example [ci skip]Francesco Rodriguez2012-10-211-1/+1
| | |
| | * nodoc deprecated AR::Fixtures constant [ci skip]Francesco Rodriguez2012-10-211-0/+1
| | |
| * | Changeing some code-styles of the examples & fix a typo on dependent optionPablo Ifran2012-10-221-18/+12
| | |
* | | Fix issue with collection associations and first(n)/last(n)Carlos Antonio da Silva2012-11-012-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094. Squashed cherry-pick from d37d40b and c368b66. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/collection_association.rb
* | | Revert "Don't allocate new strings in compiled attribute methods"David Heinemeier Hansson2012-10-312-39/+20
| | | | | | | | | | | | This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89.
* | | Remove extre count, preheat already happens during setupCarlos Antonio da Silva2012-10-311-1/+0
| | |
* | | Fix find_in_batches against string IDs when start option is not specified.Alexis Bernard2012-10-313-2/+15
| | |
* | | Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-10-313-3/+27
| | | | | | | | | | | | Public method `attributes_before_type_cast` used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like `read_attribute_before_type_cast` and returns unserialised values.
* | | Fix #6951. Use query cache/uncache, when using not only database.yml but ↵kennyj2012-10-313-6/+22
| | | | | | | | | | | | also DATABASE_URL.
* | | include_root_in_json allows inheritance.kennyj2012-10-312-1/+16
| | |
* | | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-309-14/+12
| | |
* | | Remove not assigned variable warning from sqlite3 adapter testCarlos Antonio da Silva2012-10-291-1/+1
| | |
* | | Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-292-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067. Conflicts: activerecord/CHANGELOG.md
* | | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-299-17/+21
| | | | | | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
* | | Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
| | | | | | | | | | | | Checking for the constant doesn't work
* | | SQLite3Adapter#type_cast should not mutate argumentsStefan Rusterholz2012-10-282-1/+7
| | |
* | | ActiveRecord::Relation#none! method.Juanjo Bazán2012-10-283-0/+16
| | |
* | | loaded relations cannot be mutated by extending!Juanjo Bazán2012-10-281-0/+9
| | |
* | | Enable update_column(s) for the primary key attribute.Henrik N2012-10-283-1/+20
| | | | | | | | | | | | Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record.
* | | raise `ArgumentError` when redefining the primary key column. Closes #6378Yves Senn2012-10-283-0/+34
| | |
* | | refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378Yves Senn2012-10-282-6/+11
| | |
* | | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes.Francesco Rodriguez2012-10-283-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following behaviour: class Person < ActiveRecord::Base belongs_to :company end # Before: person = Person.select('id').first person[:name] # => nil person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => nil person.company # => nil # After: person = Person.select('id').first person[:name] # => ActiveModel::MissingAttributeError: missing_attribute: name person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id person.company # => ActiveModel::MissingAttributeError: missing_attribute: company_id Fixes #5433.
* | | Don't log on pending migration check schneems2012-10-281-1/+3
| | | | | | | | | | | | | | | Conversation from: #6665 cc/ @rafaelfranca
* | | Use the MySQL varbinary type when appropriate in migrations.Victor Costan2012-10-277-18/+71
| | |
* | | Decode attributes pulled from URI.parseShawn Veader2012-10-263-1/+15
| | | | | | | | | | | | | | | | | | | | | The RFC indicates that username and passwords may be encoded. http://tools.ietf.org/html/rfc2396#section-3.2.2 Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded.
* | | remove unused config optionJon Leighton2012-10-261-3/+0
| | |
* | | Remove ActiveRecord::ModelJon Leighton2012-10-2640-642/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the end I think the pain of implementing this seamlessly was not worth the gain provided. The intention was that it would allow plain ruby objects that might not live in your main application to be subclassed and have persistence mixed in. But I've decided that the benefit of doing that is not worth the amount of complexity that the implementation introduced.
* | | Fix incorrect markdown by removing extra space.Uģis Ozols2012-10-241-1/+1
| | |
* | | frozen state should be restored after txn is abortedAaron Patterson2012-10-222-2/+18
| | |
* | | Add tests to make sure that the I18n taken message can be overrided in theRafael Mendonça França2012-10-221-0/+14
| |/ |/| | | | | | | | | activerecord scope. Related with 5341b84936d93ec90e6252af437a3871101c115a
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-216-33/+170
|\ \ | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * | copy edits [ci skip]Vijay Dev2012-10-211-14/+7
| | |
| * | update AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-23/+124
| | |
| * | nodoc AR::Generators [ci skip]Francesco Rodriguez2012-10-204-10/+10
| |/
| * ActiveRecord Callbacks ordering examplesPablo Ifran2012-10-191-0/+43
| |
* | Rotate the debug.log on each 100MBRafael Mendonça França2012-10-201-1/+1
| |
* | Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."Jeremy Kemper2012-10-2015-28/+88
| | | | | | | | This reverts commit 83846838252397b3781eed165ca301e05db39293.
* | Merge pull request #7951 from Grandrath/patch-1Carlos Antonio da Silva2012-10-201-1/+1
|\ \ | | | | | | | | | Use `Rails.env` instead of `ENV['RAILS_ENV']`. Fix behavior of `rake db:structure:load`.
| * | Don't use test environment by default when running rake db:structure:load; #7951Martin Grandrath2012-10-181-1/+1
| | | | | | | | | | | | | | | `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`.
* | | Merge pull request #7995 from adimichele/masterRafael Mendonça França2012-10-192-1/+10
|\ \ \ | | | | | | | | Small change to active_record/locale/en.yml
| * | | Changed scope for "taken" error message translation to decrease precedenceAndrew DiMichele2012-10-192-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden. Test that the translation for 'taken' can be overridden
* | | | Revert "truncate debug.log on each test run"Yasuo Honda2012-10-201-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98043c689f945cabffc043f4bdc80ab2a7edc763. Because if every time `debug.log` is truncated, developers have no way to see the previous ActiveRecord unit test results. `debug.log` file can be easily reduced by executing `$ touch /dev/null > debug.log` periodically.
* | | Merge pull request #7994 from frodsan/truncate_debug_logRafael Mendonça França2012-10-191-1/+2
|\ \ \ | | | | | | | | truncate debug.log on each test run
| * | | truncate debug.log on each test runFrancesco Rodriguez2012-10-191-1/+2
| | | |