micro_sql 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/micro_sql/pg_adapter.rb

@@ -13,6 +13,47 @@ class MicroSql::PgAdapter < MicroSql
     @impl.set_notice_receiver { |result| MicroSql.logger.info(result.error_message) }
   end
 
+  TRANSACTION_STATUSES = %w(PQTRANS_IDLE PQTRANS_ACTIVE PQTRANS_INTRANS PQTRANS_INERROR PQTRANS_UNKNOWN)
+
+  def transaction_status
+    TRANSACTION_STATUSES[@impl.transaction_status]
+  end
+
+  def transaction?
+    status = @impl.transaction_status
+    status == PG::Connection::PQTRANS_INTRANS || status == PG::Connection::PQTRANS_INERROR
+  end
+  
+  def transaction(&block)
+    return savepoint_transaction(&block) if transaction?
+
+    begin
+      r = nil
+      @impl.transaction do
+        r = yield
+      end
+      r
+    rescue RollbackException
+      nil
+    end
+  end
+  
+  private
+
+  def savepoint_transaction(&block)
+    savepoint_name = "sqdb_#{object_id}"
+
+    exec! "SAVEPOINT #{savepoint_name}"
+    r = yield
+    exec! "RELEASE SAVEPOINT #{savepoint_name}"
+    r
+  rescue RollbackException
+    exec! "ROLLBACK TO SAVEPOINT #{savepoint_name}"
+    nil
+  end
+
+  public
+  
   def tables
     exec("SELECT tablename FROM pg_tables WHERE tablename NOT LIKE 'pg_%' AND tablename NOT LIKE 'sql_%'").map(&:first)
   end

data/micro_sql.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "micro_sql"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-04-02"
+  s.date = "2012-04-03"
   s.description = "You only need a single method to talk to your database..."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [

data/test/test_micro_sql_pg.rb

@@ -99,6 +99,22 @@ class TestMicroSqlPg < Test::Unit::TestCase
     assert_equal 1, db.ask("SELECT COUNT(*) FROM t1")
   end
 
+  def test_nested_transaction
+    db.ask "CREATE TABLE t1(idx INTEGER PRIMARY KEY, b TEXT)"
+    
+    foo = db.transaction do
+      db.ask("INSERT INTO t1 (idx,b) VALUES(12, 'twelve')")
+      db.transaction do
+        db.ask("INSERT INTO t1 (idx,b) VALUES(13, 'thirteen')")
+        db.rollback!
+      end
+      "bar"
+    end
+    
+    assert_equal "bar", foo
+    assert_equal 1, db.ask("SELECT COUNT(*) FROM t1")
+  end
+
   def test_insert
     assert_equal([], db.tables)
     t1 = db.table "CREATE TABLE t1(idx INTEGER PRIMARY KEY, b TEXT)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micro_sql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70130046726220 !ruby/object:Gem::Requirement
+  requirement: &70112976340220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130046726220
+  version_requirements: *70112976340220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70130046701360 !ruby/object:Gem::Requirement
+  requirement: &70112976338980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130046701360
+  version_requirements: *70112976338980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70130046688900 !ruby/object:Gem::Requirement
+  requirement: &70112976337920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130046688900
+  version_requirements: *70112976337920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70130046663760 !ruby/object:Gem::Requirement
+  requirement: &70112976336440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130046663760
+  version_requirements: *70112976336440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70130046580920 !ruby/object:Gem::Requirement
+  requirement: &70112976328460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130046580920
+  version_requirements: *70112976328460
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70130046570120 !ruby/object:Gem::Requirement
+  requirement: &70112976327360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130046570120
+  version_requirements: *70112976327360
 description: You only need a single method to talk to your database...
 email: eno@open-lab.org
 executables: []
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -292595813074764874
+      hash: 2450718260584937907
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: