Merge tag 'v1.4.7' of https://github.com/JerrySievert/plv8 into HEAD

release 1.4.7
plv8 · Apr 16, 2016 · 07d09c0 · 07d09c0
2 parents cc29067 + c7c3acd
commit 07d09c0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/META.json b/META.json
@@ -2,7 +2,7 @@
     "name": "plv8",
     "abstract": "A procedural language in JavaScript powered by V8",
     "description": "plv8 is a trusted procedural language that is safe to use, fast to run and easy to develop.",
-    "version": "1.4.6",
+    "version": "1.4.7",
     "maintainer": [
         "Jerry Sievert <code@legitimatesounding.com>",
         "Hitoshi Harada <umi.tanuki@gmail.com>"
@@ -24,21 +24,21 @@
     },
     "provides": {
         "plv8": {
-            "file": "plv8--1.4.6.sql",
+            "file": "plv8--1.4.7.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.4.6",
+            "version": "1.4.7",
             "abstract": "A procedural language in JavaScript"
          },
         "plcoffee": {
-            "file": "plcoffee--1.4.6.sql",
+            "file": "plcoffee--1.4.7.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.4.6",
+            "version": "1.4.7",
             "abstract": "A procedural language in CoffeeScript"
          },
         "plls": {
-            "file": "plls--1.4.6.sql",
+            "file": "plls--1.4.7.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.4.6",
+            "version": "1.4.7",
             "abstract": "A procedural language in LiveScript"
          }
     },

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@
 #   'make static' will download v8 and build, then statically link to it.
 #
 #-----------------------------------------------------------------------------#
-PLV8_VERSION = 1.4.6
+PLV8_VERSION = 1.4.7
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

diff --git a/plv8_func.cc b/plv8_func.cc
@@ -122,6 +122,8 @@ class SubTranBlock
 Persistent<ObjectTemplate> PlanTemplate;
 Persistent<ObjectTemplate> CursorTemplate;
 Persistent<ObjectTemplate> WindowObjectTemplate;
+ResourceOwner oldowner;
+
 
 static Handle<v8::Value>
 SPIResultToValue(int status)
@@ -162,6 +164,8 @@ SubTranBlock::SubTranBlock()
 void
 SubTranBlock::enter()
 {
+	oldowner = CurrentResourceOwner;
+
 	if (!IsTransactionOrTransactionBlock())
 		throw js_error("out of transaction");
 
@@ -172,6 +176,8 @@ SubTranBlock::enter()
 void
 SubTranBlock::exit(bool success)
 {
+	CurrentResourceOwner = oldowner;
+
 	if (success)
 		ReleaseCurrentSubTransaction();
 	else