Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | warning removed: shadowing outer local variable - klass | Arun Agrawal | 2012-01-31 | 1 | -2/+2 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #4763 from kennyj/fix_4754 | Jon Leighton | 2012-01-31 | 1 | -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_QUOTES | kennyj | 2012-01-31 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #4732 from pwim/refactor-dynamic-match | Jon Leighton | 2012-01-30 | 3 | -28/+60 | |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor dynamic match | |||||
| * | | | | | Use conditional instead of try | Paul McMahon | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Decouple finding matching class from instantiation | Paul McMahon | 2012-01-29 | 1 | -22/+29 | |
| | | | | | | ||||||
| * | | | | | Move argument validation into match | Paul McMahon | 2012-01-28 | 3 | -1/+13 | |
| | | | | | | ||||||
| * | | | | | Extract different DynamicFinderMatch subclasses | Paul McMahon | 2012-01-28 | 1 | -26/+39 | |
| | |/ / / | |/| | | | ||||||
* | | | | | query cache instrumentation should included the bindings in the payload ↵ | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | [closes #4750] | |||||
* | | | | | rewrites a couple of alternations in regexps as character classes | Xavier Noria | 2012-01-30 | 1 | -1/+1 | |
| |/ / / |/| | | | | | | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters. | |||||
* | | | | Remove initialize variable columnn, not needed | Paco Guzman | 2012-01-29 | 1 | -2/+1 | |
|/ / / | ||||||
* | | | Add `create_join_table` migration helper to create HABTM join tables | Rafael Mendonça França | 2012-01-27 | 3 | -2/+69 | |
| | | | ||||||
* | | | Fix regression from Rails 3.1 | Paul McMahon | 2012-01-27 | 1 | -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 Noria | 2012-01-26 | 1 | -0/+2 | |
| | | | ||||||
* | | | call to_s on value passed to table_name= | Sergey Nartimov | 2012-01-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | The primary key is always initialized in the @attributes hash to nil (unless | Aaron Patterson | 2012-01-25 | 2 | -5/+6 | |
|/ / | | | | | | | another value has been specified). | |||||
* | | use fetch rather than both Hash#key? and Hash#[] | Aaron Patterson | 2012-01-25 | 1 | -49/+51 | |
| | | ||||||
* | | Handle nil in add_index :length option in MySQL | Paul Sadauskas | 2012-01-24 | 1 | -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::TestCase | Aaron Patterson | 2012-01-24 | 1 | -0/+4 | |
| | | ||||||
* | | Moving AR::TestCase in to the AR tests directory | Aaron Patterson | 2012-01-24 | 1 | -31/+0 | |
| | | ||||||
* | | Only show the type if column is present | Rafael Mendonça França | 2012-01-23 | 1 | -1/+2 | |
| | | ||||||
* | | Merge pull request #4558 from stephencelis/type-cast-unknown-should-fail | Aaron Patterson | 2012-01-23 | 1 | -1/+1 | |
|\ \ | | | | | | | Don't type-cast unknown types to YAML. | |||||
| * | | Don't type-cast unknown types to YAML. | Stephen Celis | 2012-01-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #4563 from amatsuda/ar_relation_pp | Aaron Patterson | 2012-01-23 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | let AR::Relation pretty_printed like an Array | |||||
| * | | | let AR::Relation pretty_printed like an Array | Akira Matsuda | 2012-01-21 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Remove not used if..else clause | Carlos Antonio da Silva | 2012-01-23 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | Related to #4614. | |||||
* | | | | Unused var removed | Arun Agrawal | 2012-01-23 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | change AR default_timezone to :utc since it's the default for AR::Railtie | Akira Matsuda | 2012-01-21 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | pushed broadcasting down to a module | Aaron Patterson | 2012-01-20 | 1 | -2/+1 | |
|/ / / | ||||||
* / / | restored logging to the log file and display on the console | Aaron Patterson | 2012-01-20 | 1 | -1/+3 | |
|/ / | ||||||
* | | Fix another race condition. | Jon Leighton | 2012-01-20 | 2 | -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 Patterson | 2012-01-20 | 1 | -1/+4 | |
| | | | | | | | | | | | | public" This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db. | |||||
* | | push ivar initialization down to a common method | Aaron Patterson | 2012-01-19 | 1 | -16/+20 | |
| | | ||||||
* | | just use an alias. The target method is public, so make this one public | Aaron Patterson | 2012-01-19 | 1 | -4/+1 | |
| | | | | | | | | too. | |||||
* | | avoid useless is_a checks | Aaron Patterson | 2012-01-19 | 1 | -8/+8 | |
| | | ||||||
* | | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 1 | -0/+22 | |
|\ \ | | | | | | | Add ActiveRecord::Base#with_lock | |||||
| * | | Add ActiveRecord::Base#with_lock | Olek Janiszewski | 2012-01-18 | 1 | -0/+22 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Dev | 2012-01-19 | 1 | -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-counters | Aaron Patterson | 2012-01-17 | 1 | -1/+2 | |
|\ | | | | | Fix bug where reset_counters resets the wrong counter cache. | |||||
| * | Fix bug where reset_counters resets the wrong counter cache. | David Peter | 2012-01-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | 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. | |||||
* | | validate related records in the same validation context as parent. | Emmanuel Oga | 2012-01-17 | 2 | -2/+2 | |
|/ | | | | | | | | | | | | | | | | | | | | E.G.: ```ruby class Parent < ActiveRecord::Base has_one :child validates_presence_of :name, :on => "custom_context" validates_associated :child end class Child < ActiveRecord::Base belongs_to :parent validates_presence_of :name, :on => "custom_context" end p = Parent.new(:name => "Montoto", :child => Child.new) p.valid?(:custom_context) # => Returns true, even though the child is not valid under the same context. ``` | |||||
* | Deprecate inferred JOINs with includes + SQL snippets. | Jon Leighton | 2012-01-16 | 4 | -7/+29 | |
| | | | | | | See the CHANGELOG for details. Fixes #950. | |||||
* | infer references from Relation#order | Jon Leighton | 2012-01-16 | 1 | -1/+7 | |
| | ||||||
* | store references as a string | Jon Leighton | 2012-01-16 | 2 | -2/+2 | |
| | ||||||
* | Avoid sanitize_sql when we can use Relation#where instead | Jon Leighton | 2012-01-16 | 4 | -22/+16 | |
| | ||||||
* | automatically add references when we can | Jon Leighton | 2012-01-16 | 2 | -1/+15 | |
| | ||||||
* | Make referencing an included item trigger eager loading | Jon Leighton | 2012-01-16 | 1 | -1/+2 | |
| | ||||||
* | Add ActiveRecord::Relation#references (#950) | Jon Leighton | 2012-01-16 | 3 | -3/+21 | |
| | ||||||
* | Revert "Deprecate implicit eager loading. Closes #950." | Jon Leighton | 2012-01-16 | 6 | -19/+5 | |
| | | | | This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9. | |||||
* | moving verbosity tests to the migrator test, removing ddl changes | Aaron Patterson | 2012-01-16 | 1 | -2/+1 | |
| |