Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -2/+14 |
| | |||||
* | clear up duplication between Persistence#destroy and Locking#destroy | Jon Leighton | 2012-03-30 | 2 | -27/+34 |
| | |||||
* | 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 | 5 | -1/+27 |
|\ | | | | | 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 |
| | | |||||
| * | 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 | 5 | -0/+78 |
| | | |||||
* | | Merge pull request #2945 from Casecommons/nested_attributes_module | Jon Leighton | 2012-03-30 | 3 | -1/+15 |
|\ \ | | | | | | | Nested attribute setters can be overridden. | ||||
| * | | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 3 | -1/+15 |
| | | | | | | | | | | | | 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 | 2 | -4/+4 |
| | | | |||||
* | | | Properly typecast id attribute when using custom primary key | Carlos Antonio da Silva | 2012-03-29 | 1 | -1/+4 |
| | | | |||||
* | | | CHANGELOG entry for AR#slice | Guillermo Iguaran | 2012-03-29 | 1 | -0/+5 |
| | | | |||||
* | | | Add ActiveRecord::Base#slice to slice method calls | Guillermo Iguaran | 2012-03-29 | 2 | -0/+18 |
| | | | |||||
* | | | 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 | 3 | -2/+17 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | removed unused variables | Arun Agrawal | 2012-03-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | 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 | 68 | -1714/+2129 |
| |\ \ \ \ | |||||
| * | | | | | 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 | 2 | -1/+14 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb | ||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 2 | -1/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile | ||||
| * | | | | | Adding documentation for ActiveRecord::Base.abstract_class to clarify a ↵ | Joe Goggins | 2012-03-22 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | particular usecase for this feature (to allow you to use inheritance in ActiveRecord without using the STI table name | ||||
| * | | | | | Correct description of ['migrated_at > ?', 1.week.ago] from "more than a ↵ | Dave Burt | 2012-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | week ago" to "more recently than a week ago." | ||||
* | | | | | | properly namespace the fixture exception | Aaron Patterson | 2012-03-22 | 2 | -7/+3 |
| | | | | | | |||||
* | | | | | | Avoid another blank line in generated migration and remove assertion as per ↵ | Marcelo Silveira | 2012-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | @spastorino request | ||||
* | | | | | | Deprecate eager-evaluated scopes. | Jon Leighton | 2012-03-21 | 20 | -83/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use this: scope :red, where(color: 'red') default_scope where(color: 'red') Use this: scope :red, -> { where(color: 'red') } default_scope { where(color: 'red') } The former has numerous issues. It is a common newbie gotcha to do the following: scope :recent, where(published_at: Time.now - 2.weeks) Or a more subtle variant: scope :recent, -> { where(published_at: Time.now - 2.weeks) } scope :recent_red, recent.where(color: 'red') Eager scopes are also very complex to implement within Active Record, and there are still bugs. For example, the following does not do what you expect: scope :remove_conditions, except(:where) where(...).remove_conditions # => still has conditions | ||||
* | | | | | | Avoid obscure &Proc.new thing | Jon Leighton | 2012-03-21 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Remove valid_scope_name? check - use ruby | Jon Leighton | 2012-03-21 | 2 | -30/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scope is syntactic sugar for defining a class method. Ruby allows redefining methods but emits a warning when run with -w. So let's not implement our own logic for this. Users should run with -w if they want to be warned about redefined methods. | ||||
* | | | | | | no need for cast | Jon Leighton | 2012-03-21 | 1 | -1/+0 |
| | | | | | |