pgsql 1.2 → 1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWE3YWVlMjYyYWFkNzg5YmMwMTUwMjZlYWE4YmE0NDE5MTQ3OWJlZQ==
+    MTM2YjZhYjdkMzM5ZDdjYTAyZmJjOTMzYTM3NTFiY2M0Y2Y0ZWI1ZA==
   data.tar.gz: !binary |-
-    ZjRhNzNhMmUwMzVkMzM1YjNhMTMwM2U3OTIxODY1MjhhOTI0OWMxZg==
-!binary "U0hBNTEy":
+    YWVlZTViMjA4YmYwYzg2MjVlYWYwNjdjNTA1N2ExMmRlMDU5MTY3MA==
+SHA512:
   metadata.gz: !binary |-
-    ZjNlNzJjZjBmYWZkYTc2NzM2YmZlNjY0MzA2MDQ1ZmEzY2Q2NGVlMDBlMGI4
-    NjFlYTM0MTk4Yjk1ZjJmN2M1ODRhNGQzOGY3MWJjNGU4ZmE0NmJjYjA4NzZj
-    ZjA2NjY3NmE2ZjcwYmEyNWU5MDQ0MTJiZmMyMTMwMmQzN2UxNmY=
+    OWY0NWYwYzA0ZjZkZWFjYjkwMGNhOGFiZmQ3M2U5ZWRmZjY3ODc4NjRkNzhl
+    MDg2YzdlMmVkZDAzZjZiY2RmOWFkNTgyZTFjNzQxMTM1ZjRhN2ExNmU4OWEx
+    MmQzZTAwOGI4NGNkZmNhNDQyMGNhM2Y3Yjg0ODNlNDQxODFmNTg=
   data.tar.gz: !binary |-
-    NDI2NGYzYzczNzFkODcxMDM2YzAyZWU2NzFjNjBhYjk2MWNmOWVlOTAxNjJk
-    ODIyZDUwOGYwYzUzOTY5YWZlOGI1YzQzZWQzMmY5NjgyOWFkZTYwYzFjOGRm
-    NjVlMzA2YzAxZjMwMWI0MmFmMWYyMjYwNTA3ZTYwMzJhOGI4NTY=
+    YTc3ZWJkMDg0MWUwYjdhZDdkMGViMDM5MzE5YmU2MGVmZTBkYTNlMGIwNWZh
+    YzQwN2Y4ZjQ0ZjE2Yjk4OWI1OTFmMzY4NGVjNmY5NDk2MjIzYTIyMzc5MWI0
+    ODFiNTRjMjBkN2YxNDljN2FlYWJmOWUzMDQwMDE1ODAyYWQyZGY=

data/lib/conn_exec.c

@@ -37,10 +37,12 @@ static VALUE pgconn_select_values( int argc, VALUE *argv, VALUE self);
 static VALUE pgconn_get_notify( VALUE self);
 
 static VALUE pgconn_transaction( int argc, VALUE *argv, VALUE self);
-static VALUE rescue_transaction( VALUE self);
+static VALUE rollback_transaction( VALUE self);
+static VALUE commit_transaction( VALUE self);
 static VALUE yield_transaction( VALUE self);
 static VALUE pgconn_subtransaction( int argc, VALUE *argv, VALUE self);
-static VALUE rescue_subtransaction( VALUE ary);
+static VALUE rollback_subtransaction( VALUE ary);
+static VALUE release_subtransaction( VALUE ary);
 static VALUE yield_subtransaction( VALUE ary);
 static VALUE pgconn_transaction_status( VALUE self);
 
@@ -460,11 +462,17 @@ pgconn_transaction( int argc, VALUE *argv, VALUE self)
         rb_raise( rb_ePgConnTrans,
             "Nested transaction block. Use Conn#subtransaction.");
     pgresult_clear( pg_statement_exec( self, cmd, Qnil));
-    return rb_rescue( yield_transaction, self, rescue_transaction, self);
+    return rb_ensure( yield_transaction, self, commit_transaction, self);
 }
 
 VALUE
-rescue_transaction( VALUE self)
+yield_transaction( VALUE self)
+{
+    return rb_rescue( rb_yield, self, rollback_transaction, self);
+}
+
+VALUE
+rollback_transaction( VALUE self)
 {
     pgresult_clear( pg_statement_exec( self, rb_str_new2( "rollback;"), Qnil));
     rb_exc_raise( RB_ERRINFO);
@@ -472,13 +480,14 @@ rescue_transaction( VALUE self)
 }
 
 VALUE
-yield_transaction( VALUE self)
+commit_transaction( VALUE self)
 {
-    VALUE r;
+    struct pgconn_data *c;
 
-    r = rb_yield( self);
-    pgresult_clear( pg_statement_exec( self, rb_str_new2( "commit;"), Qnil));
-    return r;
+    Data_Get_Struct( self, struct pgconn_data, c);
+    if (PQtransactionStatus( c->conn) > PQTRANS_IDLE)
+        pgresult_clear( pg_statement_exec( self, rb_str_new2( "commit;"), Qnil));
+    return Qnil;
 }
 
 
@@ -514,11 +523,17 @@ pgconn_subtransaction( int argc, VALUE *argv, VALUE self)
     rb_str_buf_cat2( cmd, ";");
 
     pgresult_clear( pg_statement_exec( self, cmd, Qnil));
-    return rb_rescue( yield_subtransaction, ya, rescue_subtransaction, ya);
+    return rb_ensure( yield_subtransaction, ya, release_subtransaction, ya);
 }
 
 VALUE
-rescue_subtransaction( VALUE ary)
+yield_subtransaction( VALUE ary)
+{
+    return rb_rescue( rb_yield, ary, rollback_subtransaction, ary);
+}
+
+VALUE
+rollback_subtransaction( VALUE ary)
 {
     VALUE cmd;
 
@@ -526,21 +541,25 @@ rescue_subtransaction( VALUE ary)
     rb_str_buf_append( cmd, rb_ary_entry( ary, 1));
     rb_str_buf_cat2( cmd, ";");
     pgresult_clear( pg_statement_exec( rb_ary_entry( ary, 0), cmd, Qnil));
+    rb_ary_store( ary, 1, Qnil);
     rb_exc_raise( RB_ERRINFO);
     return Qnil;
 }
 
 VALUE
-yield_subtransaction( VALUE ary)
+release_subtransaction( VALUE ary)
 {
-    VALUE r, cmd;
-
-    r = rb_yield( ary);
-    cmd = rb_str_buf_new2( "release savepoint ");
-    rb_str_buf_append( cmd, rb_ary_entry( ary, 1));
-    rb_str_buf_cat2( cmd, ";");
-    pgresult_clear( pg_statement_exec( rb_ary_entry( ary, 0), cmd, Qnil));
-    return r;
+    VALUE cmd;
+    VALUE n;
+
+    n = rb_ary_entry( ary, 1);
+    if (!NIL_P( n)) {
+        cmd = rb_str_buf_new2( "release savepoint ");
+        rb_str_buf_append( cmd, n);
+        rb_str_buf_cat2( cmd, ";");
+        pgresult_clear( pg_statement_exec( rb_ary_entry( ary, 0), cmd, Qnil));
+    }
+    return Qnil;
 }
 
 

data/lib/module.c

@@ -7,7 +7,7 @@
 #include "conn.h"
 
 
-#define PGSQL_VERSION "1.2"
+#define PGSQL_VERSION "1.3"
 
 
 VALUE rb_mPg;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsql
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autorake
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - PostgreSQL
 rubyforge_project: NONE
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: PostgreSQL-API for Ruby