aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3507 from jmazzi/issue-3503Jeremy Kemper2011-11-032-2/+21
| | | | | | | | | | | | Preserve SELECT columns on the COUNT for finder_sql when possible
* | | Fix #3271.Jon Leighton2011-11-033-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Building the conditions of a nested through association could potentially modify the conditions of the through and/or source association. This is a Bad Thing.
* | | Memoize through associationJon Leighton2011-11-031-8/+11
| | |
* | | Remove all revelant through records.Jon Leighton2011-11-033-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a record is removed from a has_many :through, all of the join records relating to that record should also be removed from the through association's target. (Previously the records were removed in the database, but only one was removed from the in-memory target array.)
* | | Fix adding multiple instances of the same record to a has_many :through.Jon Leighton2011-11-033-21/+57
| | | | | | | | | | | | Fixes #3425.
* | | Fix #3247.Jon Leighton2011-11-033-2/+13
| | | | | | | | | | | | | | | Fixes creating records in a through association with a polymorphic source type.
* | | assert_match takes a regexp and a string in that orderVijay Dev2011-10-311-1/+1
| | |
* | | dump_schema_information: explicitly order inserts into schema_migrations tableLaust Rud Jacobsen2011-10-312-1/+10
| | | | | | | | | | | | | | | | | | | | | This change reduces churn in the db/development_structure.sql file when using :sql as active_record.schema_format, and makes comparing diffs much easier. Test ensures the output SQL-statements are lexically ordered by version.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-301-0/+3
|\ \ \
| * | | Added a note that optimistic locking also needs a hidden field to function ↵Joost Baaij2011-10-251-0/+3
| | | | | | | | | | | | | | | | across web workers.
* | | | clear statement cache when tables are alteredAaron Patterson2011-10-271-0/+6
| | | |
* | | | Added failing test case for changing schema in migration not clearing the ↵Joe Van Dyk2011-10-271-0/+12
| | | | | | | | | | | | | | | | prepared statement cache
* | | | More checks for instance writers.Arun Agrawal2011-10-271-1/+2
| | | |
* | | | Adding more checks for instance_writer falseArun Agrawal2011-10-271-1/+2
| | | |
* | | | Test fix Allow instances to disable record_timestampsArun Agrawal2011-10-271-1/+1
| | | | | | | | | | | | | | | | Removed here 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33
* | | | Allow instances to disable record_timestampsPratik Naik2011-10-262-1/+11
| | | |
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-10-2520-53/+206
|\ \ \ \
| * | | | safeguard against configs missing environment or the database keyVijay Dev2011-10-261-1/+1
| | | | |
| * | | | minor revision to some new code in databases.rakeXavier Noria2011-10-241-2/+3
| | | | |
| * | | | registers PR #2419 in the CHANGELOGXavier Noria2011-10-241-0/+3
| | | | |
| * | | | Merge pull request #2419 from ↵Xavier Noria2011-10-241-11/+15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | dmitriy-kiriyenko/drop_test_database_in_development_when_running_rake_db_drop When running "rake db:drop" also drop test database in development environment
| | * | | When running "rake db:drop" also drop test database in development environment.Dmitriy Kiriyenko2011-09-291-11/+15
| | | | |
| * | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-231-5/+5
| |\ \ \ \
| | * | | | Add some note on adding index to HABTM tablePrem Sichanugrist2011-10-201-0/+4
| | | | | |
| | * | | | Use new migration style in HABTM join tablePrem Sichanugrist2011-10-201-5/+1
| | | | | | | | | | | | | | | | | | Yes, we're on Rails 3.1 now.
| * | | | | minor fixes in the composed_of docVijay Dev2011-10-221-3/+4
| | | | | |
| * | | | | preserve decimal column attributes after migrationGreg Reinacker2011-10-212-0/+39
| |/ / / /
| * | | / Merge pull request #3258 from ileitch/3-1-stableAaron Patterson2011-10-202-1/+23
| | |_|/ | |/| | | | | | | | | | Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
| * | | only use now() on pg!Aaron Patterson2011-10-181-1/+3
| | | |
| * | | reset prepared statement when schema changes imapact statement results. ↵Aaron Patterson2011-10-182-11/+51
| | | | | | | | | | | | | | | | fixes #3335
| * | | use now() for dates in pgAaron Patterson2011-10-181-1/+1
| | | |
| * | | Merge pull request #3340 from surfacedamage/exclude_destroy_in_all_blank_checkJosé Valim2011-10-173-2/+16
| |\ \ \ | | | | | | | | | | Exclude _destroy parameter in :all_blank check (issue #2937)
| | * | | Exclude _destroy parameter in :all_blank check (issue #2937)Aaron Christy2011-10-173-2/+16
| | | | |
| * | | | Merge pull request #3334 from mperham/masterAaron Patterson2011-10-163-8/+8
| |\ \ \ \ | | | | | | | | | | | | Default timestamps to non-null
| | * | | | Default timestamps to non-nullMike Perham2011-10-143-8/+8
| | |/ / /
| * / / / fix to remove warning in test casesVishnu Atrai2011-10-161-2/+2
| |/ / /
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-141-2/+2
| |\ \ \
| | * | | change activerecord query conditions example to avoid 'type' as column nameSteve Bourne2011-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes.
| * | | | Consider attempted action in exception message of ActiveRecord::StaleObjectErrorChristian Bäuerlein2011-10-142-6/+7
| | | | |
| * | | | Includes stale record in StaleObjectErrorChristian Bäuerlein2011-10-143-3/+29
| | | | |
| * | | | Rails 4 is just around the corner. Stuck with 1.8 until then.Jeremy Kemper2011-10-131-3/+3
| | | | |
| * | | | Tests gotta run in 1.8 tooJeremy Kemper2011-10-131-2/+2
| | | | |
* | | | | Fix that changing a store should mark the store attribute as changedDavid Heinemeier Hansson2011-10-252-0/+6
|/ / / /
* / / / Added ActiveRecord::Base.store for declaring simple single-column key/value ↵David Heinemeier Hansson2011-10-137-1/+93
|/ / / | | | | | | | | | stores [DHH]
* | | Merge pull request #3274 from arunagw/warning_removed_mysql2Vijay Dev2011-10-101-2/+2
|\ \ \ | | | | | | | | ambiguous first argument; put parentheses or even spaces Warning removed!
| * | | ambiguous first argument; put parentheses or even spaces Warning removed!Arun Agrawal2011-10-101-2/+2
| | | |
* | | | Active Record changelog mistakesJosef Šimánek2011-10-101-7/+8
|/ / /
* | | Use broken YAML that will fail with Syck as well as Psych. Fixes ↵Jon Leighton2011-10-091-2/+2
| | | | | | | | | | | | | | | | | | test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
* | | Remove stray whitespaceJeremy Kemper2011-10-091-4/+1
| | |
* | | Only use LOWER for mysql case insensitive uniqueness check when column has a ↵Joseph Palermo2011-10-0910-12/+139
| | | | | | | | | | | | case sensitive collation.