aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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-312-16/+1
| | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68.
* | | Merge pull request #4805 from xuanxu/none_and_null_object_patternJon Leighton2012-01-316-1/+71
|\ \ \ | | | | | | | | Added `none` query method to return zero records.
| * | | Added `none` query method to return zero records.Juanjo Bazán2012-01-316-1/+71
| | | | | | | | | | | | 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 #4742 from petervandenabeele/masterAaron Patterson2012-01-311-0/+3
|\ \ \ \ | | | | | | | | | | Set the timezone correctly for a test in activerecord/../base_test.rb
| * | | | Set default_timezone explicitly for a test in activerecord/../base_test.rbPeter Vandenabeele2012-01-291-0/+3
| | | | |
* | | | | Merge pull request #4746 from jenslukowski/issue4718Aaron Patterson2012-01-312-1/+16
|\ \ \ \ \ | |_|/ / / |/| | | | Test and fix for issue 4718
| * | | | fix for Issue 4718Jens Lukowski2012-01-291-1/+8
| | | | |
| * | | | failing test case for Issue 4718Jens Lukowski2012-01-281-0/+8
| |/ / /
* | | | Merge pull request #4791 from gregolsen/reflection_test_fixedJosé Valim2012-01-313-4/+4
|\ \ \ \ | | | | | | | | | | reflection test fixed
| * | | | test_get_ids_for_ordered_association fixedgregolsen2012-01-312-2/+2
| | | | |
| * | | | reflection test fixedgregolsen2012-01-311-2/+2
| | |/ / | |/| |
* | | | Remove deprecation warnings from testsRafael Mendonça França2012-01-313-13/+28
| | | |
* | | | 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-313-1/+6
|\ \ \ | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
| * | | ids_reader method fixed, test added to has_many associationgregolsen2012-01-313-1/+6
| | | |
* | | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_errorJon Leighton2012-01-319-35/+147
|\ \ \ \ | | | | | | | | | | has_many/has_one, :dependent => :restrict, deprecation added
| * | | | suggested fixes for :dependent => :restrict deprecation.Manoj2012-01-315-36/+16
| | | | |
| * | | | Same method for has_many and has_one associationsPaco Guzman2012-01-313-30/+17
| | | | |
| * | | | Easy dependent_restrict error messagePaco Guzman2012-01-312-4/+2
| | | | |
| * | | | has_many/has_one, :dependent => :restrict, deprecation added.Manoj2012-01-299-21/+168
| | |/ / | |/| |
* | | | warning removed: shadowing outer local variable - klassArun Agrawal2012-01-311-2/+2
| |/ / |/| |
* | | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|\ \ \ | | | | | | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
| * | | Fix GH #4754. Remove double-quote when using ANSI_QUOTESkennyj2012-01-312-1/+17
| | | |
* | | | Merge pull request #4732 from pwim/refactor-dynamic-matchJon Leighton2012-01-303-28/+60
|\ \ \ \ | | | | | | | | | | Refactor dynamic match
| * | | | Use conditional instead of tryPaul McMahon2012-01-311-1/+1
| | | | |
| * | | | Decouple finding matching class from instantiationPaul McMahon2012-01-291-22/+29
| | | | |
| * | | | Move argument validation into matchPaul McMahon2012-01-283-1/+13
| | | | |
| * | | | Extract different DynamicFinderMatch subclassesPaul McMahon2012-01-281-26/+39
| | |/ / | |/| |
* | | | query cache instrumentation should included the bindings in the payload ↵Xavier Noria2012-01-301-1/+1
| | | | | | | | | | | | | | | | [closes #4750]
* | | | rewrites a couple of alternations in regexps as character classesXavier Noria2012-01-301-1/+1
| |/ / |/| | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters.
* | | Use block form of 'File.open' so that File object is auto closed at endNathan Broadbent2012-01-301-7/+7
| | |
* | | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-304-6/+6
| | |
* | | Remove initialize variable columnn, not neededPaco Guzman2012-01-291-2/+1
|/ /
* | Add `create_join_table` migration helper to create HABTM join tablesRafael Mendonça França2012-01-277-5/+164
| |
* | Fix regression from Rails 3.1Paul McMahon2012-01-272-1/+12
| | | | | | | | | | | | Under Rails 3.1, you were allowed to pass a hash to a find_or_create method with multiple attribute names, but this was broken as the arguments were being improperly validated.
* | Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
| | | | | | | | Remove extra attributes from HABTM join tables in AR tests
* | Fixed small typo in ActveRecord/CHANGELOG.mdMatt Bridges2012-01-261-1/+1
| |
* | syncs 3-2-stable CHANGELOGs in masterXavier Noria2012-01-261-0/+9
| |
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-262-1/+17
| |
* | Add release date of Rails 3.2.0 to documentationclaudiob2012-01-261-1/+1
| |
* | fix fixtures test as table_name is a string nowSergey Nartimov2012-01-261-2/+2
| |
* | call to_s on value passed to table_name=Sergey Nartimov2012-01-262-1/+6
| |
* | The primary key is always initialized in the @attributes hash to nil (unlessAaron Patterson2012-01-255-7/+12
|/ | | | another value has been specified).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:48:51 +0000