aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_errorJon Leighton2012-01-316-21/+49
|\ \ \ | | | | | | | | has_many/has_one, :dependent => :restrict, deprecation added
| * | | suggested fixes for :dependent => :restrict deprecation.Manoj2012-01-313-4/+6
| | | |
| * | | 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-296-7/+48
| | |/ | |/|
* | | warning removed: shadowing outer local variable - klassArun Agrawal2012-01-311-2/+2
| |/ |/|
* | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-311-1/+1
|\ \ | | | | | | [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-311-1/+1
| | |
* | | 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.
* | 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-273-2/+69
|
* Fix regression from Rails 3.1Paul McMahon2012-01-271-1/+1
| | | | | | 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.
* disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-261-0/+2
|
* call to_s on value passed to table_name=Sergey Nartimov2012-01-261-1/+1
|
* The primary key is always initialized in the @attributes hash to nil (unlessAaron Patterson2012-01-252-5/+6
| | | | another value has been specified).
* use fetch rather than both Hash#key? and Hash#[]Aaron Patterson2012-01-251-49/+51
|
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-01-241-1/+1
| | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output.
* deprecated AR::TestCase in favor of AS::TestCaseAaron Patterson2012-01-241-0/+4
|
* Moving AR::TestCase in to the AR tests directoryAaron Patterson2012-01-241-31/+0
|
* Only show the type if column is presentRafael Mendonça França2012-01-231-1/+2
|
* Merge pull request #4558 from stephencelis/type-cast-unknown-should-failAaron Patterson2012-01-231-1/+1
|\ | | | | Don't type-cast unknown types to YAML.
| * Don't type-cast unknown types to YAML.Stephen Celis2012-01-201-1/+1
| |
* | Merge pull request #4563 from amatsuda/ar_relation_ppAaron Patterson2012-01-231-0/+4
|\ \ | | | | | | let AR::Relation pretty_printed like an Array
| * | let AR::Relation pretty_printed like an ArrayAkira Matsuda2012-01-211-0/+4
| | |
* | | Remove not used if..else clauseCarlos Antonio da Silva2012-01-231-6/+0
| | | | | | | | | | | | Related to #4614.
* | | Unused var removedArun Agrawal2012-01-231-1/+1
| | |
* | | change AR default_timezone to :utc since it's the default for AR::RailtieAkira Matsuda2012-01-211-3/+3
| | |
* | | pushed broadcasting down to a moduleAaron Patterson2012-01-201-2/+1
|/ /
* / restored logging to the log file and display on the consoleAaron Patterson2012-01-201-1/+3
|/
* Fix another race condition.Jon Leighton2012-01-202-3/+3
| | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up.
* Revert "just use an alias. The target method is public, so make this one ↵Aaron Patterson2012-01-201-1/+4
| | | | | | public" This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db.
* push ivar initialization down to a common methodAaron Patterson2012-01-191-16/+20
|
* just use an alias. The target method is public, so make this one publicAaron Patterson2012-01-191-4/+1
| | | | too.