Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Added documentation to explain what happens if you don't set any ↵ | Rodrigo Flores | 2012-04-12 | 1 | -5/+2 |
| | | | | | | values for the dependent option on has_many" This reverts commit 820a677d8622a540188704941a31871ed4d61461. | ||||
* | Added documentation to explain what happens if you don't set any values for ↵ | Rodrigo Flores | 2012-04-12 | 1 | -2/+5 |
| | | | | the dependent option on has_many | ||||
* | Fix typo on the add_index. | kennyj | 2012-04-13 | 1 | -1/+1 |
| | |||||
* | Some refactor for association. | kennyj | 2012-04-12 | 3 | -8/+7 |
| | | | | | | | * Remove unused association_class method. * Remove a unnecessary assignment. * Move @updated to BelongsToAssociation that only reference this instance variable. * Reset @stale_state at the reset method. I think this place is right place. | ||||
* | move apply_finder_options to active_record_deprecated_finders | Jon Leighton | 2012-04-12 | 1 | -22/+0 |
| | |||||
* | add active_record_deprecated_finders as a dep | Jon Leighton | 2012-04-12 | 1 | -0/+1 |
| | |||||
* | Merge pull request #5720 from kennyj/should_use_klass_method | Jon Leighton | 2012-04-11 | 1 | -1/+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 | -1/+1 |
| | | |||||
* | | Override AR::Relation methods in NullRelation. | Juanjo Bazán | 2012-04-11 | 1 | -0/+53 |
| | | | | | | So a NullRelation (Relation#none) is chainable with database methods. | ||||
* | | Corrected grammatical errors in schema_dumper and scoping/default | dcurtis | 2012-04-10 | 2 | -2/+2 |
| | | |||||
* | | Fix delete_all when chained with joins. | Rafael Mendonça França | 2012-04-10 | 3 | -16/+40 |
| | | | | | | | | Closes #5202 and #919 | ||||
* | | Merge pull request #5718 from benedikt/master | Jeremy Kemper | 2012-04-08 | 2 | -6/+5 |
|\ \ | | | | | | | Removes caching from ActiveRecord::Core::ClassMethods#relation | ||||
| * | | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-03 | 2 | -6/+5 |
| |/ | | | | | | | | | | | | | | | | | | | | | 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 markup error [ci skip] | Vijay Dev | 2012-04-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 2 | -3/+3 |
|\ \ | | | | | | | Updated/changed unneeded tr/gsubs | ||||
| * | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 2 | -3/+3 |
| |/ | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/engines.textile | ||||
| * | | Remove unnecessary articles. | Waseem Ahmad | 2012-04-03 | 1 | -3/+3 |
| |/ | |||||
* | | DATABASE_URL allows omission of database.yml | Tim Pope | 2012-04-03 | 1 | -1/+3 |
| | | |||||
* | | use File.binread to pull in the schema cache | Aaron Patterson | 2012-04-03 | 1 | -1/+1 |
|/ | |||||
* | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 1 | -2/+3 |
| | |||||
* | clear up duplication between Persistence#destroy and Locking#destroy | Jon Leighton | 2012-03-30 | 2 | -27/+34 |
| | |||||
* | Merge pull request #5334 from courtland/master | Jon Leighton | 2012-03-30 | 1 | -0/+2 |
|\ | | | | | Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. | ||||
| * | Fix deleting from a HABTM join table upon destroying an object of a model ↵ | Nick Rogers | 2012-03-07 | 1 | -0/+2 |
| | | | | | | | | with optimistic locking enabled. Issue #5332. | ||||
* | | Add Relation#find_by and Relation#find_by! | Jon Leighton | 2012-03-30 | 2 | -0/+20 |
| | | |||||
* | | Merge pull request #2945 from Casecommons/nested_attributes_module | Jon Leighton | 2012-03-30 | 1 | -1/+1 |
|\ \ | | | | | | | Nested attribute setters can be overridden. | ||||
| * | | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Overriding implementation can call super. | ||||
* | | | recurse in read_attribute we get caching / don't duplicate code | Jon Leighton | 2012-03-30 | 1 | -3/+2 |
| | | | |||||
* | | | Deprecate Column#type_cast_code | Carlos Antonio da Silva | 2012-03-29 | 1 | -0/+4 |
| | | | |||||
* | | | Properly typecast id attribute when using custom primary key | Carlos Antonio da Silva | 2012-03-29 | 1 | -1/+4 |
| | | | |||||
* | | | Add ActiveRecord::Base#slice to slice method calls | Guillermo Iguaran | 2012-03-29 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #4843 from seamusabshere/patch-1 | Xavier Noria | 2012-03-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Possibly clearer way of getting rid of ` and " | ||||
| * | | thanks to @jurriaan | Seamus Abshere | 2012-02-14 | 1 | -1/+1 |
| | | | |||||
| * | | Possibly clearer way of getting rid of ` and " | Seamus Abshere | 2012-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Incidentally it's also faster... >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.tr('`"', "") } } => 0.7388770580291748 >> a = 'hello "id` world'; Benchmark.realtime { 500_000.times { a.gsub(/[`"]/, "") } } => 1.7843739986419678 | ||||
* | | | much code can be deleted thanks to @tenderlove's refactoring | Jon Leighton | 2012-03-28 | 3 | -72/+6 |
| | | | |||||
* | | | Merge pull request #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix indenting in migration generator | ||||
| * | | | Fix indenting in migration generator | Colin Bartlett | 2012-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ rails generate migration remove_foo_from_bars foo:string This currently generates: def up remove_column :bars, :foo end Fix it: def up remove_column :bars, :foo end | ||||
* | | | | Remove Arel::Relation constant from PredicateBuilder. | Juanjo Bazán | 2012-03-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | attributes are cached by string keys, so to_s to support symbols. fixes #5549 | Aaron Patterson | 2012-03-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-27 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Missing generated query for pluck method. | Juanjo Bazán | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | (and changed the use of true for a more database agnostic example). | ||||
| * | | | Use one 'be'. | Waseem Ahmad | 2012-03-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5582 from chendo/master | Xavier Noria | 2012-03-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Remove "needless boolean casting" | ||||
| * | | | | Remove 'needless boolean casting'. | Jack Chen (chendo) | 2012-03-26 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | "Predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsoever." - @fxn | ||||
* | | | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Issue with schema dump | ||||
| * | | | | Not checking for nil is apparently a lot faster. | Nat Welch | 2011-09-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of git://github.com/rails/rails | Nat Welch | 2011-09-21 | 33 | -1616/+1554 |
| |\ \ \ \ | |||||
| * | | | | | From @dasch's recommendation. | Nat Welch | 2011-08-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixes bug with schema dumper when using with Padrino. | Nat Welch | 2011-08-21 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an error | Guten | 2012-03-26 | 1 | -1/+7 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb |