diff options
-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 |