aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-092-3/+3
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| * Correcting ActiveRecord::Core#encode_with docsJosef Šimánek2012-02-071-1/+1
| |
| * use appropriate words for docs of Model.noneRohit Arondekar2012-02-071-2/+2
| |
| * minor tidy up of none relation query methodRohit Arondekar2012-02-061-2/+2
| |
| * Fix code example in ActiveRecord::Relation#noneCarlos Antonio da Silva2012-02-011-3/+3
| |
* | Refactored the OrderedHash related stuffRaghunadh2012-02-091-2/+1
| |
* | AR::Relation#pluck: improve to work with joinsBogdan Gusiev2012-02-081-0/+3
| |
* | Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-072-0/+10
| |
* | no need to check for this constantXavier Noria2012-02-071-1/+1
| |
* | Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
| |
* | adding a comment for myselfAaron Patterson2012-02-062-8/+9
| |
* | delegate attribute typecasting to the columnAaron Patterson2012-02-062-16/+17
| |
* | pg supports real booleans, so handle the case when `true` is returnedAaron Patterson2012-02-061-2/+5
| |
* | let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-031-1/+4
| |
* | prevents the database.yml template option from being passed to PGConnSean Kirby2012-02-061-1/+1
| |
* | allow mass-assign version attribute in AR::SchemaMigrationSergey Nartimov2012-02-061-0/+2
| |
* | Get ActiveRecord::TestCase back on its feet, despite deprecation. It ↵Jeremy Kemper2012-02-051-1/+61
| | | | | | | | requires SQLCounter which was moved to AR internal tests only.
* | Merge pull request #4856 from ihid/store_null_bugAaron Patterson2012-02-021-0/+2
|\ \ | | | | | | Allow store to be a not null column.
| * | Allow store to be a not null column.Jeremy Walker2012-02-021-0/+2
| | |
* | | *args is already an array. :'(Aaron Patterson2012-02-021-1/+1
| | |
* | | columns method doesn't have name argumentRafael Mendonça França2012-02-021-1/+1
| | |
* | | removed whitespace errors ↵Aaron Patterson2012-02-021-4/+4
| | | | | | | | | | | | :yellow_heart::blue_heart::purple_heart::heart::green_heart:
* | | Remove useless argument in #columns.Sebastian Martinez2012-02-025-6/+6
| | |
* | | use the class method to (un)escape binary valuesAaron Patterson2012-02-011-2/+2
| | |
* | | Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-011-2/+1
|\ \ \ | |/ / |/| | Don't instantiate two objects in collection proxy / find_or_instantiate_by
| * | Don't instantiate two objects in collection proxy / find_or_instantiator_byJonathan del Strother2012-01-191-2/+1
| | |
* | | Fix typoRafael Mendonça França2012-02-011-1/+1
| | |
* | | Use human attribute name to show the dependent destroy messageRafael Mendonça França2012-02-012-2/+3
| | |
* | | Merge pull request #4828 from railsaholic/fix_error_messageJosé Valim2012-02-012-2/+5
|\ \ \ | | | | | | | | fix has_one, has_many restrict error message
| * | | fix has_one, has_many restrict error messageManoj2012-02-012-2/+5
| | | |
* | | | Merge pull request #4806 from KL-7/do-not-serialize-nilAaron Patterson2012-02-011-1/+1
|\ \ \ \ | | | | | | | | | | Do not serialize nil in serialized attribute.
| * | | | Do not serialize nil in serialized attribute.Kirill Lashuk2012-01-311-1/+1
| | | | |
* | | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-011-16/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix for SQLite binary data corrupter (to master branch)
| * | | | Fixed issue with SQLite adapter corrupting binary dataChris Feist2012-01-311-16/+1
| | | | |
* | | | | document the AR none method [ci skip]Vijay Dev2012-02-011-7/+7
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-011-4/+6
|\ \ \ \
| * | | | Improve readonly examples and optimistic locking docsCarlos Antonio da Silva2012-01-311-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Relation#order can receive order attributes as different arguments, add example; * Readonly does not handle deletion of records, only modification; * locking_version column does not need to default to 0, Rails handles nil values; * Change references from "set_locking_column" to "self.locking_column".
* | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentationsAaron Patterson2012-01-311-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | warning removed: mismatched indentations
| * | | | warning removed: mismatched indentationsArun Agrawal2012-01-311-1/+1
| | | | |
* | | | | Revert "Merge pull request #4746 from jenslukowski/issue4718"Aaron Patterson2012-01-311-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68.
* | | | | Merge pull request #4805 from xuanxu/none_and_null_object_patternJon Leighton2012-01-314-1/+45
|\ \ \ \ \ | |_|_|/ / |/| | | | Added `none` query method to return zero records.
| * | | | Added `none` query method to return zero records.Juanjo Bazán2012-01-314-1/+45
| | | | | | | | | | | | | | | And added NullRelation class implementing the null object pattern for the `Relation` class.
* | | | | QueryCache will just dup an AR::Result, AR::Result can deep copyAaron Patterson2012-01-312-9/+21
| | | | |
* | | | | always return the result set from select_allAaron Patterson2012-01-312-2/+2
| | | | |
* | | | | made the result set object act more like an arrayAaron Patterson2012-01-315-4/+24
| | | | |
* | | | | Merge pull request #4746 from jenslukowski/issue4718Aaron Patterson2012-01-311-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | Test and fix for issue 4718
| * | | | fix for Issue 4718Jens Lukowski2012-01-291-1/+8
| | | | |
* | | | | Put spaces between the words at deprecation warningRafael Mendonça França2012-01-311-3/+3
| |/ / / |/| | |
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-311-1/+1
|\ \ \ \ | | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
| * | | | ids_reader method fixed, test added to has_many associationgregolsen2012-01-311-1/+1
| | | | |