aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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).
* | 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-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-32/+64
| |
* | 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-233-8/+6
|\ \ | | | | | | Don't type-cast unknown types to YAML.
| * | Don't type-cast unknown types to YAML.Stephen Celis2012-01-203-8/+6
| | |
* | | 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
| | | |
* | | | Fix typoJari Jokinen2012-01-221-1/+1
| | | |
* | | | change AR default_timezone to :utc since it's the default for AR::RailtieAkira Matsuda2012-01-212-5/+5
| | | |
* | | | 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-203-3/+11
| | | | | | | | | | | | 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
| |
* | adding tests for previous_changes hashAaron Patterson2012-01-191-0/+25
| |
* | just use an alias. The target method is public, so make this one publicAaron Patterson2012-01-191-4/+1
| | | | | | | | too.
* | avoid useless is_a checksAaron Patterson2012-01-191-8/+8
| |
* | Merge pull request #4531 from exviva/pessimistic_with_lockAaron Patterson2012-01-193-1/+70
|\ \ | | | | | | Add ActiveRecord::Base#with_lock
| * | Add ActiveRecord::Base#with_lockOlek Janiszewski2012-01-183-1/+70
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `with_lock` method to ActiveRecord objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to `lock!`. Before: class Order < ActiveRecord::Base def cancel! transaction do lock! # ... cancelling logic end end end After: class Order < ActiveRecord::Base def cancel! with_lock do # ... cancelling logic end end end
* / select doesn't take multiple arguments - fixes #4539 [ci skip]Vijay Dev2012-01-191-5/+5
|/ | | | | Also, fixed the bit about returning AM::MissingAttributeError. This seems to be fixed earlier in 3-2-stable only.
* Merge pull request #4487 from sarenji/fix-reset-countersAaron Patterson2012-01-177-3/+45
|\ | | | | Fix bug where reset_counters resets the wrong counter cache.
| * Fix bug where reset_counters resets the wrong counter cache.David Peter2012-01-167-3/+45
| | | | | | | | | | | | | | | | If a model belongs_to two associations with the same class, then reset_counters will reset the wrong counter cache. Finding the right reflection should use the foreign_key instead, which should be unique.
* | disable transactions for this testAaron Patterson2012-01-171-1/+4
| |