dm-nested-transactions 0.0.3 → 0.0.4

data/.gitignore

@@ -1,2 +1 @@
-*.gemspec
 pkg/

data/README

@@ -7,6 +7,6 @@ Install:
   gem install dm-nested-transactions
 
 Usage:
-  repository.adapter.extend(DataMapper::NestedTransactinos)
+  repository.adapter.extend(DataMapper::NestedTransactions)
 
 There's a rails/init.rb file that automatically does the above for you. If you are using rails, you probably also want xaviershay-dm-rails since dm-rails 10.2 is broken with transactions.

data/Rakefile

@@ -3,7 +3,7 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "dm-nested-transactions"
     gemspec.summary = "Adds nested transaction support to DM"
-    gemspec.description = "Only tested with Postgres, and it's a bit of a hack, so use at your own risk!"
+    gemspec.description = "Only tested with Postgres and Oracle, and it's a bit of a hack, so use at your own risk!"
     gemspec.email = "contact@rhnh.net"
     gemspec.homepage = "http://github.com/xaviershay/dm-nested-transactions"
     gemspec.authors = ["Xavier Shay"]

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/dm-nested-transactions.gemspec

@@ -0,0 +1,43 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-nested-transactions}
+  s.version = "0.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Xavier Shay"]
+  s.date = %q{2010-06-23}
+  s.description = %q{Only tested with Postgres and Oracle, and it's a bit of a hack, so use at your own risk!}
+  s.email = %q{contact@rhnh.net}
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "dm-nested-transactions.gemspec",
+     "lib/dm-nested-transactions.rb",
+     "rails/init.rb"
+  ]
+  s.homepage = %q{http://github.com/xaviershay/dm-nested-transactions}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Adds nested transaction support to DM}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/dm-nested-transactions.rb

@@ -34,7 +34,7 @@ module DataMapper
 
   module NestedTransactions
     def nested_transaction_primitive
-      DataObjects::NestedTransaction.create_for_uri(normalized_uri, current_connection)
+      DataObjects::NestedTransaction.create_for_uri(normalized_uri, current_connection, self)
     end
   end
 end
@@ -53,35 +53,53 @@ module DataObjects
     # A unique ID for this transaction
     attr_reader :id
 
-    def self.create_for_uri(uri, connection)
+    def self.create_for_uri(uri, connection, adapter)
       uri = uri.is_a?(String) ? URI::parse(uri) : uri
-      DataObjects::NestedTransaction.new(uri, connection)
+      DataObjects::NestedTransaction.new(uri, connection, adapter)
     end
 
     #
     # Creates a NestedTransaction bound to an existing connection
     #
-    def initialize(uri, connection)
+    def initialize(uri, connection, adapter)
+      @adapter    = adapter
       @connection = connection
-      @id = Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:nested:#{@@counter += 1}")[0..-2]
+      @id = Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:nested:#{@@counter += 1}")[0..10]
+    end
+
+    def begin_statement
+      lambda{ |id| "SAVEPOINT \"#{id}\"" }
+    end
+
+    def commit_statement
+      case @adapter.class.name
+      when /oracle/i
+        nil
+      else
+        lambda{ |id| "RELEASE SAVEPOINT \"#{id}\"" }
+      end
+    end
+
+    def rollback_statement
+      lambda{ |id| "ROLLBACK TO SAVEPOINT \"#{id}\"" }
     end
 
     def close
     end
 
     def begin
-      cmd = "SAVEPOINT \"#{@id}\""
-      connection.create_command(cmd).execute_non_query
+      connection.create_command(begin_statement.call(@id)).execute_non_query
     end
 
     def commit
-      cmd = "RELEASE SAVEPOINT \"#{@id}\""
-      connection.create_command(cmd).execute_non_query
+      statement = commit_statement
+      if statement
+        connection.create_command(commit_statement.call(@id)).execute_non_query
+      end
     end
 
     def rollback
-      cmd = "ROLLBACK TO SAVEPOINT \"#{@id}\""
-      connection.create_command(cmd).execute_non_query
+      connection.create_command(rollback_statement.call(@id)).execute_non_query
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-nested-transactions
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Xavier Shay
@@ -14,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +11:00
+date: 2010-06-23 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
-description: Only tested with Postgres, and it's a bit of a hack, so use at your own risk!
+description: Only tested with Postgres and Oracle, and it's a bit of a hack, so use at your own risk!
 email: contact@rhnh.net
 executables: []
 
@@ -31,6 +32,7 @@ files:
 - README
 - Rakefile
 - VERSION
+- dm-nested-transactions.gemspec
 - lib/dm-nested-transactions.rb
 - rails/init.rb
 has_rdoc: true
@@ -43,23 +45,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds nested transaction support to DM