Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4799 from arunagw/warning_fixed_for_indentations | Aaron Patterson | 2012-01-31 | 1 | -1/+1 |
|\ | | | | | warning removed: mismatched indentations | ||||
| * | warning removed: mismatched indentations | Arun Agrawal | 2012-01-31 | 1 | -1/+1 |
| | | |||||
* | | Revert "Merge pull request #4746 from jenslukowski/issue4718" | Aaron Patterson | 2012-01-31 | 1 | -8/+1 |
| | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68. | ||||
* | | Merge pull request #4805 from xuanxu/none_and_null_object_pattern | Jon Leighton | 2012-01-31 | 4 | -1/+45 |
|\ \ | | | | | | | Added `none` query method to return zero records. | ||||
| * | | Added `none` query method to return zero records. | Juanjo Bazán | 2012-01-31 | 4 | -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 copy | Aaron Patterson | 2012-01-31 | 2 | -9/+21 |
| | | | |||||
* | | | always return the result set from select_all | Aaron Patterson | 2012-01-31 | 2 | -2/+2 |
| | | | |||||
* | | | made the result set object act more like an array | Aaron Patterson | 2012-01-31 | 5 | -4/+24 |
| | | | |||||
* | | | Merge pull request #4746 from jenslukowski/issue4718 | Aaron Patterson | 2012-01-31 | 1 | -1/+8 |
|\ \ \ | |/ / |/| | | Test and fix for issue 4718 | ||||
| * | | fix for Issue 4718 | Jens Lukowski | 2012-01-29 | 1 | -1/+8 |
| | | | |||||
* | | | Put spaces between the words at deprecation warning | Rafael Mendonça França | 2012-01-31 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 1 | -1/+1 |
|\ \ | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL) | ||||
| * | | ids_reader method fixed, test added to has_many association | gregolsen | 2012-01-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error | Jon Leighton | 2012-01-31 | 6 | -21/+49 |
|\ \ \ | | | | | | | | | has_many/has_one, :dependent => :restrict, deprecation added | ||||
| * | | | suggested fixes for :dependent => :restrict deprecation. | Manoj | 2012-01-31 | 3 | -4/+6 |
| | | | | |||||
| * | | | Same method for has_many and has_one associations | Paco Guzman | 2012-01-31 | 3 | -30/+17 |
| | | | | |||||
| * | | | Easy dependent_restrict error message | Paco Guzman | 2012-01-31 | 2 | -4/+2 |
| | | | | |||||
| * | | | has_many/has_one, :dependent => :restrict, deprecation added. | Manoj | 2012-01-29 | 6 | -7/+48 |
| | |/ | |/| | |||||
* | | | 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. |