aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-252-3/+4
|\ | | | | | | | | Conflicts: actionmailer/CHANGELOG.md
| * Fixed typo in composed_of example with Money#<=>, was comparing amount ↵Noah Hendrix2012-02-241-1/+1
| | | | | | | | itself instead of other_money.amount
| * Revert "Remove meaningless code from the examples" of AutosaveAssociation Dimitar Dimitrov2012-02-221-0/+3
| | | | | | Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails.
| * Minor fixes to ActiveRecord::AutosaveAssociation's docs Dimitar Dimitrov2012-02-221-5/+3
| | | | | | | | * Fix typos * Remove meaningless code from the examples
* | Update changelogs with rails 3.0-stable branch infoPaco Guzman2012-02-251-3/+85
| |
* | use regular ruby for fewer method calls. we do not need :gift:s!Aaron Patterson2012-02-241-1/+4
| |
* | removes verify_active_connections!Xavier Noria2012-02-242-16/+1
| | | | | | | | | | | | | | The method verify_active_connections! was used in the old days (up to 2.1 I think) by the dispatcher to verify the connections, but nowadays we do that in a different way and this method is obsolete.
* | Update with new task names for building mysql and postgresql databasesMichael Guterl2012-02-231-1/+1
| |
* | Remove unused implementation of next_migration_numberMarcelo Silveira2012-02-232-17/+0
| |
* | bumping up arelAaron Patterson2012-02-211-1/+1
| |
* | prepared statements can be disabledAaron Patterson2012-02-218-30/+56
| |
* | more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
| |
* | tag bind params with a bind param objectAaron Patterson2012-02-203-3/+3
| |
* | removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, ↵William Lawson2012-02-201-1/+0
| | | | | | | | 31 skips
* | Restored ability to identify ID and Sequence from tables relying on a ↵William Lawson2012-02-202-19/+44
| | | | | | | | nonmatching sequence default value for PK.
* | Update activerecord/CHANGELOG.mdJosef Šimánek2012-02-181-1/+1
|/
* Correctly print names of non-timestamped migrations with db:migrate:statusPeter Mitchell2012-02-171-2/+3
|
* use Process.pid rather than $$Aaron Patterson2012-02-163-7/+7
|
* database connections are automatically established after forking.Aaron Patterson2012-02-163-14/+73
| | | | Connection pools are 1:1 with pids.
* Merge pull request #5064 from lest/patch-1Jeremy Kemper2012-02-163-6/+19
|\ | | | | move id_before_type_cast to PrimaryKey module
| * move id_before_type_cast to PrimaryKey moduleSergey Nartimov2012-02-163-6/+19
| |
* | Autoload various constants effectively in abstract connection adapter.Waseem Ahmad2012-02-161-9/+12
|/
* Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-151-2/+2
| | | | | | | | | Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052
* Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-02-143-4/+18
|\ | | | | Rename field_changed? to _field_changed? so that users can create a field named field
| * A test case for GH #3544 to ensure that a field named field works fineAkira Matsuda2012-02-141-0/+14
| |
| * Rename field_changed? to _field_changed? so that users can create a field ↵Akira Matsuda2012-02-142-4/+4
| | | | | | | | named field
* | Always reenable _dump task in AR databases rake. Closes #5030Carlos Antonio da Silva2012-02-141-1/+4
| | | | | | | | | | | | | | This allows the internal :_dump task to be called as many times as required. For instance, `rake db:migrate:redo` calls two tasks that internally call :_dump, and without reenabling it to be reinvoked, the database was left in incorrect state.
* | remove unnecessary require core_ext/string/encodingSergey Nartimov2012-02-141-1/+0
|/
* Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-131-1/+1
|\ | | | | Fix usage of psql in db:test:prepare
| * fixes rake db:test:prepare when using postgresql with sql db structure file ↵Sean Kirby2012-02-011-1/+1
| | | | | | | | and specifying a template in database.yml
* | Merge pull request #5000 from flavorpill/master-with-multidb-association-fixAaron Patterson2012-02-1311-10/+40
|\ \ | | | | | | Fix associations with per-class/multiple database connections
| * | fix associations when using per class databasesLars Kanis2012-02-103-8/+5
| | | | | | | | | | | | | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in
| * | added test for #3732Rick Martinez2012-02-108-2/+35
| | |
* | | Merge pull request #5012 from waseem/alias-reconnect-mysql2Aaron Patterson2012-02-131-5/+1
|\ \ \ | | | | | | | | Alias reconnect! to reset! for Mysql2 adapter since they have same behavior.
| * | | Alias reconnect! to reset! for Mysql2 adapter since they have sameWaseem Ahmad2012-02-121-5/+1
| | | | | | | | | | | | | | | | behavior.
* | | | Revert PR#5001 "removed unuseful require for reply as we are not using ↵Vishnu Atrai2012-02-124-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | require model" This reverts commit 7381596ea32aff47222af89e4bc66000f4597acb.
* | | | fix build 5001, model reply is required in cases/primary_keys_test too!Vishnu Atrai2012-02-121-0/+1
| | | |
* | | | fix build #5001 reply model required in relations_testVishnu Atrai2012-02-121-0/+1
|/ / /
* | | handle id attribute in PrimaryKey moduleSergey Nartimov2012-02-112-1/+7
| | |
* | | Merge pull request #5003 from kennyj/fix_warning_20120211Santiago Pastorino2012-02-111-1/+1
|\ \ \ | | | | | | | | Fix warning: The method name is a duplicate and wrong.
| * | | Fix warning: The method name is a duplicate and wrong.kennyj2012-02-111-1/+1
| | | |
* | | | removed unuseful require for reply as we are not using require modelKarunakar (Ruby)2012-02-116-7/+0
| | | |
* | | | say unshift when you mean unshift (modulus prepend)Xavier Noria2012-02-111-1/+3
|/ / /
* | | PG column consults oid types when typecastingAaron Patterson2012-02-105-10/+34
| | |
* | | dynamically populate casting objects via the pg_type tableAaron Patterson2012-02-102-35/+74
| | |
* | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_readerAaron Patterson2012-02-106-36/+126
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * joelhoffman-postgres_schema_builder: Also support writing the hstore back to the database Hstore values are all strings string_to_hstore / hstore_to_string, serializing don't test schema where hstore not installed schema dumper tests for hstore Additional hstore tests, supporting null values, better compliance with postgres docs add hstore to postgres native types and defaults Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | | Also support writing the hstore back to the databaseJoel2012-02-082-0/+13
| | | |
| * | | Hstore values are all stringsJoel2012-02-081-1/+1
| | | |
| * | | string_to_hstore / hstore_to_string, serializingJoel2012-02-083-17/+26
| | | |
| * | | don't test schema where hstore not installedJoel2012-02-081-0/+2
| | | |