| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | remove unused method | Jon Leighton | 2012-04-25 | 1 | -6/+0 | |
| | | | | | | | ||||||
| * | | | | | | remove tests for #with_scope (it's now deprecated) | Jon Leighton | 2012-04-25 | 13 | -767/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5973 from academia-edu/master | Aaron Patterson | 2012-04-25 | 1 | -1/+9 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Always quote hstore keys and values | |||||
| | * | | | | | | Always quote hstore keys and values | Ryan Fitzgerald | 2012-04-24 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes. | |||||
| * | | | | | | | Merge remote-tracking branch 'kennyj/fix_5563' | Jon Leighton | 2012-04-25 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb | |||||
| | * | | | | | | | Fix #5563. Should reflect the most recent change to either of association / id. | kennyj | 2012-04-13 | 1 | -0/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add missing test | Jon Leighton | 2012-04-25 | 1 | -0/+12 | |
| | | | | | | | | | ||||||
| * | | | | | | | | extract deprecated code | Jon Leighton | 2012-04-25 | 2 | -7/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Extract deprecated code | Jon Leighton | 2012-04-25 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix interpolation for hash merging | Jon Leighton | 2012-04-25 | 1 | -4/+13 | |
| | | | | | | | | | ||||||
| * | | | | | | | | allow merging a single where value | Jon Leighton | 2012-04-25 | 1 | -0/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | giving a hash to default scope should not be deprecated (well, not for this ↵ | Jon Leighton | 2012-04-25 | 1 | -2/+2 | |
| | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | reason) | |||||
| * | | | | | | | Fix build. It seems that the Mocha's behavior were changed. | kennyj | 2012-04-25 | 2 | -3/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵ | Akira Matsuda | 2012-04-19 | 1 | -0/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option | |||||
| * | | | | | | | opening a connection will block if the pool is full | Aaron Patterson | 2012-04-15 | 1 | -0/+24 | |
| | | | | | | | | ||||||
| * | | | | | | | Automatically create indexes for references/belongs_to statements in migrations. | Joshua Wood | 2012-04-14 | 2 | -0/+100 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #5837 from yahonda/new_sequence_name_is_too_long | Jon Leighton | 2012-04-14 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | |||||
| | * | | | | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | Yasuo Honda | 2012-04-13 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix tests | Jon Leighton | 2012-04-13 | 7 | -81/+74 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5832 from kennyj/fix_5267 | Jon Leighton | 2012-04-13 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix a wrong return value from reset_sequence_name method. | |||||
| | * | | | | | | | | Fix wrong return value from reset_sequence_name method. | kennyj | 2012-04-14 | 1 | -2/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | now we can just manipulate the values hash in #only and #except | Jon Leighton | 2012-04-13 | 1 | -0/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | use a hash to store relation values | Jon Leighton | 2012-04-13 | 1 | -7/+7 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | remove apply_finder_options call from AssociationScope | Jon Leighton | 2012-04-13 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Make Relation#extending work like other value methods | Jon Leighton | 2012-04-13 | 1 | -8/+9 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add Relation#merge! | Jon Leighton | 2012-04-13 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | assert valid keys | Jon Leighton | 2012-04-13 | 1 | -0/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Allow Relation#merge to take a hash | Jon Leighton | 2012-04-13 | 1 | -2/+20 | |
| | | | | | | | | | ||||||
| * | | | | | | | | we have no need for the ASSOCIATION_METHODS constant | Jon Leighton | 2012-04-13 | 1 | -8/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | we don't need to test that constant assignment works | Jon Leighton | 2012-04-13 | 1 | -15/+0 | |
| |/ / / / / / / | ||||||
| * / / / / / / | Add bang versions of relation query methods. | Jon Leighton | 2012-04-12 | 1 | -0/+52 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The main reason for this is that I want to separate the code that does the mutating from the code that does the cloning. | |||||
| * | | | | | | Merge pull request #5720 from kennyj/should_use_klass_method | Jon Leighton | 2012-04-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Get a properly aliased_table_name, when we use a polymorphic association. | |||||
| | * | | | | | | Get a properly aliased_table_name, when we use a polymorphic association. | kennyj | 2012-04-04 | 1 | -0/+1 | |
| | |/ / / / / | ||||||
| * | | | | | | Override AR::Relation methods in NullRelation. | Juanjo Bazán | 2012-04-11 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | So a NullRelation (Relation#none) is chainable with database methods. | |||||
| * | | | | | | Fix delete_all when chained with joins. | Rafael Mendonça França | 2012-04-10 | 1 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5202 and #919 | |||||
| * | | | | | | Adds test to check that circular preloading does not modify Model.unscoped ↵ | Benedikt Deicke | 2012-04-03 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | (as described in #5667) | |||||
| * | | | | | | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-03 | 1 | -0/+4 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" | |||||
| * | | | | | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 1 | -0/+11 | |
| | | | | | | ||||||
| * | | | | | fix test | Jon Leighton | 2012-03-30 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | whitespace :scissors: | Jon Leighton | 2012-03-30 | 2 | -5/+4 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5334 from courtland/master | Jon Leighton | 2012-03-30 | 4 | -1/+25 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. | |||||
| | * | | | | | Tests for removing a HABTM association when optimistic locking is enabled. | Nick Rogers | 2012-03-07 | 4 | -1/+25 | |
| | | | | | | | ||||||
| * | | | | | | Add Relation#find_by and Relation#find_by! | Jon Leighton | 2012-03-30 | 2 | -0/+48 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #2945 from Casecommons/nested_attributes_module | Jon Leighton | 2012-03-30 | 2 | -0/+14 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Nested attribute setters can be overridden. | |||||
| | * | | | | | | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 2 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overriding implementation can call super. | |||||
| * | | | | | | | Deprecate Column#type_cast_code | Carlos Antonio da Silva | 2012-03-29 | 1 | -4/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Add ActiveRecord::Base#slice to slice method calls | Guillermo Iguaran | 2012-03-29 | 1 | -0/+12 | |
| |/ / / / / / | ||||||
| * | | | | | | attributes are cached by string keys, so to_s to support symbols. fixes #5549 | Aaron Patterson | 2012-03-27 | 2 | -1/+16 | |
| | | | | | | | ||||||
| * | | | | | | removed unused variables | Arun Agrawal | 2012-03-27 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an error | Guten | 2012-03-26 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |