diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-04-28 19:43:41 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-04-28 19:43:41 +0000 |
| commit | bb875172e2812488439fd5f8e7ff9fa1646ea77c (patch) | |
| tree | a63cddae4cfc56bdd361f5386c9d7485775a84c3 | |
| parent | b792945e3945c291fe7b7dae85bf0f014a746038 (diff) | |
| download | rails-bb875172e2812488439fd5f8e7ff9fa1646ea77c.tar.gz rails-bb875172e2812488439fd5f8e7ff9fa1646ea77c.tar.bz2 rails-bb875172e2812488439fd5f8e7ff9fa1646ea77c.zip | |
New Frontbase connections don't start in auto-commit mode. Closes #4922. [mlaster@metavillage.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4302 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index da08d14816..4ec5db2140 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* New Frontbase connections don't start in auto-commit mode. Closes #4922. [mlaster@metavillage.com] + * When grouping, use the appropriate option key. [Marcel Molina Jr.] * Only modify the sequence name in the FrontBase adapter if the FrontBase adapter is actually being used. [Marcel Molina Jr.] diff --git a/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb b/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb index b73915cf5c..3b323193e8 100644 --- a/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/frontbase_adapter.rb @@ -229,6 +229,9 @@ module ActiveRecord @connection_options, @config = connection_options, config @transaction_mode = :pessimistic + # Start out in auto-commit mode + self.rollback_db_transaction + # threaded_connections_test.rb will fail unless we set the session # to optimistic locking mode # set_pessimistic_transactions |