diff -Nru plv8-1.5.0.ds/Changes plv8-1.4.6.ds/Changes
--- plv8-1.5.0.ds/Changes	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/Changes	2016-03-27 19:49:02.000000000 +0000
@@ -1,16 +1,5 @@
 Revision history for plv8
 
-1.5.0       2016-02-26
-            - Adaptions for current V8 version, e.g. 4.1.0.x - 4.3.66
-              (see http://strongloop.com/strongblog/node-js-v0-12-c-apis-breaking/
-              for an overview of the V8 changes which break existing code bases)
-            - GUC plv8.v8_flags for V8 engine initialization flags
-            - Fixed crash in ArrayBuffer
-            - Fixed encoding issues with elog
-            - Fixed memory leak in cursor fetch
-            - Errors return full error context as an object now
-            - Fixed crash bug in cursor fetch
-
 1.4.4       2015-05-26
             - Add jsonb type coercion in function boundary.
             - Fix crash related to FLEXIBLE_ARRAY_MEMBER changes.
diff -Nru plv8-1.5.0.ds/debian/changelog plv8-1.4.6.ds/debian/changelog
--- plv8-1.5.0.ds/debian/changelog	2016-03-18 11:19:02.000000000 +0000
+++ plv8-1.4.6.ds/debian/changelog	2016-03-28 14:48:07.000000000 +0000
@@ -1,3 +1,11 @@
+plv8 (1:1.4.6.ds-1) unstable; urgency=medium
+
+  * New 1.4 upstream release supporting v8 3.14. Thanks to Jerry Sievert!
+    (The 1.5 series needs v8 4.x that isn't available in sid yet.)
+  * Add "expected" files for PG versions <= 9.3.
+
+ -- Christoph Berg <myon@debian.org>  Mon, 28 Mar 2016 16:48:05 +0200
+
 plv8 (1.5.0.ds-1) unstable; urgency=medium
 
   [ Christoph Berg ]
diff -Nru plv8-1.5.0.ds/debian/patches/make-it-compile-with-v8-3.14-again plv8-1.4.6.ds/debian/patches/make-it-compile-with-v8-3.14-again
--- plv8-1.5.0.ds/debian/patches/make-it-compile-with-v8-3.14-again	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/debian/patches/make-it-compile-with-v8-3.14-again	1970-01-01 00:00:00.000000000 +0000
@@ -1,1922 +0,0 @@
-From c569039c5144ca56e3c1e12c832aa08c0aae84c6 Mon Sep 17 00:00:00 2001
-From: Evgeni Golov <evgeni@debian.org>
-Date: Sat, 27 Feb 2016 09:18:56 +0100
-Subject: [PATCH] make it compile with v8 3.14 again
-
----
- Makefile     |   4 +-
- plv8.cc      | 307 +++++++++++++----------------------------
- plv8.h       |  19 +--
- plv8_func.cc | 442 ++++++++++++++++++++++++++---------------------------------
- plv8_type.cc |  49 +++----
- 5 files changed, 322 insertions(+), 499 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 97ab802..dc18db7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ DATA += plcoffee.control plcoffee--$(PLV8_VERSION).sql \
- endif
- DATA_built = plv8.sql
- REGRESS = init-extension plv8 plv8-errors inline json startup_pre startup varparam json_conv \
-- 		  jsonb_conv window guc es6 arraybuffer composites
-+ 		  jsonb_conv window composites
- ifndef DISABLE_DIALECT
- REGRESS += dialect
- endif
-@@ -45,8 +45,6 @@ endif
- SHLIB_LINK += -lv8
- ifdef V8_OUTDIR
- SHLIB_LINK += -L$(V8_OUTDIR)
--else
--SHLIB_LINK += -lv8_libplatform
- endif
- 
- 
-diff --git a/plv8.cc b/plv8.cc
-index e8fb17f..f819779 100644
---- a/plv8.cc
-+++ b/plv8.cc
-@@ -6,8 +6,6 @@
-  *-------------------------------------------------------------------------
-  */
- #include "plv8.h"
--#include "libplatform/libplatform.h"
--
- #include <new>
- 
- extern "C" {
-@@ -88,8 +86,6 @@ typedef struct plv8_proc_cache
- 	Oid						argtypes[FUNC_MAX_ARGS];
- } plv8_proc_cache;
- 
--Isolate* plv8_isolate = NULL;
--
- /*
-  * The function and context are created at the first invocation.  Their
-  * lifetime is same as plv8_proc, but they are not palloc'ed memory,
-@@ -99,7 +95,6 @@ typedef struct plv8_exec_env
- {
- 	Persistent<Object>		recv;
- 	Persistent<Context>		context;
--	Local<Context> localContext() { return Local<Context>::New(plv8_isolate, context) ; }
- 	struct plv8_exec_env   *next;
- } plv8_exec_env;
- 
-@@ -123,7 +118,6 @@ typedef struct plv8_proc
- typedef struct plv8_context
- {
- 	Persistent<Context>		context;
--	Local<Context> localContext() { return Local<Context>::New(plv8_isolate, context) ; }
- 	Oid						user_id;
- } plv8_context;
- 
-@@ -134,40 +128,6 @@ static plv8_exec_env		   *exec_env_head = NULL;
- extern const unsigned char coffee_script_binary_data[];
- extern const unsigned char livescript_binary_data[];
- 
--class Plv8ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-- public:
--  virtual void* Allocate(size_t length) {
--    void* data = AllocateUninitialized(length);
--    return data == NULL ? data : memset(data, 0, length);
--  }
--  virtual void* AllocateUninitialized(size_t length) {
--			void *data = NULL;
--
--			PG_TRY();
--			{
--					data = palloc(length);
--			}
--			PG_CATCH();
--			{
--					throw pg_error();
--			}
--			PG_END_TRY();
--
--			return data;
--	}
--  virtual void Free(void* data, size_t) {
--			PG_TRY();
--			{
--					pfree(data);
--			}
--			PG_CATCH();
--			{
--					throw pg_error();
--			}
--			PG_END_TRY();
--	}
--};
--
- /*
-  * lower_case_functions are postgres-like C functions.
-  * They could raise errors with elog/ereport(ERROR).
-@@ -181,10 +141,9 @@ static void plv8_xact_cb(XactEvent event, void *arg);
-  * They could raise errors with C++ throw statements, or never throw exceptions.
-  */
- static plv8_exec_env *CreateExecEnv(Handle<Function> script);
--static plv8_exec_env *CreateExecEnv(Persistent<Function>& script);
- static plv8_proc *Compile(Oid fn_oid, FunctionCallInfo fcinfo,
- 					bool validate, bool is_trigger, Dialect dialect);
--static Local<Function> CompileFunction(Persistent<Context>& global_context,
-+static Local<Function> CompileFunction(Handle<Context> global_context,
- 					const char *proname, int proarglen,
- 					const char *proargs[], const char *prosrc,
- 					bool is_trigger, bool retset, Dialect dialect);
-@@ -193,15 +152,12 @@ static Datum CallFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- static Datum CallSRFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- 		int nargs, plv8_type argtypes[], plv8_type *rettype);
- static Datum CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv);
--static void GetGlobalContext(Persistent<Context>& global_context);
--static Local<ObjectTemplate> GetGlobalObjectTemplate();
-+static Persistent<Context> GetGlobalContext();
-+static Persistent<ObjectTemplate> GetGlobalObjectTemplate();
- 
- /* A GUC to specify a custom start up function to call */
- static char *plv8_start_proc = NULL;
- 
--/* A GUC to specify V8 flags (e.g. --es_staging) */
--static char *plv8_v8_flags = NULL;
--
- /* A GUC to specify the remote debugger port */
- static int plv8_debugger_port;
- /*
-@@ -235,7 +191,7 @@ void
- _PG_init(void)
- {
- 	HASHCTL    hash_ctl = { 0 };
--
-+	
- 	hash_ctl.keysize = sizeof(Oid);
- 	hash_ctl.entrysize = sizeof(plv8_proc_cache);
- 	hash_ctl.hash = oid_hash;
-@@ -254,18 +210,6 @@ _PG_init(void)
- 							   NULL,
- 							   NULL);
- 
--	DefineCustomStringVariable("plv8.v8_flags",
--							   gettext_noop("V8 engine initialization flags (e.g. --es_staging for additional ES6 features)."),
--							   NULL,
--							   &plv8_v8_flags,
--							   NULL,
--							   PGC_USERSET, 0,
--#if PG_VERSION_NUM >= 90100
--							   NULL,
--#endif
--							   NULL,
--							   NULL);
--
- 	DefineCustomIntVariable("plv8.debugger_port",
- 							gettext_noop("V8 remote debug port."),
- 							gettext_noop("The default value is 35432.  "
-@@ -283,17 +227,6 @@ _PG_init(void)
- 
- 	EmitWarningsOnPlaceholders("plv8");
- 
--	V8::SetArrayBufferAllocator(new Plv8ArrayBufferAllocator);
--
--	V8::InitializeICU();
--	Platform* platform = platform::CreateDefaultPlatform();
--	V8::InitializePlatform(platform);
--	V8::Initialize();
--	if (plv8_v8_flags != NULL) {
--	      V8::SetFlagsFromString(plv8_v8_flags, strlen(plv8_v8_flags));
--	}
--	plv8_isolate = Isolate::New();
--	plv8_isolate->Enter();
- 
- }
- 
-@@ -306,7 +239,8 @@ plv8_xact_cb(XactEvent event, void *arg)
- 	{
- 		if (!env->recv.IsEmpty())
- 		{
--			env->recv.Reset();
-+			env->recv.Dispose();
-+			env->recv.Clear();
- 		}
- 		env = env->next;
- 		/*
-@@ -346,7 +280,7 @@ common_pl_call_handler(PG_FUNCTION_ARGS, Dialect dialect) throw()
- #ifdef ENABLE_DEBUGGER_SUPPORT
- 		Locker				lock;
- #endif  // ENABLE_DEBUGGER_SUPPORT
--		HandleScope	handle_scope(plv8_isolate);
-+		HandleScope	handle_scope;
- 
- 		if (!fcinfo->flinfo->fn_extra)
- 		{
-@@ -405,12 +339,11 @@ common_pl_inline_handler(PG_FUNCTION_ARGS, Dialect dialect) throw()
- #ifdef ENABLE_DEBUGGER_SUPPORT
- 		Locker				lock;
- #endif  // ENABLE_DEBUGGER_SUPPORT
--		HandleScope			handle_scope(plv8_isolate);
-+		HandleScope			handle_scope;
- 		char			   *source_text = codeblock->source_text;
- 
--		Persistent<Context>	global_context;
--		GetGlobalContext(global_context);
--		Local<Function>	function = CompileFunction(global_context,
-+		Handle<Context>	global_context = GetGlobalContext();
-+		Handle<Function>	function = CompileFunction(global_context,
- 										NULL, 0, NULL,
- 										source_text, false, false, dialect);
- 		plv8_exec_env	   *xenv = CreateExecEnv(function);
-@@ -470,7 +403,7 @@ static Datum
- CallFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- 	int nargs, plv8_type argtypes[], plv8_type *rettype)
- {
--	Local<Context>		context = xenv->localContext();
-+	Handle<Context>		context = xenv->context;
- 	Context::Scope		context_scope(context);
- 	Handle<v8::Value>	args[FUNC_MAX_ARGS];
- 	Handle<Object>		plv8obj;
-@@ -497,11 +430,10 @@ CallFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- 			args[i] = ToValue(fcinfo->arg[i], fcinfo->argnull[i], &argtypes[i]);
- 	}
- 
--	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
- 	Local<Function>		fn =
--		Local<Function>::Cast(recv->GetInternalField(0));
-+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
- 	Local<v8::Value> result =
--		DoCall(fn, recv, nargs, args);
-+		DoCall(fn, xenv->recv, nargs, args);
- 
- 	if (rettype)
- 		return ToDatum(result, &fcinfo->isnull, rettype);
-@@ -579,7 +511,7 @@ CallSRFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- 
- 	tupstore = CreateTupleStore(fcinfo, &tupdesc);
- 
--	Handle<Context>		context = xenv->localContext();
-+	Handle<Context>		context = xenv->context;
- 	Context::Scope		context_scope(context);
- 	Converter			conv(tupdesc, proc->functypclass == TYPEFUNC_SCALAR);
- 	Handle<v8::Value>	args[FUNC_MAX_ARGS + 1];
-@@ -593,11 +525,10 @@ CallSRFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
- 	for (int i = 0; i < nargs; i++)
- 		args[i] = ToValue(fcinfo->arg[i], fcinfo->argnull[i], &argtypes[i]);
- 
--	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
- 	Local<Function>		fn =
--		Local<Function>::Cast(recv->GetInternalField(0));
-+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
- 
--	Handle<v8::Value> result = DoCall(fn, recv, nargs, args);
-+	Handle<v8::Value> result = DoCall(fn, xenv->recv, nargs, args);
- 
- 	if (result->IsUndefined())
- 	{
-@@ -643,7 +574,7 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
- 	Handle<v8::Value>	args[10];
- 	Datum				result = (Datum) 0;
- 
--	Handle<Context>		context = xenv->localContext();
-+	Handle<Context>		context = xenv->context;
- 	Context::Scope		context_scope(context);
- 
- 	if (TRIGGER_FIRED_FOR_ROW(event))
-@@ -657,13 +588,13 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
- 			// NEW
- 			args[0] = conv.ToValue(trig->tg_trigtuple);
- 			// OLD
--			args[1] = Undefined(plv8_isolate);
-+			args[1] = Undefined();
- 		}
- 		else if (TRIGGER_FIRED_BY_DELETE(event))
- 		{
- 			result = PointerGetDatum(trig->tg_trigtuple);
- 			// NEW
--			args[0] = Undefined(plv8_isolate);
-+			args[0] = Undefined();
- 			// OLD
- 			args[1] = conv.ToValue(trig->tg_trigtuple);
- 		}
-@@ -678,7 +609,7 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
- 	}
- 	else
- 	{
--		args[0] = args[1] = Undefined(plv8_isolate);
-+		args[0] = args[1] = Undefined();
- 	}
- 
- 	// 2: TG_NAME
-@@ -686,32 +617,32 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
- 
- 	// 3: TG_WHEN
- 	if (TRIGGER_FIRED_BEFORE(event))
--		args[3] = String::NewFromUtf8(plv8_isolate, "BEFORE");
-+		args[3] = String::New("BEFORE");
- 	else
--		args[3] = String::NewFromUtf8(plv8_isolate, "AFTER");
-+		args[3] = String::New("AFTER");
- 
- 	// 4: TG_LEVEL
- 	if (TRIGGER_FIRED_FOR_ROW(event))
--		args[4] = String::NewFromUtf8(plv8_isolate, "ROW");
-+		args[4] = String::New("ROW");
- 	else
--		args[4] = String::NewFromUtf8(plv8_isolate, "STATEMENT");
-+		args[4] = String::New("STATEMENT");
- 
- 	// 5: TG_OP
- 	if (TRIGGER_FIRED_BY_INSERT(event))
--		args[5] = String::NewFromUtf8(plv8_isolate, "INSERT");
-+		args[5] = String::New("INSERT");
- 	else if (TRIGGER_FIRED_BY_DELETE(event))
--		args[5] = String::NewFromUtf8(plv8_isolate, "DELETE");
-+		args[5] = String::New("DELETE");
- 	else if (TRIGGER_FIRED_BY_UPDATE(event))
--		args[5] = String::NewFromUtf8(plv8_isolate, "UPDATE");
-+		args[5] = String::New("UPDATE");
- #ifdef TRIGGER_FIRED_BY_TRUNCATE
- 	else if (TRIGGER_FIRED_BY_TRUNCATE(event))
--		args[5] = String::NewFromUtf8(plv8_isolate, "TRUNCATE");
-+		args[5] = String::New("TRUNCATE");
- #endif
- 	else
--		args[5] = String::NewFromUtf8(plv8_isolate, "?");
-+		args[5] = String::New("?");
- 
- 	// 6: TG_RELID
--	args[6] = Uint32::New(plv8_isolate, RelationGetRelid(rel));
-+	args[6] = Uint32::New(RelationGetRelid(rel));
- 
- 	// 7: TG_TABLE_NAME
- 	args[7] = ToString(RelationGetRelationName(rel));
-@@ -720,17 +651,16 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
- 	args[8] = ToString(get_namespace_name(RelationGetNamespace(rel)));
- 
- 	// 9: TG_ARGV
--	Handle<Array> tgargs = Array::New(plv8_isolate, trig->tg_trigger->tgnargs);
-+	Handle<Array> tgargs = Array::New(trig->tg_trigger->tgnargs);
- 	for (int i = 0; i < trig->tg_trigger->tgnargs; i++)
- 		tgargs->Set(i, ToString(trig->tg_trigger->tgargs[i]));
- 	args[9] = tgargs;
- 
- 	TryCatch			try_catch;
--	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
- 	Local<Function>		fn =
--		Local<Function>::Cast(recv->GetInternalField(0));
-+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
- 	Handle<v8::Value> newtup =
--		DoCall(fn, recv, lengthof(args), args);
-+		DoCall(fn, xenv->recv, lengthof(args), args);
- 
- 	if (newtup.IsEmpty())
- 		throw js_error(try_catch);
-@@ -876,7 +806,8 @@ plv8_get_proc(Oid fn_oid, FunctionCallInfo fcinfo, bool validate, char ***argnam
- 				pfree(cache->prosrc);
- 				cache->prosrc = NULL;
- 			}
--			cache->function.Reset();
-+			cache->function.Dispose();
-+			cache->function.Clear();
- 		}
- 		else
- 		{
-@@ -985,46 +916,10 @@ plv8_get_proc(Oid fn_oid, FunctionCallInfo fcinfo, bool validate, char ***argnam
- }
- 
- static plv8_exec_env *
--CreateExecEnv(Persistent<Function>& function)
--{
--	plv8_exec_env	   *xenv;
--	HandleScope			handle_scope(plv8_isolate);
--
--	PG_TRY();
--	{
--		xenv = plv8_new_exec_env();
--	}
--	PG_CATCH();
--	{
--		throw pg_error();
--	}
--	PG_END_TRY();
--
--	GetGlobalContext(xenv->context);
--	Context::Scope		scope(xenv->localContext());
--
--	static Persistent<ObjectTemplate> recv_templ;
--	if (recv_templ.IsEmpty())
--	{
--		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
--		templ->SetInternalFieldCount(1);
--		recv_templ.Reset(plv8_isolate, templ);
--	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, recv_templ);
--	Local<Object> obj = templ->NewInstance();
--	Local<Function> f = Local<Function>::New(plv8_isolate, function);
--	obj->SetInternalField(0, f);
--	xenv->recv.Reset(plv8_isolate, obj);
--
--
--	return xenv;
--}
--
--static plv8_exec_env *
- CreateExecEnv(Handle<Function> function)
- {
- 	plv8_exec_env	   *xenv;
--	HandleScope			handle_scope(plv8_isolate);
-+	HandleScope			handle_scope;
- 
- 	PG_TRY();
- 	{
-@@ -1036,22 +931,18 @@ CreateExecEnv(Handle<Function> function)
- 	}
- 	PG_END_TRY();
- 
--	GetGlobalContext(xenv->context);
--	Context::Scope		scope(xenv->localContext());
-+	xenv->context = GetGlobalContext();
-+	Context::Scope		scope(xenv->context);
- 
- 	static Persistent<ObjectTemplate> recv_templ;
- 	if (recv_templ.IsEmpty())
- 	{
--		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
--		templ->SetInternalFieldCount(1);
--		recv_templ.Reset(plv8_isolate, templ);
-+		recv_templ = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
-+		recv_templ->SetInternalFieldCount(1);
- 	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, recv_templ);
--	Local<Object> obj = templ->NewInstance();
--	Local<Function> f = Local<Function>::New(plv8_isolate, function);
--	obj->SetInternalField(0, f);
--	xenv->recv.Reset(plv8_isolate, obj);
-+	xenv->recv = Persistent<Object>::New(recv_templ->NewInstance());
- 
-+	xenv->recv->SetInternalField(0, function);
- 
- 	return xenv;
- }
-@@ -1060,14 +951,9 @@ CreateExecEnv(Handle<Function> function)
- static char *
- CompileDialect(const char *src, Dialect dialect)
- {
--	HandleScope		handle_scope(plv8_isolate);
--	static Persistent<Context>	context;
--	if (context.IsEmpty()) {
--	   Local<Context> ctx = Context::New(plv8_isolate, (ExtensionConfiguration*)NULL);
--	   context.Reset(plv8_isolate, ctx);
--	}
--	Local<Context> ctx = Local<Context>::New(plv8_isolate, context);
--	Context::Scope	context_scope(ctx);
-+	HandleScope		handle_scope;
-+	static Persistent<Context>	context = Context::New((ExtensionConfiguration*)NULL);
-+	Context::Scope	context_scope(context);
- 	TryCatch		try_catch;
- 	Local<String>	key;
- 	char		   *cresult;
-@@ -1078,24 +964,24 @@ CompileDialect(const char *src, Dialect dialect)
- 		case PLV8_DIALECT_COFFEE:
- 			if (coffee_script_binary_data[0] == '\0')
- 				throw js_error("CoffeeScript is not enabled");
--			key = String::NewFromUtf8(plv8_isolate, "CoffeeScript", String::kInternalizedString);
-+			key = String::NewSymbol("CoffeeScript");
- 			dialect_binary_data = (const char *) coffee_script_binary_data;
- 			break;
- 		case PLV8_DIALECT_LIVESCRIPT:
- 			if (livescript_binary_data[0] == '\0')
- 				throw js_error("LiveScript is not enabled");
--			key = String::NewFromUtf8(plv8_isolate, "LiveScript", String::kInternalizedString);
-+			key = String::NewSymbol("LiveScript");
- 			dialect_binary_data = (const char *) livescript_binary_data;
- 			break;
- 		default:
- 			throw js_error("Unknown Dialect");
- 	}
- 
--	if (ctx->Global()->Get(key)->IsUndefined())
-+	if (context->Global()->Get(key)->IsUndefined())
- 	{
--		HandleScope		handle_scope(plv8_isolate);
-+		HandleScope		handle_scope;
- 		Local<Script>	script =
--			Script::Compile(ToString(dialect_binary_data), key);
-+			Script::New(ToString(dialect_binary_data), key);
- 		if (script.IsEmpty())
- 			throw js_error(try_catch);
- 		Local<v8::Value>	result = script->Run();
-@@ -1103,9 +989,9 @@ CompileDialect(const char *src, Dialect dialect)
- 			throw js_error(try_catch);
- 	}
- 
--	Local<Object>	compiler = Local<Object>::Cast(ctx->Global()->Get(key));
-+	Local<Object>	compiler = Local<Object>::Cast(context->Global()->Get(key));
- 	Local<Function>	func = Local<Function>::Cast(
--			compiler->Get(String::NewFromUtf8(plv8_isolate, "compile", String::kInternalizedString)));
-+			compiler->Get(String::NewSymbol("compile")));
- 	const int		nargs = 1;
- 	Handle<v8::Value>	args[nargs];
- 
-@@ -1165,10 +1051,9 @@ Compile(Oid fn_oid, FunctionCallInfo fcinfo, bool validate, bool is_trigger,
- 		 * point.  Then some pointers of cache will become stale by pfree
- 		 * and CompileFunction ends up compiling freed function source.
- 		 */
--		HandleScope		handle_scope(plv8_isolate);
--		Persistent<Context>	global_context;
--		GetGlobalContext(global_context);
--		cache->function.Reset(plv8_isolate, CompileFunction(
-+		HandleScope		handle_scope;
-+		Handle<Context>	global_context = GetGlobalContext();
-+		cache->function = Persistent<Function>::New(CompileFunction(
- 						global_context,
- 						cache->proname,
- 						cache->nargs,
-@@ -1184,7 +1069,7 @@ Compile(Oid fn_oid, FunctionCallInfo fcinfo, bool validate, bool is_trigger,
- 
- static Local<Function>
- CompileFunction(
--	Persistent<Context>& global_context,
-+	Handle<Context> global_context,
- 	const char *proname,
- 	int proarglen,
- 	const char *proargs[],
-@@ -1193,7 +1078,7 @@ CompileFunction(
- 	bool retset,
- 	Dialect dialect)
- {
--	EscapableHandleScope		handle_scope(plv8_isolate);
-+	HandleScope		handle_scope;
- 	StringInfoData	src;
- 
- 	initStringInfo(&src);
-@@ -1236,14 +1121,13 @@ CompileFunction(
- 	if (proname)
- 		name = ToString(proname);
- 	else
--		name = Undefined(plv8_isolate);
-+		name = Undefined();
- 	Local<String> source = ToString(src.data, src.len);
- 	pfree(src.data);
- 
--	Local<Context> context = Local<Context>::New(plv8_isolate, global_context);
--	Context::Scope	context_scope(context);
-+	Context::Scope	context_scope(global_context);
- 	TryCatch		try_catch;
--	Local<Script>	script = Script::Compile(source, Handle<String>::Cast(name));
-+	Local<Script>	script = Script::New(source, name);
- 
- 	if (script.IsEmpty())
- 		throw js_error(try_catch);
-@@ -1252,7 +1136,7 @@ CompileFunction(
- 	if (result.IsEmpty())
- 		throw js_error(try_catch);
- 
--	return handle_scope.Escape(Local<Function>::Cast(result));
-+	return handle_scope.Close(Local<Function>::Cast(result));
- }
- 
- Local<Function>
-@@ -1303,7 +1187,7 @@ find_js_function(Oid fn_oid)
- 
- 		TryCatch			try_catch;
- 
--		func = Local<Function>::New(plv8_isolate, proc->cache->function);
-+		func = Local<Function>::New(proc->cache->function);
- 	}
- 	catch (js_error& e) { e.rethrow(); }
- 	catch (pg_error& e) { e.rethrow(); }
-@@ -1378,35 +1262,34 @@ FormatSPIStatus(int status) throw()
- Handle<v8::Value>
- ThrowError(const char *message) throw()
- {
--	return plv8_isolate->ThrowException(Exception::Error(String::NewFromUtf8(plv8_isolate, message)));
-+	return ThrowException(Exception::Error(String::New(message)));
- }
- 
--static void
--GetGlobalContext(Persistent<Context>& global_context)
-+static Persistent<Context>
-+GetGlobalContext()
- {
- 	Oid					user_id = GetUserId();
-+	Persistent<Context>	global_context;
- 	unsigned int		i;
- 
- 	for (i = 0; i < ContextVector.size(); i++)
- 	{
- 		if (ContextVector[i]->user_id == user_id)
- 		{
--			global_context.Reset(plv8_isolate, ContextVector[i]->context);
-+			global_context = ContextVector[i]->context;
- 			break;
- 		}
- 	}
- 	if (global_context.IsEmpty())
- 	{
--		HandleScope				handle_scope(plv8_isolate);
--
--		Local<ObjectTemplate>	global = Local<ObjectTemplate>::New(plv8_isolate, GetGlobalObjectTemplate());
-+		HandleScope				handle_scope;
-+		Handle<ObjectTemplate>	global = GetGlobalObjectTemplate();
- 		plv8_context		   *my_context;
- 
--		global_context.Reset(plv8_isolate, Context::New(plv8_isolate, NULL, global));
-+		global_context = Context::New(NULL, global);
- 		my_context = (plv8_context *) MemoryContextAlloc(TopMemoryContext,
- 														 sizeof(plv8_context));
--		new(&my_context->context) Persistent<Context>();
--		my_context->context.Reset(plv8_isolate, global_context);
-+		my_context->context = global_context;
- 		my_context->user_id = user_id;
- 
- 		/*
-@@ -1422,8 +1305,8 @@ GetGlobalContext(Persistent<Context>& global_context)
- 		{
- 			Local<Function>		func;
- 
--			HandleScope			handle_scope(plv8_isolate);
--			Context::Scope		context_scope(my_context->localContext());
-+			HandleScope			handle_scope;
-+			Context::Scope		context_scope(global_context);
- 			TryCatch			try_catch;
- 			MemoryContext		ctx = CurrentMemoryContext;
- 
-@@ -1446,7 +1329,7 @@ GetGlobalContext(Persistent<Context>& global_context)
- 			if (!func.IsEmpty())
- 			{
- 				Handle<v8::Value>	result =
--					DoCall(func, my_context->localContext()->Global(), 0, NULL);
-+					DoCall(func, global_context->Global(), 0, NULL);
- 				if (result.IsEmpty())
- 					throw js_error(try_catch);
- 			}
-@@ -1462,40 +1345,42 @@ GetGlobalContext(Persistent<Context>& global_context)
- 		v8::Debug::EnableAgent("plv8", plv8_debugger_port, false);
- #endif  // ENABLE_DEBUGGER_SUPPORT
- 	}
-+
-+	return global_context;
- }
- 
--static Local<ObjectTemplate>
-+static Persistent<ObjectTemplate>
- GetGlobalObjectTemplate()
- {
- 	static Persistent<ObjectTemplate>	global;
- 
- 	if (global.IsEmpty())
- 	{
--		HandleScope				handle_scope(plv8_isolate);
-+		HandleScope				handle_scope;
- 
--		Local<ObjectTemplate> templ = ObjectTemplate::New();
-+		global = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
- 		// ERROR levels for elog
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG5", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG5));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG4", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG4));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG3", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG3));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG2", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG2));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG1", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG1));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG5));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "LOG", String::kInternalizedString), Int32::New(plv8_isolate, LOG));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "INFO", String::kInternalizedString), Int32::New(plv8_isolate, INFO));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "NOTICE", String::kInternalizedString), Int32::New(plv8_isolate, NOTICE));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "WARNING", String::kInternalizedString), Int32::New(plv8_isolate, WARNING));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "ERROR", String::kInternalizedString), Int32::New(plv8_isolate, ERROR));
--		global.Reset(plv8_isolate, templ);
-+		global->Set(String::NewSymbol("DEBUG5"), Int32::New(DEBUG5));
-+		global->Set(String::NewSymbol("DEBUG4"), Int32::New(DEBUG4));
-+		global->Set(String::NewSymbol("DEBUG3"), Int32::New(DEBUG3));
-+		global->Set(String::NewSymbol("DEBUG2"), Int32::New(DEBUG2));
-+		global->Set(String::NewSymbol("DEBUG1"), Int32::New(DEBUG1));
-+		global->Set(String::NewSymbol("DEBUG"), Int32::New(DEBUG5));
-+		global->Set(String::NewSymbol("LOG"), Int32::New(LOG));
-+		global->Set(String::NewSymbol("INFO"), Int32::New(INFO));
-+		global->Set(String::NewSymbol("NOTICE"), Int32::New(NOTICE));
-+		global->Set(String::NewSymbol("WARNING"), Int32::New(WARNING));
-+		global->Set(String::NewSymbol("ERROR"), Int32::New(ERROR));
- 
- 		Handle<ObjectTemplate>	plv8 = ObjectTemplate::New();
- 
- 		SetupPlv8Functions(plv8);
--		plv8->Set(String::NewFromUtf8(plv8_isolate, "version", String::kInternalizedString), String::NewFromUtf8(plv8_isolate, PLV8_VERSION));
-+		plv8->Set(String::NewSymbol("version"), String::New(PLV8_VERSION));
- 
--		templ->Set(String::NewFromUtf8(plv8_isolate, "plv8", String::kInternalizedString), plv8);
-+		global->Set(String::NewSymbol("plv8"), plv8);
- 	}
--	return Local<ObjectTemplate>::New(plv8_isolate, global);
-+
-+	return global;
- }
- 
- /*
-@@ -1590,7 +1475,7 @@ Converter::Init()
- Local<Object>
- Converter::ToValue(HeapTuple tuple)
- {
--	Local<Object>	obj = Object::New(plv8_isolate);
-+	Local<Object>	obj = Object::New();
- 
- 	for (int c = 0; c < m_tupdesc->natts; c++)
- 	{
-@@ -1709,7 +1594,7 @@ js_error::js_error(const char *msg) throw()
- 
- js_error::js_error(TryCatch &try_catch) throw()
- {
--	HandleScope			handle_scope(plv8_isolate);
-+	HandleScope			handle_scope;
- 	String::Utf8Value	exception(try_catch.Exception());
- 	Handle<Message>		message = try_catch.Message();
- 
-diff --git a/plv8.h b/plv8.h
-index 665383a..cb116fd 100644
---- a/plv8.h
-+++ b/plv8.h
-@@ -173,16 +173,13 @@ public:
- 		if (WindowObjectIsValid(m_winobj))
- 		{
- 			m_plv8obj = v8::Handle<v8::Object>::Cast(
--					context->Global()->Get(v8::String::NewFromUtf8(
--						context->GetIsolate(),
--						"plv8",
--						v8::String::kInternalizedString)));
-+					context->Global()->Get(v8::String::NewSymbol("plv8")));
- 			if (m_plv8obj.IsEmpty())
- 				throw js_error("plv8 object not found");
- 			/* Stash the current item, just in case of nested call */
- 			m_prev_fcinfo = m_plv8obj->GetInternalField(PLV8_INTNL_FCINFO);
- 			m_plv8obj->SetInternalField(PLV8_INTNL_FCINFO,
--					v8::External::New(context->GetIsolate(), fcinfo));
-+					v8::External::New(fcinfo));
- 		}
- 	}
- 	bool IsWindowCall() { return WindowObjectIsValid(m_winobj); }
-@@ -213,18 +210,15 @@ public:
- 			   Converter *conv, Tuplestorestate *tupstore)
- 	{
- 		m_plv8obj = v8::Handle<v8::Object>::Cast(
--				context->Global()->Get(v8::String::NewFromUtf8(
--					context->GetIsolate(),
--					"plv8",
--					v8::String::kInternalizedString)));
-+				context->Global()->Get(v8::String::NewSymbol("plv8")));
- 		if (m_plv8obj.IsEmpty())
- 			throw js_error("plv8 object not found");
- 		m_prev_conv = m_plv8obj->GetInternalField(PLV8_INTNL_CONV);
- 		m_prev_tupstore = m_plv8obj->GetInternalField(PLV8_INTNL_TUPSTORE);
- 		m_plv8obj->SetInternalField(PLV8_INTNL_CONV,
--									v8::External::New(context->GetIsolate(), conv));
-+									v8::External::New(conv));
- 		m_plv8obj->SetInternalField(PLV8_INTNL_TUPSTORE,
--									v8::External::New(context->GetIsolate(), tupstore));
-+									v8::External::New(tupstore));
- 	}
- 	~SRFSupport()
- 	{
-@@ -234,7 +228,6 @@ public:
- 	}
- };
- 
--extern v8::Isolate* plv8_isolate;
- extern v8::Local<v8::Function> find_js_function(Oid fn_oid);
- extern v8::Local<v8::Function> find_js_function_by_name(const char *signature);
- extern const char *FormatSPIStatus(int status) throw();
-@@ -253,7 +246,7 @@ extern char *ToCStringCopy(const v8::String::Utf8Value &value);
- 
- // plv8_func.cc
- extern v8::Handle<v8::Function> CreateYieldFunction(Converter *conv, Tuplestorestate *tupstore);
--extern void Subtransaction(const v8::FunctionCallbackInfo<v8::Value>& info) throw();
-+extern v8::Handle<v8::Value> Subtransaction(const v8::Arguments& args) throw();
- 
- extern void SetupPlv8Functions(v8::Handle<v8::ObjectTemplate> plv8);
- 
-diff --git a/plv8_func.cc b/plv8_func.cc
-index e74f366..4794cba 100644
---- a/plv8_func.cc
-+++ b/plv8_func.cc
-@@ -32,32 +32,32 @@ extern "C" {
- 
- using namespace v8;
- 
--static void plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value>& args) throw();
--static void plv8_Elog(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_Execute(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_Prepare(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_PlanCursor(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_PlanExecute(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_PlanFree(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_CursorFetch(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_CursorClose(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_ReturnNext(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_Subtransaction(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_FindFunction(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinSetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetCurrentPosition(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetPartitionRowCount(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinSetMarkPosition(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinRowsArePeers(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetFuncArgInPartition(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetFuncArgInFrame(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_WinGetFuncArgCurrent(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_QuoteLiteral(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_QuoteNullable(const FunctionCallbackInfo<v8::Value>& args);
--static void plv8_QuoteIdent(const FunctionCallbackInfo<v8::Value>& args);
-+static Handle<v8::Value> plv8_FunctionInvoker(const Arguments& args) throw();
-+static Handle<v8::Value> plv8_Elog(const Arguments& args);
-+static Handle<v8::Value> plv8_Execute(const Arguments& args);
-+static Handle<v8::Value> plv8_Prepare(const Arguments& args);
-+static Handle<v8::Value> plv8_PlanCursor(const Arguments& args);
-+static Handle<v8::Value> plv8_PlanExecute(const Arguments& args);
-+static Handle<v8::Value> plv8_PlanFree(const Arguments& args);
-+static Handle<v8::Value> plv8_CursorFetch(const Arguments& args);
-+static Handle<v8::Value> plv8_CursorMove(const Arguments& args);
-+static Handle<v8::Value> plv8_CursorClose(const Arguments& args);
-+static Handle<v8::Value> plv8_ReturnNext(const Arguments& args);
-+static Handle<v8::Value> plv8_Subtransaction(const Arguments& args);
-+static Handle<v8::Value> plv8_FindFunction(const Arguments& args);
-+static Handle<v8::Value> plv8_GetWindowObject(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetPartitionLocal(const Arguments& args);
-+static Handle<v8::Value> plv8_WinSetPartitionLocal(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetCurrentPosition(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetPartitionRowCount(const Arguments& args);
-+static Handle<v8::Value> plv8_WinSetMarkPosition(const Arguments& args);
-+static Handle<v8::Value> plv8_WinRowsArePeers(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetFuncArgInPartition(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetFuncArgInFrame(const Arguments& args);
-+static Handle<v8::Value> plv8_WinGetFuncArgCurrent(const Arguments& args);
-+static Handle<v8::Value> plv8_QuoteLiteral(const Arguments& args);
-+static Handle<v8::Value> plv8_QuoteNullable(const Arguments& args);
-+static Handle<v8::Value> plv8_QuoteIdent(const Arguments& args);
- 
- /*
-  * Window function API allows to store partition-local memory, but
-@@ -87,26 +87,26 @@ quote_literal_cstr(const char *rawstr)
- #endif
- 
- static inline Local<v8::Value>
--WrapCallback(FunctionCallback func)
-+WrapCallback(InvocationCallback func)
- {
--	return External::New(plv8_isolate,
-+	return External::New(
- 			reinterpret_cast<void *>(
- 				reinterpret_cast<uintptr_t>(func)));
- }
- 
--static inline FunctionCallback
-+static inline InvocationCallback
- UnwrapCallback(Handle<v8::Value> value)
- {
--	return reinterpret_cast<FunctionCallback>(
-+	return reinterpret_cast<InvocationCallback>(
- 			reinterpret_cast<uintptr_t>(External::Cast(*value)->Value()));
- }
- 
- static inline void
- SetCallback(Handle<ObjectTemplate> obj, const char *name,
--			FunctionCallback func, PropertyAttribute attr = None)
-+			InvocationCallback func, PropertyAttribute attr = None)
- {
--	obj->Set(String::NewFromUtf8(plv8_isolate, name, String::kInternalizedString),
--				FunctionTemplate::New(plv8_isolate, plv8_FunctionInvoker,
-+	obj->Set(String::NewSymbol(name),
-+				FunctionTemplate::New(plv8_FunctionInvoker,
- 					WrapCallback(func)), attr);
- }
- 
-@@ -127,10 +127,8 @@ SPIResultToValue(int status)
- {
- 	Local<v8::Value>	result;
- 
--	if (status < 0) {
--		plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, FormatSPIStatus(status)));
--		return result;
--	}
-+	if (status < 0)
-+		return ThrowError(FormatSPIStatus(status));
- 
- 	switch (status)
- 	{
-@@ -141,7 +139,7 @@ SPIResultToValue(int status)
- 	{
- 		int				nrows = SPI_processed;
- 		Converter		conv(SPI_tuptable->tupdesc);
--		Local<Array>	rows = Array::New(plv8_isolate, nrows);
-+		Local<Array>	rows = Array::New(nrows);
- 
- 		for (int r = 0; r < nrows; r++)
- 			rows->Set(r, conv.ToValue(SPI_tuptable->vals[r]));
-@@ -150,7 +148,7 @@ SPIResultToValue(int status)
- 		break;
- 	}
- 	default:
--		result = Int32::New(plv8_isolate, SPI_processed);
-+		result = Int32::New(SPI_processed);
- 		break;
- 	}
- 
-@@ -180,9 +178,9 @@ SubTranBlock::exit(bool success)
- 
- JSONObject::JSONObject()
- {
--	Handle<Context> context = plv8_isolate->GetCurrentContext();
-+	Handle<Context> context = Context::GetCurrent();
- 	Handle<Object> global = context->Global();
--	m_json = global->Get(String::NewFromUtf8(plv8_isolate, "JSON", String::kInternalizedString))->ToObject();
-+	m_json = global->Get(String::NewSymbol("JSON"))->ToObject();
- 	if (m_json.IsEmpty())
- 		throw js_error("JSON not found");
- }
-@@ -194,7 +192,7 @@ Handle<v8::Value>
- JSONObject::Parse(Handle<v8::Value> str)
- {
- 	Handle<Function> parse_func =
--		Handle<Function>::Cast(m_json->Get(String::NewFromUtf8(plv8_isolate, "parse", String::kInternalizedString)));
-+		Handle<Function>::Cast(m_json->Get(String::NewSymbol("parse")));
- 
- 	if (parse_func.IsEmpty())
- 		throw js_error("JSON.parse() not found");
-@@ -209,7 +207,7 @@ Handle<v8::Value>
- JSONObject::Stringify(Handle<v8::Value> val)
- {
- 	Handle<Function> stringify_func =
--		Handle<Function>::Cast(m_json->Get(String::NewFromUtf8(plv8_isolate, "stringify", String::kInternalizedString)));
-+		Handle<Function>::Cast(m_json->Get(String::NewSymbol("stringify")));
- 
- 	if (stringify_func.IsEmpty())
- 		throw js_error("JSON.stringify() not found");
-@@ -241,12 +239,12 @@ SetupPlv8Functions(Handle<ObjectTemplate> plv8)
-  * v8 is not exception-safe! We cannot throw C++ exceptions over v8 functions.
-  * So, we catch C++ exceptions and convert them to JavaScript ones.
-  */
--static void
--plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value> &args) throw()
-+static Handle<v8::Value>
-+plv8_FunctionInvoker(const Arguments &args) throw()
- {
--	HandleScope		handle_scope(plv8_isolate);
-+	HandleScope		handle_scope;
- 	MemoryContext	ctx = CurrentMemoryContext;
--	FunctionCallback	fn = UnwrapCallback(args.Data());
-+	InvocationCallback	fn = UnwrapCallback(args.Data());
- 
- 	try
- 	{
-@@ -254,7 +252,7 @@ plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value> &args) throw()
- 	}
- 	catch (js_error& e)
- 	{
--		args.GetReturnValue().Set(plv8_isolate->ThrowException(e.error_object()));
-+		return ThrowException(e.error_object());
- 	}
- 	catch (pg_error& e)
- 	{
-@@ -265,15 +263,15 @@ plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value> &args) throw()
- 		Handle<String> sqlerrcode = ToString(unpack_sql_state(edata->sqlerrcode));
- #if PG_VERSION_NUM >= 90300
- 		Handle<Primitive> schema_name = edata->schema_name ?
--			Handle<Primitive>(ToString(edata->schema_name)) : Null(plv8_isolate);
-+			Handle<Primitive>(ToString(edata->schema_name)) : Null();
- 		Handle<Primitive> table_name = edata->table_name ?
--			Handle<Primitive>(ToString(edata->table_name)) : Null(plv8_isolate);
-+			Handle<Primitive>(ToString(edata->table_name)) : Null();
- 		Handle<Primitive> column_name = edata->column_name ?
--			Handle<Primitive>(ToString(edata->column_name)) : Null(plv8_isolate);
-+			Handle<Primitive>(ToString(edata->column_name)) : Null();
- 		Handle<Primitive> datatype_name = edata->datatype_name ?
--			Handle<Primitive>(ToString(edata->datatype_name)) : Null(plv8_isolate);
-+			Handle<Primitive>(ToString(edata->datatype_name)) : Null();
- 		Handle<Primitive> constraint_name = edata->constraint_name ?
--			Handle<Primitive>(ToString(edata->constraint_name)) : Null(plv8_isolate);
-+			Handle<Primitive>(ToString(edata->constraint_name)) : Null();
- #endif
- 
- 		// XXX: add other fields? (detail, hint, context, internalquery...)
-@@ -281,31 +279,29 @@ plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value> &args) throw()
- 		FreeErrorData(edata);
- 
- 		Handle<v8::Object> err = Exception::Error(message)->ToObject();
--		err->Set(String::NewFromUtf8(plv8_isolate, "sqlerrcode"), sqlerrcode);
-+		err->Set(String::New("sqlerrcode"), sqlerrcode);
- #if PG_VERSION_NUM >= 90300
--		err->Set(String::NewFromUtf8(plv8_isolate, "schema_name"), schema_name);
--		err->Set(String::NewFromUtf8(plv8_isolate, "table_name"), table_name);
--		err->Set(String::NewFromUtf8(plv8_isolate, "column_name"), column_name);
--		err->Set(String::NewFromUtf8(plv8_isolate, "datatype_name"), datatype_name);
--		err->Set(String::NewFromUtf8(plv8_isolate, "constraint_name"), constraint_name);
-+		err->Set(String::New("schema_name"), schema_name);
-+		err->Set(String::New("table_name"), table_name);
-+		err->Set(String::New("column_name"), column_name);
-+		err->Set(String::New("datatype_name"), datatype_name);
-+		err->Set(String::New("constraint_name"), constraint_name);
- #endif
- 
--		args.GetReturnValue().Set(plv8_isolate->ThrowException(err));
-+		return ThrowException(Exception::Error(message));
- 	}
- }
- 
- /*
-  * plv8.elog(elevel, str)
-  */
--static void
--plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_Elog(const Arguments& args)
- {
- 	MemoryContext	ctx = CurrentMemoryContext;
- 
--	if (args.Length() < 2) {
--		args.GetReturnValue().Set(plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, "usage: plv8.elog(elevel, ...)")));
--		return;
--	}
-+	if (args.Length() < 2)
-+		return ThrowError("usage: plv8.elog(elevel, ...)");
- 
- 	int	elevel = args[0]->Int32Value();
- 	switch (elevel)
-@@ -322,8 +318,7 @@ plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
- 	case ERROR:
- 		break;
- 	default:
--		args.GetReturnValue().Set(plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, "invalid error level")));
--		return;
-+		return ThrowError("invalid error level");
- 	}
- 
- 	std::string msg;
-@@ -334,8 +329,7 @@ plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
- 			msg += " ";
- 		}
- 		if (!CString::toStdString(args[i],buf)){
--			args.GetReturnValue().Set(Undefined(plv8_isolate));
--			return;
-+			return Undefined();
- 		}
- 		msg += buf;
- 	}
-@@ -344,8 +338,7 @@ plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
- 	if (elevel != ERROR)
- 	{
- 		elog(elevel, "%s", message);
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
-+		return Undefined();
- 	}
- 
- 	/* ERROR case */
-@@ -361,12 +354,11 @@ plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
- 		FlushErrorState();
- 		FreeErrorData(edata);
- 
--		args.GetReturnValue().Set(plv8_isolate->ThrowException(Exception::Error(message)));
--		return;
-+		return ThrowException(Exception::Error(message));
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- static Datum
-@@ -451,9 +443,9 @@ plv8_execute_params(const char *sql, Handle<Array> params)
- }
- 
- static Handle<Array>
--convertArgsToArray(const FunctionCallbackInfo<v8::Value> &args, int start, int downshift)
-+convertArgsToArray(const Arguments &args, int start, int downshift)
- {
--	Local<Array> result = Array::New(plv8_isolate, args.Length() - start);
-+	Local<Array> result = Array::New(args.Length() - start);
- 	for (int i = start; i < args.Length(); i++)
- 	{
- 		result->Set(i - downshift, args[i]);
-@@ -464,15 +456,13 @@ convertArgsToArray(const FunctionCallbackInfo<v8::Value> &args, int start, int d
- /*
-  * plv8.execute(statement, [param, ...])
-  */
--static void
--plv8_Execute(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_Execute(const Arguments &args)
- {
- 	int				status;
- 
--	if (args.Length() < 1) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 
- 	CString			sql(args[0]);
- 	Handle<Array>	params;
-@@ -507,14 +497,14 @@ plv8_Execute(const FunctionCallbackInfo<v8::Value> &args)
- 
- 	subtran.exit(true);
- 
--	args.GetReturnValue().Set(SPIResultToValue(status));
-+	return SPIResultToValue(status);
- }
- 
- /*
-  * plv8.prepare(statement, args...)
-  */
--static void
--plv8_Prepare(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_Prepare(const Arguments &args)
- {
- 	SPIPlanPtr		initial = NULL, saved;
- 	CString			sql(args[0]);
-@@ -570,29 +560,28 @@ plv8_Prepare(const FunctionCallbackInfo<v8::Value> &args)
- 
- 	if (PlanTemplate.IsEmpty())
- 	{
--		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
--		base->SetClassName(String::NewFromUtf8(plv8_isolate, "PreparedPlan", String::kInternalizedString));
-+		Local<FunctionTemplate> base = FunctionTemplate::New();
-+		base->SetClassName(String::NewSymbol("PreparedPlan"));
- 		Local<ObjectTemplate> templ = base->InstanceTemplate();
- 		templ->SetInternalFieldCount(2);
- 		SetCallback(templ, "cursor", plv8_PlanCursor);
- 		SetCallback(templ, "execute", plv8_PlanExecute);
- 		SetCallback(templ, "free", plv8_PlanFree);
--		PlanTemplate.Reset(plv8_isolate, templ);
-+		PlanTemplate = Persistent<ObjectTemplate>::New(templ);
- 	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, PlanTemplate);
- 
--	Local<v8::Object> result = templ->NewInstance();
--	result->SetInternalField(0, External::New(plv8_isolate, saved));
--	result->SetInternalField(1, External::New(plv8_isolate, parstate));
-+	Local<v8::Object> result = PlanTemplate->NewInstance();
-+	result->SetInternalField(0, External::New(saved));
-+	result->SetInternalField(1, External::New(parstate));
- 
--	args.GetReturnValue().Set(result);
-+	return result;
- }
- 
- /*
-  * plan.cursor(args, ...)
-  */
--static void
--plv8_PlanCursor(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_PlanCursor(const Arguments &args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	SPIPlanPtr			plan;
-@@ -692,28 +681,27 @@ plv8_PlanCursor(const FunctionCallbackInfo<v8::Value> &args)
- 	 */
- 	if (CursorTemplate.IsEmpty())
- 	{
--		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
--		base->SetClassName(String::NewFromUtf8(plv8_isolate, "Cursor", String::kInternalizedString));
-+		Local<FunctionTemplate> base = FunctionTemplate::New();
-+		base->SetClassName(String::NewSymbol("Cursor"));
- 		Local<ObjectTemplate> templ = base->InstanceTemplate();
- 		templ->SetInternalFieldCount(1);
- 		SetCallback(templ, "fetch", plv8_CursorFetch);
- 		SetCallback(templ, "move", plv8_CursorMove);
- 		SetCallback(templ, "close", plv8_CursorClose);
--		CursorTemplate.Reset(plv8_isolate, templ);
-+		CursorTemplate = Persistent<ObjectTemplate>::New(templ);
- 	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, CursorTemplate);
- 
--	Local<v8::Object> result = templ->NewInstance();
-+	Local<v8::Object> result = CursorTemplate->NewInstance();
- 	result->SetInternalField(0, cname);
- 
--	args.GetReturnValue().Set(result);
-+	return result;
- }
- 
- /*
-  * plan.execute(args, ...)
-  */
--static void
--plv8_PlanExecute(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_PlanExecute(const Arguments &args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	SPIPlanPtr			plan;
-@@ -802,7 +790,7 @@ plv8_PlanExecute(const FunctionCallbackInfo<v8::Value> &args)
- 
- 	subtran.exit(true);
- 
--	args.GetReturnValue().Set(SPIResultToValue(status));
-+	return SPIResultToValue(status);
- 
- 
- }
-@@ -810,8 +798,8 @@ plv8_PlanExecute(const FunctionCallbackInfo<v8::Value> &args)
- /*
-  * plan.free()
-  */
--static void
--plv8_PlanFree(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_PlanFree(const Arguments &args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	SPIPlanPtr			plan;
-@@ -824,23 +812,23 @@ plv8_PlanFree(const FunctionCallbackInfo<v8::Value> &args)
- 	if (plan)
- 		status = SPI_freeplan(plan);
- 
--	self->SetInternalField(0, External::New(plv8_isolate, 0));
-+	self->SetInternalField(0, External::New(0));
- 
- 	parstate = static_cast<plv8_param_state *>(
- 			Handle<External>::Cast(self->GetInternalField(1))->Value());
- 
- 	if (parstate)
- 		pfree(parstate);
--	self->SetInternalField(1, External::New(plv8_isolate, 0));
-+	self->SetInternalField(1, External::New(0));
- 
--	args.GetReturnValue().Set(Int32::New(plv8_isolate, status));
-+	return Int32::New(status);
- }
- 
- /*
-  * cursor.fetch([n])
-  */
--static void
--plv8_CursorFetch(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_CursorFetch(const Arguments &args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	CString				cname(self->GetInternalField(0));
-@@ -879,31 +867,26 @@ plv8_CursorFetch(const FunctionCallbackInfo<v8::Value> &args)
- 		if (!wantarray)
- 		{
- 			Handle<v8::Object>	result = conv.ToValue(SPI_tuptable->vals[0]);
--			args.GetReturnValue().Set(result);
--			SPI_freetuptable(SPI_tuptable);
--
--			return;
-+			return result;
- 		}
- 		else
- 		{
--			Handle<Array> array = Array::New(plv8_isolate);
-+			Handle<Array> array = Array::New();
- 			for (unsigned int i = 0; i < SPI_processed; i++)
- 				array->Set(i, conv.ToValue(SPI_tuptable->vals[i]));
--			args.GetReturnValue().Set(array);
--			SPI_freetuptable(SPI_tuptable);
--			return;
-+			return array;
- 		}
- 	}
- 
- 	SPI_freetuptable(SPI_tuptable);
--	args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- /*
-  * cursor.move(n)
-  */
--static void
--plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_CursorMove(const Arguments& args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	CString				cname(self->GetInternalField(0));
-@@ -914,10 +897,8 @@ plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args)
- 	if (!cursor)
- 		throw js_error("cannot find cursor");
- 
--	if (args.Length() < 1) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 
- 	nmove = args[0]->Int32Value();
- 	if (nmove < 0)
-@@ -936,14 +917,14 @@ plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- /*
-  * cursor.close()
-  */
--static void
--plv8_CursorClose(const FunctionCallbackInfo<v8::Value> &args)
-+static Handle<v8::Value>
-+plv8_CursorClose(const Arguments &args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	CString				cname(self->GetInternalField(0));
-@@ -962,14 +943,14 @@ plv8_CursorClose(const FunctionCallbackInfo<v8::Value> &args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Int32::New(plv8_isolate, cursor ? 1 : 0));
-+	return Int32::New(cursor ? 1 : 0);
- }
- 
- /*
-  * plv8.return_next(retval)
-  */
--static void
--plv8_ReturnNext(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_ReturnNext(const Arguments& args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	Handle<v8::Value>	conv_value = self->GetInternalField(PLV8_INTNL_CONV);
-@@ -986,23 +967,19 @@ plv8_ReturnNext(const FunctionCallbackInfo<v8::Value>& args)
- 
- 	conv->ToDatum(args[0], tupstore);
- 
--	args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- /*
-  * plv8.subtransaction(func(){ ... })
-  */
--static void
--plv8_Subtransaction(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_Subtransaction(const Arguments& args)
- {
--	if (args.Length() < 1) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
--	if (!args[0]->IsFunction()) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
-+	if (!args[0]->IsFunction())
-+		return Undefined();
- 	Handle<Function>	func = Handle<Function>::Cast(args[0]);
- 	SubTranBlock		subtran;
- 
-@@ -1016,19 +993,17 @@ plv8_Subtransaction(const FunctionCallbackInfo<v8::Value>& args)
- 
- 	if (result.IsEmpty())
- 		throw js_error(try_catch);
--	args.GetReturnValue().Set(result);
-+	return result;
- }
- 
- /*
-  * plv8.find_function("signature")
-  */
--static void
--plv8_FindFunction(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_FindFunction(const Arguments& args)
- {
--	if (args.Length() < 1) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 	CString				signature(args[0]);
- 	Local<Function>		func;
- 
-@@ -1042,15 +1017,15 @@ plv8_FindFunction(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(func);
-+	return func;
- }
- 
- /*
-  * plv8.get_window_object()
-  * Returns window object in window functions, which provides window function API.
-  */
--static void
--plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_GetWindowObject(const Arguments& args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	Handle<v8::Value>	fcinfo_value =
-@@ -1062,8 +1037,8 @@ plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args)
- 	if (WindowObjectTemplate.IsEmpty())
- 	{
- 		/* Initialize it if we haven't yet. */
--		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
--		base->SetClassName(String::NewFromUtf8(plv8_isolate, "WindowObject", String::kInternalizedString));
-+		Local<FunctionTemplate> base = FunctionTemplate::New();
-+		base->SetClassName(String::NewSymbol("WindowObject"));
- 		Local<ObjectTemplate> templ = base->InstanceTemplate();
- 
- 		/* We store fcinfo here. */
-@@ -1081,25 +1056,24 @@ plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args)
- 		SetCallback(templ, "get_func_arg_current", plv8_WinGetFuncArgCurrent);
- 
- 		/* Constants for get_func_in_XXX() */
--		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_CURRENT", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_CURRENT));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_HEAD", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_HEAD));
--		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_TAIL", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_TAIL));
-+		templ->Set(String::NewSymbol("SEEK_CURRENT"), Int32::New(WINDOW_SEEK_CURRENT));
-+		templ->Set(String::NewSymbol("SEEK_HEAD"), Int32::New(WINDOW_SEEK_HEAD));
-+		templ->Set(String::NewSymbol("SEEK_TAIL"), Int32::New(WINDOW_SEEK_TAIL));
- 
--		WindowObjectTemplate.Reset(plv8_isolate, templ);
-+		WindowObjectTemplate = Persistent<ObjectTemplate>::New(templ);
- 	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, WindowObjectTemplate);
- 
--	Local<v8::Object> js_winobj = templ->NewInstance();
-+	Local<v8::Object> js_winobj = WindowObjectTemplate->NewInstance();
- 	js_winobj->SetInternalField(0, fcinfo_value);
- 
--	args.GetReturnValue().Set(js_winobj);
-+	return js_winobj;
- }
- 
- /*
-  * Short-cut routine for window function API
-  */
- static inline WindowObject
--plv8_MyWindowObject(const FunctionCallbackInfo<v8::Value>& args)
-+plv8_MyWindowObject(const Arguments& args)
- {
- 	Handle<v8::Object>	self = args.This();
- 	/* fcinfo is embedded in the internal field.  See plv8_GetWindowObject() */
-@@ -1122,7 +1096,7 @@ plv8_MyWindowObject(const FunctionCallbackInfo<v8::Value>& args)
-  * argument information enough.  Thus, we obtain it from function expression.
-  */
- static inline plv8_type *
--plv8_MyArgType(const FunctionCallbackInfo<v8::Value>& args, int argno)
-+plv8_MyArgType(const Arguments& args, int argno)
- {
- 	Handle<v8::Object>	self = args.This();
- 	FunctionCallInfo fcinfo = static_cast<FunctionCallInfo>(
-@@ -1140,8 +1114,8 @@ plv8_MyArgType(const FunctionCallbackInfo<v8::Value>& args, int argno)
-  * The default allocation size is 1K, but the caller can override this value
-  * by the argument at the first call.
-  */
--static void
--plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetPartitionLocal(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 	size_t			size;
-@@ -1169,10 +1143,8 @@ plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
- 		storage->maxlen = size;
- 
- 	/* If nothing is stored, undefined is returned. */
--	if (storage->len == 0) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (storage->len == 0)
-+		return Undefined();
- 
- 	/*
- 	 * Currently we support only serializable JSON object to be stored.
-@@ -1180,7 +1152,7 @@ plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
- 	JSONObject JSON;
- 	Handle<v8::Value> value = ToString(storage->data, storage->len);
- 
--	args.GetReturnValue().Set(JSON.Parse(value));
-+	return JSON.Parse(value);
- }
- 
- /*
-@@ -1188,15 +1160,13 @@ plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
-  * If the storage has not been allocated, it's allocated based on the
-  * size of JSON-ized input string.
-  */
--static void
--plv8_WinSetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinSetPartitionLocal(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 
--	if (args.Length() < 1) {
--		args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 
- 	JSONObject JSON;
- 	Handle<v8::Value> value = JSON.Stringify(args[0]);
-@@ -1227,14 +1197,14 @@ plv8_WinSetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
- 	storage->len = str_size;
- 	memcpy(storage->data, str, str_size);
- 
--        args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- /*
-  * winobj.get_current_position()
-  */
--static void
--plv8_WinGetCurrentPosition(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetCurrentPosition(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 	int64			pos = 0;
-@@ -1249,14 +1219,14 @@ plv8_WinGetCurrentPosition(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Integer::New(plv8_isolate, pos));
-+	return Integer::New(pos);
- }
- 
- /*
-  * winobj.get_partition_row_count()
-  */
--static void
--plv8_WinGetPartitionRowCount(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetPartitionRowCount(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 	int64			pos = 0;
-@@ -1271,20 +1241,18 @@ plv8_WinGetPartitionRowCount(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Integer::New(plv8_isolate, pos));
-+	return Integer::New(pos);
- }
- 
- /*
-  * winobj.set_mark_pos(pos)
-  */
--static void
--plv8_WinSetMarkPosition(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinSetMarkPosition(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
--	if (args.Length() < 1) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--        }
-+	if (args.Length() < 1)
-+		return Undefined();
- 	int64		markpos = args[0]->IntegerValue();
- 
- 	PG_TRY();
-@@ -1297,20 +1265,18 @@ plv8_WinSetMarkPosition(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--        args.GetReturnValue().Set(Undefined(plv8_isolate));
-+	return Undefined();
- }
- 
- /*
-  * winobj.rows_are_peers(pos1, pos2)
-  */
--static void
--plv8_WinRowsArePeers(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinRowsArePeers(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
--	if (args.Length() < 2) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 2)
-+		return Undefined();
- 	int64		pos1 = args[0]->IntegerValue();
- 	int64		pos2 = args[1]->IntegerValue();
- 	bool		res = false;
-@@ -1325,14 +1291,14 @@ plv8_WinRowsArePeers(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(Boolean::New(plv8_isolate, res));
-+	return Boolean::New(res);
- }
- 
- /*
-  * winobj.get_func_arg_in_partition(argno, relpos, seektype, set_mark)
-  */
--static void
--plv8_WinGetFuncArgInPartition(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetFuncArgInPartition(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 	/* Since we return undefined in "isout" case, throw if arg isn't enough. */
-@@ -1362,21 +1328,19 @@ plv8_WinGetFuncArgInPartition(const FunctionCallbackInfo<v8::Value>& args)
- 	PG_END_TRY();
- 
- 	/* Return undefined to tell it's out of partition. */
--	if (isout) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (isout)
-+		return Undefined();
- 
- 	plv8_type *type = plv8_MyArgType(args, argno);
- 
--	args.GetReturnValue().Set(ToValue(res, isnull, type));
-+	return ToValue(res, isnull, type);
- }
- 
- /*
-  * winobj.get_func_arg_in_frame(argno, relpos, seektype, set_mark)
-  */
--static void
--plv8_WinGetFuncArgInFrame(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetFuncArgInFrame(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
- 	/* Since we return undefined in "isout" case, throw if arg isn't enough. */
-@@ -1406,27 +1370,23 @@ plv8_WinGetFuncArgInFrame(const FunctionCallbackInfo<v8::Value>& args)
- 	PG_END_TRY();
- 
- 	/* Return undefined to tell it's out of frame. */
--	if (isout) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (isout)
-+		return Undefined();
- 
- 	plv8_type *type = plv8_MyArgType(args, argno);
- 
--	args.GetReturnValue().Set(ToValue(res, isnull, type));
-+	return ToValue(res, isnull, type);
- }
- 
- /*
-  * winobj.get_func_arg_current(argno)
-  */
--static void
--plv8_WinGetFuncArgCurrent(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_WinGetFuncArgCurrent(const Arguments& args)
- {
- 	WindowObject	winobj = plv8_MyWindowObject(args);
--	if (args.Length() < 1) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--        }
-+	if (args.Length() < 1)
-+		return Undefined();
- 	int			argno = args[0]->Int32Value();
- 	bool		isnull;
- 	Datum		res;
-@@ -1445,19 +1405,17 @@ plv8_WinGetFuncArgCurrent(const FunctionCallbackInfo<v8::Value>& args)
- 
- 	plv8_type *type = plv8_MyArgType(args, argno);
- 
--	args.GetReturnValue().Set(ToValue(res, isnull, type));
-+	return ToValue(res, isnull, type);
- }
- 
- /*
-  * plv8.quote_literal(str)
-  */
--static void
--plv8_QuoteLiteral(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_QuoteLiteral(const Arguments& args)
- {
--	if (args.Length() < 1) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 	CString			instr(args[0]);
- 	char		   *result;
- 
-@@ -1471,26 +1429,22 @@ plv8_QuoteLiteral(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(ToString(result));
-+	return ToString(result);
- }
- 
- /*
-  * plv8.quote_nullable(str)
-  */
--static void
--plv8_QuoteNullable(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_QuoteNullable(const Arguments& args)
- {
--	if (args.Length() < 1) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 	CString			instr(args[0]);
- 	char		   *result;
- 
--	if (args[0]->IsNull() || args[0]->IsUndefined()) {
--		args.GetReturnValue().Set(ToString("NULL"));
--		return;
--	}
-+	if (args[0]->IsNull() || args[0]->IsUndefined())
-+		return ToString("NULL");
- 
- 	PG_TRY();
- 	{
-@@ -1502,19 +1456,17 @@ plv8_QuoteNullable(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(ToString(result));
-+	return ToString(result);
- }
- 
- /*
-  * plv8.quote_ident(str)
-  */
--static void
--plv8_QuoteIdent(const FunctionCallbackInfo<v8::Value>& args)
-+static Handle<v8::Value>
-+plv8_QuoteIdent(const Arguments& args)
- {
--	if (args.Length() < 1) {
--                args.GetReturnValue().Set(Undefined(plv8_isolate));
--		return;
--	}
-+	if (args.Length() < 1)
-+		return Undefined();
- 	CString			instr(args[0]);
- 	const char	   *result;
- 
-@@ -1528,5 +1480,5 @@ plv8_QuoteIdent(const FunctionCallbackInfo<v8::Value>& args)
- 	}
- 	PG_END_TRY();
- 
--	args.GetReturnValue().Set(ToString(result));
-+	return ToString(result);
- }
-diff --git a/plv8_type.cc b/plv8_type.cc
-index 9b79570..3989570 100644
---- a/plv8_type.cc
-+++ b/plv8_type.cc
-@@ -30,10 +30,6 @@ extern "C" {
- #include "utils/syscache.h"
- #include "utils/typcache.h"
- 
--#if PG_VERSION_NUM >= 90400
--#include "utils/jsonb.h"
--#endif
--
- #undef delete
- #undef namespace
- #undef typeid
-@@ -170,12 +166,11 @@ CreateExternalArray(void *data, ExternalArrayType array_type, int byte_size,
- 
- 	if (externalArray.IsEmpty())
- 	{
--		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
--		templ->SetInternalFieldCount(1);
--		externalArray.Reset(plv8_isolate, templ);
-+		externalArray = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
-+		externalArray->SetInternalFieldCount(1);
- 	}
--	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, externalArray);
--	Local<Object> array = templ->NewInstance();
-+
-+	Local<Object> array = externalArray->NewInstance();
- 	int		length;
- 
- 	switch (array_type)
-@@ -203,8 +198,8 @@ CreateExternalArray(void *data, ExternalArrayType array_type, int byte_size,
- 	}
- 	array->SetIndexedPropertiesToExternalArrayData(
- 			data, array_type, length);
--	array->ForceSet(String::NewFromUtf8(plv8_isolate, "length"), Int32::New(plv8_isolate, length), ReadOnly);
--	array->SetInternalField(0, External::New(plv8_isolate, DatumGetPointer(datum)));
-+	array->Set(String::New("length"), Int32::New(length), ReadOnly);
-+	array->SetInternalField(0, External::New(DatumGetPointer(datum)));
- 
- 	return array;
- }
-@@ -449,7 +444,7 @@ Local<v8::Value>
- ToValue(Datum datum, bool isnull, plv8_type *type)
- {
- 	if (isnull)
--		return Local<v8::Value>::New(plv8_isolate, Null(plv8_isolate));
-+		return Local<v8::Value>(*Null());
- 	else if (type->category == TYPCATEGORY_ARRAY || type->typid == RECORDARRAYOID)
- 		return ToArrayValue(datum, isnull, type);
- 	else if (type->category == TYPCATEGORY_COMPOSITE || type->typid == RECORDOID)
-@@ -464,27 +459,27 @@ ToScalarValue(Datum datum, bool isnull, plv8_type *type)
- 	switch (type->typid)
- 	{
- 	case OIDOID:
--		return Uint32::New(plv8_isolate, DatumGetObjectId(datum));
-+		return Uint32::New(DatumGetObjectId(datum));
- 	case BOOLOID:
--		return Boolean::New(plv8_isolate, DatumGetBool(datum));
-+		return Local<v8::Value>(*(Boolean::New((bool) DatumGetBool(datum))));
- 	case INT2OID:
--		return Int32::New(plv8_isolate, DatumGetInt16(datum));
-+		return Int32::New(DatumGetInt16(datum));
- 	case INT4OID:
--		return Int32::New(plv8_isolate, DatumGetInt32(datum));
-+		return Int32::New(DatumGetInt32(datum));
- 	case INT8OID:
--		return Number::New(plv8_isolate, DatumGetInt64(datum));
-+		return Number::New(DatumGetInt64(datum));
- 	case FLOAT4OID:
--		return Number::New(plv8_isolate, DatumGetFloat4(datum));
-+		return Number::New(DatumGetFloat4(datum));
- 	case FLOAT8OID:
--		return Number::New(plv8_isolate, DatumGetFloat8(datum));
-+		return Number::New(DatumGetFloat8(datum));
- 	case NUMERICOID:
--		return Number::New(plv8_isolate, DatumGetFloat8(
-+		return Number::New(DatumGetFloat8(
- 			DirectFunctionCall1(numeric_float8, datum)));
- 	case DATEOID:
--		return Date::New(plv8_isolate, DateToEpoch(DatumGetDateADT(datum)));
-+		return Date::New(DateToEpoch(DatumGetDateADT(datum)));
- 	case TIMESTAMPOID:
- 	case TIMESTAMPTZOID:
--		return Date::New(plv8_isolate, TimestampTzToEpoch(DatumGetTimestampTz(datum)));
-+		return Date::New(TimestampTzToEpoch(DatumGetTimestampTz(datum)));
- 	case TEXTOID:
- 	case VARCHAROID:
- 	case BPCHAROID:
-@@ -518,7 +513,7 @@ ToScalarValue(Datum datum, bool isnull, plv8_type *type)
- 
- 		Local<v8::Value>	jsonString = ToString(str, len);
- 		JSONObject JSON;
--		Local<v8::Value> result = Local<v8::Value>::New(plv8_isolate, JSON.Parse(jsonString));
-+		Local<v8::Value> result = Local<v8::Value>::New(JSON.Parse(jsonString));
- 
- 		if (p != DatumGetPointer(datum))
- 			pfree(p);	// free if detoasted
-@@ -530,7 +525,7 @@ ToScalarValue(Datum datum, bool isnull, plv8_type *type)
- 	{
- 		Local<v8::Value>	jsonString = ToString(datum, type);
- 		JSONObject JSON;
--		Local<v8::Value> result = Local<v8::Value>::New(plv8_isolate, JSON.Parse(jsonString));
-+		Local<v8::Value> result = Local<v8::Value>::New(JSON.Parse(jsonString));
- 
- 		return result;
- 	}
-@@ -574,7 +569,7 @@ ToArrayValue(Datum datum, bool isnull, plv8_type *type)
- 	deconstruct_array(DatumGetArrayTypeP(datum),
- 						type->typid, type->len, type->byval, type->align,
- 						&values, &nulls, &nelems);
--	Local<Array>  result = Array::New(plv8_isolate, nelems);
-+	Local<Array>  result = Array::New(nelems);
- 	plv8_type base = { 0 };
- 	bool    ispreferred;
- 
-@@ -658,7 +653,7 @@ ToString(Datum value, plv8_type *type)
- 
- 	Local<String>	result =
- 		encoding == PG_UTF8
--			? String::NewFromUtf8(plv8_isolate, str)
-+			? String::New(str)
- 			: ToString(str, strlen(str), encoding);
- 	pfree(str);
- 
-@@ -686,7 +681,7 @@ ToString(const char *str, int len, int encoding)
- 
- 	if (utf8 != str)
- 		len = strlen(utf8);
--	Local<String> result = String::NewFromUtf8(plv8_isolate, utf8, String::kNormalString, len);
-+	Local<String> result = String::New(utf8, len);
- 	if (utf8 != str)
- 		pfree(utf8);
- 	return result;
--- 
-2.7.0
-
diff -Nru plv8-1.5.0.ds/debian/patches/regression plv8-1.4.6.ds/debian/patches/regression
--- plv8-1.5.0.ds/debian/patches/regression	1970-01-01 00:00:00.000000000 +0000
+++ plv8-1.4.6.ds/debian/patches/regression	2016-03-28 14:33:27.000000000 +0000
@@ -0,0 +1,940 @@
+--- /dev/null
++++ b/expected/jsonb_conv_1.out
+@@ -0,0 +1,48 @@
++CREATE FUNCTION convb(o jsonb) RETURNS jsonb AS $$
++if (o instanceof Array) {
++	o[1] = 10;
++} else if (typeof(o) == 'object') {
++	o.i = 10;
++}
++return o;
++$$ LANGUAGE plv8;
++ERROR:  type jsonb does not exist
++SELECT convb('{"i": 3, "b": 20}');
++ERROR:  function convb(unknown) does not exist
++LINE 1: SELECT convb('{"i": 3, "b": 20}');
++               ^
++HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
++SELECT convb('[1, 2, 3]');
++ERROR:  function convb(unknown) does not exist
++LINE 1: SELECT convb('[1, 2, 3]');
++               ^
++HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
++CREATE FUNCTION get_keyb(key text, json_raw jsonb) RETURNS jsonb
++LANGUAGE plv8 IMMUTABLE STRICT
++AS $$
++  var val = json_raw[key];
++  var ret = {};
++  ret[key] = val;
++  return ret;
++$$;
++ERROR:  type jsonb does not exist
++CREATE TABLE jsonbonly (
++    data jsonb
++);
++ERROR:  type "jsonb" does not exist
++LINE 2:     data jsonb
++                 ^
++COPY jsonbonly (data) FROM stdin;
++ERROR:  relation "jsonbonly" does not exist
++{"ok": true}
++\.
++invalid command \.
++-- Call twice to test the function cache.
++SELECT get_keyb('ok', data) FROM jsonbonly;
++ERROR:  syntax error at or near "{"
++LINE 1: {"ok": true}
++        ^
++SELECT get_keyb('ok', data) FROM jsonbonly;
++ERROR:  relation "jsonbonly" does not exist
++LINE 1: SELECT get_keyb('ok', data) FROM jsonbonly;
++                                         ^
+--- /dev/null
++++ b/expected/plv8_1.out
+@@ -0,0 +1,840 @@
++-- CREATE FUNCTION
++CREATE FUNCTION plv8_test(keys text[], vals text[]) RETURNS text AS
++$$
++	var o = {};
++	for (var i = 0; i < keys.length; i++)
++		o[keys[i]] = vals[i];
++	return JSON.stringify(o);
++$$
++LANGUAGE plv8 IMMUTABLE STRICT;
++SELECT plv8_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
++         plv8_test         
++---------------------------
++ {"name":"Tom","age":"29"}
++(1 row)
++
++CREATE FUNCTION unnamed_args(text[], text[]) RETURNS text[] AS
++$$
++	var array1 = arguments[0];
++	var array2 = $2;
++	return array1.concat(array2);
++$$
++LANGUAGE plv8 IMMUTABLE STRICT;
++SELECT unnamed_args(ARRAY['A', 'B'], ARRAY['C', 'D']);
++ unnamed_args 
++--------------
++ {A,B,C,D}
++(1 row)
++
++CREATE FUNCTION concat_strings(VARIADIC args text[]) RETURNS text AS
++$$
++	var result = "";
++	for (var i = 0; i < args.length; i++)
++		if (args[i] != null)
++			result += args[i];
++	return result;
++$$
++LANGUAGE plv8 IMMUTABLE STRICT;
++SELECT concat_strings('A', 'B', NULL, 'C');
++ concat_strings 
++----------------
++ ABC
++(1 row)
++
++CREATE FUNCTION return_void() RETURNS void AS $$ $$ LANGUAGE plv8;
++SELECT return_void();
++ return_void 
++-------------
++ 
++(1 row)
++
++CREATE FUNCTION return_null() RETURNS text AS $$ return null; $$ LANGUAGE plv8;
++SELECT r, r IS NULL AS isnull FROM return_null() AS r;
++ r | isnull 
++---+--------
++   | t
++(1 row)
++
++-- TYPE CONVERTIONS
++CREATE FUNCTION int2_to_int4(x int2) RETURNS int4 AS $$ return x; $$ LANGUAGE plv8;
++SELECT int2_to_int4(24::int2);
++ int2_to_int4 
++--------------
++           24
++(1 row)
++
++CREATE FUNCTION int4_to_int2(x int4) RETURNS int2 AS $$ return x; $$ LANGUAGE plv8;
++SELECT int4_to_int2(42);
++ int4_to_int2 
++--------------
++           42
++(1 row)
++
++CREATE FUNCTION int4_to_int8(x int4) RETURNS int8 AS $$ return x; $$ LANGUAGE plv8;
++SELECT int4_to_int8(48);
++ int4_to_int8 
++--------------
++           48
++(1 row)
++
++CREATE FUNCTION int8_to_int4(x int8) RETURNS int4 AS $$ return x; $$ LANGUAGE plv8;
++SELECT int8_to_int4(84);
++ int8_to_int4 
++--------------
++           84
++(1 row)
++
++CREATE FUNCTION float8_to_numeric(x float8) RETURNS numeric AS $$ return x; $$ LANGUAGE plv8;
++SELECT float8_to_numeric(1.5);
++ float8_to_numeric 
++-------------------
++               1.5
++(1 row)
++
++CREATE FUNCTION numeric_to_int8(x numeric) RETURNS int8 AS $$ return x; $$ LANGUAGE plv8;
++SELECT numeric_to_int8(1234.56);
++ numeric_to_int8 
++-----------------
++            1234
++(1 row)
++
++CREATE FUNCTION int4_to_text(x int4) RETURNS text AS $$ return x; $$ LANGUAGE plv8;
++SELECT int4_to_text(123);
++ int4_to_text 
++--------------
++ 123
++(1 row)
++
++CREATE FUNCTION text_to_int4(x text) RETURNS int4 AS $$ return x; $$ LANGUAGE plv8;
++SELECT text_to_int4('123');
++ text_to_int4 
++--------------
++          123
++(1 row)
++
++SELECT text_to_int4('abc'); -- error
++ERROR:  invalid input syntax for integer: "abc"
++CREATE FUNCTION int4array_to_textarray(x int4[]) RETURNS text[] AS $$ return x; $$ LANGUAGE plv8;
++SELECT int4array_to_textarray(ARRAY[123, 456]::int4[]);
++ int4array_to_textarray 
++------------------------
++ {123,456}
++(1 row)
++
++CREATE FUNCTION textarray_to_int4array(x text[]) RETURNS int4[] AS $$ return x; $$ LANGUAGE plv8;
++SELECT textarray_to_int4array(ARRAY['123', '456']::text[]);
++ textarray_to_int4array 
++------------------------
++ {123,456}
++(1 row)
++
++CREATE FUNCTION timestamptz_to_text(t timestamptz) RETURNS text AS $$ return t.toUTCString() $$ LANGUAGE plv8;
++SELECT timestamptz_to_text('23 Dec 2010 12:34:56 GMT');
++      timestamptz_to_text      
++-------------------------------
++ Thu, 23 Dec 2010 12:34:56 GMT
++(1 row)
++
++CREATE FUNCTION text_to_timestamptz(t text) RETURNS timestamptz AS $$ return new Date(t) $$ LANGUAGE plv8;
++SELECT text_to_timestamptz('23 Dec 2010 12:34:56 GMT') AT TIME ZONE 'GMT';
++         timezone         
++--------------------------
++ Thu Dec 23 12:34:56 2010
++(1 row)
++
++CREATE FUNCTION date_to_text(t date) RETURNS text AS $$ return t.toUTCString() $$ LANGUAGE plv8;
++SELECT date_to_text('23 Dec 2010');
++         date_to_text          
++-------------------------------
++ Thu, 23 Dec 2010 00:00:00 GMT
++(1 row)
++
++CREATE FUNCTION text_to_date(t text) RETURNS date AS $$ return new Date(t) $$ LANGUAGE plv8;
++SELECT text_to_date('23 Dec 2010 GMT');
++ text_to_date 
++--------------
++ 12-23-2010
++(1 row)
++
++CREATE FUNCTION oidfn(id oid) RETURNS oid AS $$ return id $$ LANGUAGE plv8;
++SELECT oidfn('pg_catalog.pg_class'::regclass);
++ oidfn 
++-------
++  1259
++(1 row)
++
++-- RECORD TYPES
++CREATE TYPE rec AS (i integer, t text);
++CREATE FUNCTION scalar_to_record(i integer, t text) RETURNS rec AS
++$$
++	return { "i": i, "t": t };
++$$
++LANGUAGE plv8;
++SELECT scalar_to_record(1, 'a');
++ scalar_to_record 
++------------------
++ (1,a)
++(1 row)
++
++CREATE FUNCTION record_to_text(x rec) RETURNS text AS
++$$
++	return JSON.stringify(x);
++$$
++LANGUAGE plv8;
++SELECT record_to_text('(1,a)'::rec);
++ record_to_text  
++-----------------
++ {"i":1,"t":"a"}
++(1 row)
++
++CREATE FUNCTION return_record(i integer, t text) RETURNS record AS
++$$
++	return { "i": i, "t": t };
++$$
++LANGUAGE plv8;
++SELECT * FROM return_record(1, 'a');
++ERROR:  a column definition list is required for functions returning "record"
++LINE 1: SELECT * FROM return_record(1, 'a');
++                      ^
++SELECT * FROM return_record(1, 'a') AS t(j integer, s text);
++ERROR:  input of anonymous composite types is not implemented
++SELECT * FROM return_record(1, 'a') AS t(x text, y text);
++ERROR:  input of anonymous composite types is not implemented
++CREATE FUNCTION set_of_records() RETURNS SETOF rec AS
++$$
++	plv8.return_next( { "i": 1, "t": "a" } );
++	plv8.return_next( { "i": 2, "t": "b" } );
++	plv8.return_next( { "i": 3, "t": "c" } );
++$$
++LANGUAGE plv8;
++SELECT * FROM set_of_records();
++ i | t 
++---+---
++ 1 | a
++ 2 | b
++ 3 | c
++(3 rows)
++
++CREATE FUNCTION set_of_record_but_non_obj() RETURNS SETOF rec AS
++$$
++	plv8.return_next( "abc" );
++$$
++LANGUAGE plv8;
++SELECT * FROM set_of_record_but_non_obj();
++ERROR:  Error: argument must be an object
++DETAIL:  set_of_record_but_non_obj() LINE 2: 	plv8.return_next( "abc" );
++CREATE FUNCTION set_of_integers() RETURNS SETOF integer AS
++$$
++	plv8.return_next( 1 );
++	plv8.return_next( 2 );
++	plv8.return_next( 3 );
++$$
++LANGUAGE plv8;
++SELECT * FROM set_of_integers();
++ set_of_integers 
++-----------------
++               1
++               2
++               3
++(3 rows)
++
++CREATE FUNCTION set_of_nest() RETURNS SETOF float AS
++$$
++	plv8.return_next( -0.2 );
++	var rows = plv8.execute( "SELECT set_of_integers() AS i" );
++	plv8.return_next( rows[0].i );
++	return 0.2;
++$$
++LANGUAGE plv8;
++SELECT * FROM set_of_nest();
++ set_of_nest 
++-------------
++        -0.2
++           1
++         0.2
++(3 rows)
++
++CREATE FUNCTION set_of_unnamed_records() RETURNS SETOF record AS
++$$
++	return [ { i: true } ];
++$$
++LANGUAGE plv8;
++SELECT set_of_unnamed_records();
++ERROR:  function returning record called in context that cannot accept type record
++SELECT * FROM set_of_unnamed_records() t (i bool);
++ i 
++---
++ t
++(1 row)
++
++CREATE OR REPLACE FUNCTION set_of_unnamed_records() RETURNS SETOF record AS
++$$
++    plv8.return_next({"a": 1, "b": 2}); 
++    return; 
++$$ LANGUAGE plv8;
++-- not enough fields specified
++SELECT * FROM set_of_unnamed_records() AS x(a int);
++ a 
++---
++ 1
++(1 row)
++
++-- field names mismatch
++SELECT * FROM set_of_unnamed_records() AS x(a int, c int);
++ERROR:  Error: field name / property name mismatch
++DETAIL:  set_of_unnamed_records() LINE 2:     plv8.return_next({"a": 1, "b": 2}); 
++-- name counts and values match
++SELECT * FROM set_of_unnamed_records() AS x(a int, b int);
++ a | b 
++---+---
++ 1 | 2
++(1 row)
++
++-- return type check
++CREATE OR REPLACE FUNCTION bogus_return_type() RETURNS int[] AS
++$$
++    return 1;
++$$ LANGUAGE plv8;
++SELECT bogus_return_type();
++ERROR:  value is not an Array
++-- INOUT and OUT parameters
++CREATE FUNCTION one_inout(a integer, INOUT b text) AS
++$$
++return a + b;
++$$
++LANGUAGE plv8;
++SELECT one_inout(5, 'ABC');
++ one_inout 
++-----------
++ 5ABC
++(1 row)
++
++CREATE FUNCTION one_out(OUT o text, i integer) AS
++$$
++return 'ABC' + i;
++$$
++LANGUAGE plv8;
++SELECT one_out(123);
++ one_out 
++---------
++ ABC123
++(1 row)
++
++-- polymorphic types
++CREATE FUNCTION polymorphic(poly anyarray) returns anyelement AS
++$$
++    return poly[0];
++$$
++LANGUAGE plv8;
++SELECT polymorphic(ARRAY[10, 11]), polymorphic(ARRAY['foo', 'bar']);
++ polymorphic | polymorphic 
++-------------+-------------
++          10 | foo
++(1 row)
++
++-- typed array
++CREATE FUNCTION fastsum(ary plv8_int4array) RETURNS int8 AS
++$$
++    sum = 0;
++    for (var i = 0; i < ary.length; i++) {
++      sum += ary[i];
++    }
++    return sum;
++$$
++LANGUAGE plv8 IMMUTABLE STRICT;
++SELECT fastsum(ARRAY[1, 2, 3, 4, 5]);
++ fastsum 
++---------
++      15
++(1 row)
++
++SELECT fastsum(ARRAY[NULL, 2]);
++ERROR:  NULL element, or multi-dimension array not allowed in external array type
++-- elog()
++CREATE FUNCTION test_elog(arg text) RETURNS void AS
++$$
++	plv8.elog(NOTICE, 'args =', arg);
++	plv8.elog(WARNING, 'warning');
++	try{
++		plv8.elog(ERROR, 'ERROR');
++	}catch(e){
++		plv8.elog(INFO, e);
++	}
++	plv8.elog(21, 'FATAL is not allowed');
++$$
++LANGUAGE plv8;
++SELECT test_elog('ABC');
++NOTICE:  args = ABC
++WARNING:  warning
++INFO:  Error: ERROR
++ERROR:  Error: invalid error level
++DETAIL:  test_elog() LINE 9: 	plv8.elog(21, 'FATAL is not allowed');
++-- execute()
++CREATE TABLE test_tbl (i integer, s text);
++CREATE FUNCTION test_sql() RETURNS integer AS
++$$
++	// for name[] conversion test, add current_schemas()
++	var rows = plv8.execute("SELECT i, 's' || i AS s, current_schemas(true) AS c FROM generate_series(1, 4) AS t(i)");
++	for (var r = 0; r < rows.length; r++)
++	{
++		var result = plv8.execute("INSERT INTO test_tbl VALUES(" + rows[r].i + ",'" + rows[r].s + "')");
++		plv8.elog(NOTICE, JSON.stringify(rows[r]), result);
++	}
++	return rows.length;
++$$
++LANGUAGE plv8;
++SELECT test_sql();
++NOTICE:  {"i":1,"s":"s1","c":["pg_catalog","public"]} 1
++NOTICE:  {"i":2,"s":"s2","c":["pg_catalog","public"]} 1
++NOTICE:  {"i":3,"s":"s3","c":["pg_catalog","public"]} 1
++NOTICE:  {"i":4,"s":"s4","c":["pg_catalog","public"]} 1
++ test_sql 
++----------
++        4
++(1 row)
++
++SELECT * FROM test_tbl;
++ i | s  
++---+----
++ 1 | s1
++ 2 | s2
++ 3 | s3
++ 4 | s4
++(4 rows)
++
++CREATE FUNCTION return_sql() RETURNS SETOF test_tbl AS
++$$
++	return plv8.execute(
++		"SELECT i, $1 || i AS s FROM generate_series(1, $2) AS t(i)",
++		[ 's', 4 ]
++	);
++$$
++LANGUAGE plv8;
++SELECT * FROM return_sql();
++ i | s  
++---+----
++ 1 | s1
++ 2 | s2
++ 3 | s3
++ 4 | s4
++(4 rows)
++
++CREATE FUNCTION test_sql_error() RETURNS void AS $$ plv8.execute("ERROR") $$ LANGUAGE plv8;
++SELECT test_sql_error();
++ERROR:  Error: syntax error at or near "ERROR"
++DETAIL:  test_sql_error() LINE 1:  plv8.execute("ERROR") 
++CREATE FUNCTION catch_sql_error() RETURNS void AS $$
++try {
++	plv8.execute("throw SQL error");
++	plv8.elog(NOTICE, "should not come here");
++} catch (e) {
++	plv8.elog(NOTICE, e);
++}
++$$ LANGUAGE plv8;
++SELECT catch_sql_error();
++NOTICE:  Error: syntax error at or near "throw"
++ catch_sql_error 
++-----------------
++ 
++(1 row)
++
++CREATE FUNCTION catch_sql_error_2() RETURNS text AS $$
++try {
++	plv8.execute("throw SQL error");
++	plv8.elog(NOTICE, "should not come here");
++} catch (e) {
++	plv8.elog(NOTICE, e);
++	return plv8.execute("select 'and can execute queries again' t").shift().t;
++}
++$$ LANGUAGE plv8;
++SELECT catch_sql_error_2();
++NOTICE:  Error: syntax error at or near "throw"
++       catch_sql_error_2       
++-------------------------------
++ and can execute queries again
++(1 row)
++
++-- subtransaction()
++CREATE TABLE subtrant(a int);
++CREATE FUNCTION test_subtransaction_catch() RETURNS void AS $$
++try {
++	plv8.subtransaction(function(){
++		plv8.execute("INSERT INTO subtrant VALUES(1)");
++		plv8.execute("INSERT INTO subtrant VALUES(1/0)");
++	});
++} catch (e) {
++	plv8.elog(NOTICE, e);
++	plv8.execute("INSERT INTO subtrant VALUES(2)");
++}
++$$ LANGUAGE plv8;
++SELECT test_subtransaction_catch();
++NOTICE:  Error: division by zero
++ test_subtransaction_catch 
++---------------------------
++ 
++(1 row)
++
++SELECT * FROM subtrant;
++ a 
++---
++ 2
++(1 row)
++
++TRUNCATE subtrant;
++CREATE FUNCTION test_subtransaction_throw() RETURNS void AS $$
++plv8.subtransaction(function(){
++	plv8.execute("INSERT INTO subtrant VALUES(1)");
++	plv8.execute("INSERT INTO subtrant VALUES(1/0)");
++});
++$$ LANGUAGE plv8;
++SELECT test_subtransaction_throw();
++ERROR:  Error: division by zero
++DETAIL:  test_subtransaction_throw() LINE 2: plv8.subtransaction(function(){
++SELECT * FROM subtrant;
++ a 
++---
++(0 rows)
++
++-- REPLACE FUNCTION
++CREATE FUNCTION replace_test() RETURNS integer AS $$ return 1; $$ LANGUAGE plv8;
++SELECT replace_test();
++ replace_test 
++--------------
++            1
++(1 row)
++
++CREATE OR REPLACE FUNCTION replace_test() RETURNS integer AS $$ return 2; $$ LANGUAGE plv8;
++SELECT replace_test();
++ replace_test 
++--------------
++            2
++(1 row)
++
++-- TRIGGER
++CREATE FUNCTION test_trigger() RETURNS trigger AS
++$$
++	plv8.elog(NOTICE, "NEW = ", JSON.stringify(NEW));
++	plv8.elog(NOTICE, "OLD = ", JSON.stringify(OLD));
++	plv8.elog(NOTICE, "TG_OP = ", TG_OP);
++	plv8.elog(NOTICE, "TG_ARGV = ", TG_ARGV);
++	if (TG_OP == "UPDATE") {
++		NEW.i = 102;
++		return NEW;
++	}
++$$
++LANGUAGE "plv8";
++CREATE TRIGGER test_trigger
++  BEFORE INSERT OR UPDATE OR DELETE
++  ON test_tbl FOR EACH ROW
++  EXECUTE PROCEDURE test_trigger('foo', 'bar');
++INSERT INTO test_tbl VALUES(100, 'ABC');
++NOTICE:  NEW =  {"i":100,"s":"ABC"}
++NOTICE:  OLD =  undefined
++NOTICE:  TG_OP =  INSERT
++NOTICE:  TG_ARGV =  foo,bar
++UPDATE test_tbl SET i = 101, s = 'DEF' WHERE i = 1;
++NOTICE:  NEW =  {"i":101,"s":"DEF"}
++NOTICE:  OLD =  {"i":1,"s":"s1"}
++NOTICE:  TG_OP =  UPDATE
++NOTICE:  TG_ARGV =  foo,bar
++DELETE FROM test_tbl WHERE i >= 100;
++NOTICE:  NEW =  undefined
++NOTICE:  OLD =  {"i":100,"s":"ABC"}
++NOTICE:  TG_OP =  DELETE
++NOTICE:  TG_ARGV =  foo,bar
++NOTICE:  NEW =  undefined
++NOTICE:  OLD =  {"i":102,"s":"DEF"}
++NOTICE:  TG_OP =  DELETE
++NOTICE:  TG_ARGV =  foo,bar
++SELECT * FROM test_tbl;
++ i | s  
++---+----
++ 2 | s2
++ 3 | s3
++ 4 | s4
++(3 rows)
++
++-- One more trigger
++CREATE FUNCTION test_trigger2() RETURNS trigger AS
++$$
++	var tuple;
++	switch (TG_OP) {
++	case "INSERT":
++		tuple = NEW;
++		break;
++	case "UPDATE":
++		tuple = OLD;
++		break;
++	case "DELETE":
++		tuple = OLD;
++		break;
++	default:
++		return;
++	}
++	if (tuple.subject == "skip") {
++		return null;
++	}
++	if (tuple.subject == "modify" && NEW) {
++		NEW.val = tuple.val * 2;
++		return NEW;
++	}
++$$
++LANGUAGE "plv8";
++CREATE TABLE trig_table (subject text, val int);
++INSERT INTO trig_table VALUES('skip', 1);
++CREATE TRIGGER test_trigger2
++  BEFORE INSERT OR UPDATE OR DELETE
++  ON trig_table FOR EACH ROW
++  EXECUTE PROCEDURE test_trigger2();
++INSERT INTO trig_table VALUES
++  ('skip', 1), ('modify', 2), ('noop', 3);
++SELECT * FROM trig_table;
++ subject | val 
++---------+-----
++ skip    |   1
++ modify  |   4
++ noop    |   3
++(3 rows)
++
++UPDATE trig_table SET val = 10;
++SELECT * FROM trig_table;
++ subject | val 
++---------+-----
++ skip    |   1
++ modify  |   8
++ noop    |  10
++(3 rows)
++
++DELETE FROM trig_table;
++SELECT * FROM trig_table;
++ subject | val 
++---------+-----
++ skip    |   1
++(1 row)
++
++-- ERRORS
++CREATE FUNCTION syntax_error() RETURNS text AS '@' LANGUAGE plv8;
++ERROR:  SyntaxError: Unexpected token ILLEGAL
++DETAIL:  syntax_error() LINE 1: @
++CREATE FUNCTION reference_error() RETURNS text AS 'not_defined' LANGUAGE plv8;
++SELECT reference_error();
++ERROR:  ReferenceError: not_defined is not defined
++DETAIL:  reference_error() LINE 1: not_defined
++CREATE FUNCTION throw() RETURNS void AS $$throw new Error("an error");$$ LANGUAGE plv8;
++SELECT throw();
++ERROR:  Error: an error
++DETAIL:  throw() LINE 1: throw new Error("an error");
++-- SPI operations
++CREATE FUNCTION prep1() RETURNS void AS $$
++var plan = plv8.prepare("SELECT * FROM test_tbl");
++plv8.elog(INFO, plan.toString());
++var rows = plan.execute();
++for(var i = 0; i < rows.length; i++) {
++  plv8.elog(INFO, JSON.stringify(rows[i]));
++}
++var cursor = plan.cursor();
++plv8.elog(INFO, cursor.toString());
++var row;
++while(row = cursor.fetch()) {
++  plv8.elog(INFO, JSON.stringify(row));
++}
++cursor.close();
++
++var cursor = plan.cursor();
++var rows;
++rows = cursor.fetch(2);
++plv8.elog(INFO, JSON.stringify(rows));
++rows = cursor.fetch(-2);
++plv8.elog(INFO, JSON.stringify(rows));
++cursor.move(1);
++rows = cursor.fetch(3);
++plv8.elog(INFO, JSON.stringify(rows));
++cursor.move(-2);
++rows = cursor.fetch(3);
++plv8.elog(INFO, JSON.stringify(rows));
++cursor.close();
++
++plan.free();
++
++var plan = plv8.prepare("SELECT * FROM test_tbl WHERE i = $1 and s = $2", ["int", "text"]);
++var rows = plan.execute([2, "s2"]);
++plv8.elog(INFO, "rows.length = ", rows.length);
++var cursor = plan.cursor([2, "s2"]);
++plv8.elog(INFO, JSON.stringify(cursor.fetch()));
++cursor.close();
++plan.free();
++
++try{
++  var plan = plv8.prepare("SELECT * FROM test_tbl");
++  plan.free();
++  plan.execute();
++}catch(e){
++  plv8.elog(WARNING, e);
++}
++try{
++  var plan = plv8.prepare("SELECT * FROM test_tbl");
++  var cursor = plan.cursor();
++  cursor.close();
++  cursor.fetch();
++}catch(e){
++  plv8.elog(WARNING, e);
++}
++$$ LANGUAGE plv8 STRICT;
++SELECT prep1();
++INFO:  [object PreparedPlan]
++INFO:  {"i":2,"s":"s2"}
++INFO:  {"i":3,"s":"s3"}
++INFO:  {"i":4,"s":"s4"}
++INFO:  [object Cursor]
++INFO:  {"i":2,"s":"s2"}
++INFO:  {"i":3,"s":"s3"}
++INFO:  {"i":4,"s":"s4"}
++INFO:  [{"i":2,"s":"s2"},{"i":3,"s":"s3"}]
++INFO:  [{"i":2,"s":"s2"}]
++INFO:  [{"i":3,"s":"s3"},{"i":4,"s":"s4"}]
++INFO:  [{"i":4,"s":"s4"}]
++INFO:  rows.length =  1
++INFO:  {"i":2,"s":"s2"}
++WARNING:  Error: plan expected -1 argument(s), given is 0
++WARNING:  Error: cannot find cursor
++ prep1 
++-------
++ 
++(1 row)
++
++-- find_function
++CREATE FUNCTION callee(a int) RETURNS int AS $$ return a * a $$ LANGUAGE plv8;
++CREATE FUNCTION sqlf(int) RETURNS int AS $$ SELECT $1 * $1 $$ LANGUAGE sql;
++CREATE FUNCTION caller(a int, t int) RETURNS int AS $$
++  var func;
++  if (t == 1) {
++    func = plv8.find_function("callee");
++  } else if (t == 2) {
++    func = plv8.find_function("callee(int)");
++  } else if (t == 3) {
++    func = plv8.find_function("sqlf");
++  } else if (t == 4) {
++    func = plv8.find_function("callee(int, int)");
++  } else if (t == 5) {
++    try{
++      func = plv8.find_function("caller()");
++    }catch(e){
++      func = function(a){ return a };
++    }
++  }
++  return func(a);
++$$ LANGUAGE plv8;
++SELECT caller(10, 1);
++ caller 
++--------
++    100
++(1 row)
++
++SELECT caller(10, 2);
++ caller 
++--------
++    100
++(1 row)
++
++SELECT caller(10, 3);
++ERROR:  Error: javascript function is not found for "sqlf"
++DETAIL:  caller() LINE 8:     func = plv8.find_function("sqlf");
++SELECT caller(10, 4);
++ERROR:  Error: function "callee(int, int)" does not exist
++DETAIL:  caller() LINE 10:     func = plv8.find_function("callee(int, int)");
++SELECT caller(10, 5);
++ caller 
++--------
++     10
++(1 row)
++
++-- quote_*
++CREATE FUNCTION plv8_quotes(s text) RETURNS text AS $$
++  return [plv8.quote_literal(s), plv8.quote_nullable(s), plv8.quote_ident(s)].join(":");
++$$ LANGUAGE plv8 IMMUTABLE;
++SELECT plv8_quotes('select');
++        plv8_quotes         
++----------------------------
++ 'select':'select':"select"
++(1 row)
++
++SELECT plv8_quotes('kevin''s name');
++                  plv8_quotes                   
++------------------------------------------------
++ 'kevin''s name':'kevin''s name':"kevin's name"
++(1 row)
++
++SELECT plv8_quotes(NULL);
++    plv8_quotes     
++--------------------
++ 'null':NULL:"null"
++(1 row)
++
++DROP TABLE IF EXISTS t_attdrop CASCADE;
++NOTICE:  table "t_attdrop" does not exist, skipping
++CREATE TABLE t_attdrop AS SELECT i a, i b, i c FROM generate_series(1, 10)i;
++CREATE OR REPLACE FUNCTION f_attdrop(tbl t_attdrop) RETURNS int AS $$
++  return tbl.a;
++$$ LANGUAGE plv8;
++CREATE OR REPLACE FUNCTION f_attdrop(a int) RETURNS t_attdrop AS $$
++  return {a: a, b: 0, c: 10};
++$$ LANGUAGE plv8;
++ALTER TABLE t_attdrop DROP COLUMN b;
++SELECT f_attdrop(t.*) FROM t;
++ERROR:  relation "t" does not exist
++LINE 1: SELECT f_attdrop(t.*) FROM t;
++                                   ^
++SELECT f_attdrop(2);
++ f_attdrop 
++-----------
++ (2,10)
++(1 row)
++
++SET client_min_messages = warning;
++create table plv8test ( id serial primary key, data json, sum integer, num integer);
++ERROR:  type "json" does not exist
++LINE 1: ...eate table plv8test ( id serial primary key, data json, sum ...
++                                                             ^
++RESET client_min_messages;
++insert into plv8test (data, sum, num) values ('{"a": 1, "b": 2}', 0, 0);
++ERROR:  relation "plv8test" does not exist
++LINE 1: insert into plv8test (data, sum, num) values ('{"a": 1, "b":...
++                    ^
++insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
++ERROR:  relation "plv8test" does not exist
++LINE 1: insert into plv8test (data, sum, num) values ('{"a": 3, "b":...
++                    ^
++insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
++ERROR:  relation "plv8test" does not exist
++LINE 1: insert into plv8test (data, sum, num) values ('{"a": 3, "b":...
++                    ^
++CREATE OR REPLACE FUNCTION plv8_trigger_handler() RETURNS trigger AS
++$$
++    var sum = 0;
++    for (var k in NEW.data){ sum += NEW.data[k];}
++    NEW.sum = sum
++    return NEW;
++$$ 
++LANGUAGE plv8;
++CREATE TRIGGER plv8test_trigger
++BEFORE INSERT OR UPDATE
++ON plv8test FOR EACH ROW
++EXECUTE PROCEDURE plv8_trigger_handler();
++ERROR:  relation "plv8test" does not exist
++-- test OK
++update plv8test set num = 2 where id =2;
++ERROR:  relation "plv8test" does not exist
++LINE 1: update plv8test set num = 2 where id =2;
++               ^
++-- then add two fields and drop one of them
++alter table plv8test add column repro1 varchar;
++ERROR:  relation "plv8test" does not exist
++alter table plv8test add column repro2 varchar;
++ERROR:  relation "plv8test" does not exist
++alter table plv8test drop column repro1;
++ERROR:  relation "plv8test" does not exist
++-- dropped columns should work with trigger
++update plv8test set repro2='test';
++ERROR:  relation "plv8test" does not exist
++LINE 1: update plv8test set repro2='test';
++               ^
+--- /dev/null
++++ b/expected/json_conv_1.out
+@@ -0,0 +1,19 @@
++CREATE FUNCTION conv(o json) RETURNS json AS $$
++if (o instanceof Array) {
++	o[1] = 10;
++} else if (typeof(o) == 'object') {
++	o.i = 10;
++}
++return o;
++$$ LANGUAGE plv8;
++ERROR:  type json does not exist
++SELECT conv('{"i": 3, "b": 20}');
++ERROR:  function conv(unknown) does not exist
++LINE 1: SELECT conv('{"i": 3, "b": 20}');
++               ^
++HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
++SELECT conv('[1, 2, 3]');
++ERROR:  function conv(unknown) does not exist
++LINE 1: SELECT conv('[1, 2, 3]');
++               ^
++HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+--- a/expected/plv8.out
++++ b/expected/plv8.out
+@@ -790,7 +790,9 @@ SELECT f_attdrop(2);
+  (2,10)
+ (1 row)
+ 
++SET client_min_messages = warning;
+ create table plv8test ( id serial primary key, data json, sum integer, num integer);
++RESET client_min_messages;
+ insert into plv8test (data, sum, num) values ('{"a": 1, "b": 2}', 0, 0);
+ insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
+ insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
+--- a/sql/plv8.sql
++++ b/sql/plv8.sql
+@@ -476,7 +476,9 @@ ALTER TABLE t_attdrop DROP COLUMN b;
+ SELECT f_attdrop(t.*) FROM t;
+ SELECT f_attdrop(2);
+ 
++SET client_min_messages = warning;
+ create table plv8test ( id serial primary key, data json, sum integer, num integer);
++RESET client_min_messages;
+ insert into plv8test (data, sum, num) values ('{"a": 1, "b": 2}', 0, 0);
+ insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
+ insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
diff -Nru plv8-1.5.0.ds/debian/patches/series plv8-1.4.6.ds/debian/patches/series
--- plv8-1.5.0.ds/debian/patches/series	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/debian/patches/series	2016-03-28 14:33:27.000000000 +0000
@@ -1,2 +1,2 @@
 dummy-scripts
-make-it-compile-with-v8-3.14-again
+regression
diff -Nru plv8-1.5.0.ds/debian/rules plv8-1.4.6.ds/debian/rules
--- plv8-1.5.0.ds/debian/rules	2016-03-18 11:06:03.000000000 +0000
+++ plv8-1.4.6.ds/debian/rules	2016-03-28 14:33:27.000000000 +0000
@@ -31,4 +31,5 @@
 DIR = $(shell basename $(CURDIR))
 origtargz: clean
 	! test -f .pc/applied-patches
+	rm -f coffee-script.js livescript.js
 	cd .. && tar --exclude .git --exclude .pc --exclude debian -cvzf plv8_$(VERSION).orig.tar.gz $(DIR)
diff -Nru plv8-1.5.0.ds/debian/tests/installcheck plv8-1.4.6.ds/debian/tests/installcheck
--- plv8-1.5.0.ds/debian/tests/installcheck	2015-01-06 13:04:08.000000000 +0000
+++ plv8-1.4.6.ds/debian/tests/installcheck	2016-03-28 14:33:27.000000000 +0000
@@ -20,9 +20,6 @@
 			echo "**** regression.diffs ****"
 			cat build-$version/regression.diffs
 		fi
-		case $version in
-			9.0|9.1) ;; # 9.0/1 do not have json, ignore failures
-			*) exit 1 ;;
-		esac
+		exit 1
 	fi
 done
diff -Nru plv8-1.5.0.ds/doc/plv8.md plv8-1.4.6.ds/doc/plv8.md
--- plv8-1.5.0.ds/doc/plv8.md	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/doc/plv8.md	2016-03-27 19:49:02.000000000 +0000
@@ -413,22 +413,6 @@
         15
   (1 row)
 
-ES6 Language Features
----------------------
-
-PL/v8 enables all shipping feature of the used V8 version. So with V8 4.1+
-many ES6 features, like block scoping, collections, generators and string
-templates, are enabled by default.
-
-Additional features can be enabled by setting the GUC plv8.v8_flags
-(e.g. "SET plv8.v8_flags = '--es_staging';").
-
-These flags are honoured once per user session when the V8 runtime is
-initialized. Compared to dialects (see below), which can be set on a
-per function base, the V8 flags cannot be changed once the runtime is
-initialized. So normally this setting should rather be set per database,
-and not per session.
-
 Remote debugger
 ---------------
 
@@ -487,5 +471,5 @@
 - CoffeeScript (plcoffee)
 - LiveScript (plls)
 
-With PostgreSQL 9.1 or above, you are able to load those dialects via CREATE
+With PostgreSQL 9.1 or above, you are able to load tohse dialects via CREATE
 EXTENSION command.
diff -Nru plv8-1.5.0.ds/expected/arraybuffer.out plv8-1.4.6.ds/expected/arraybuffer.out
--- plv8-1.5.0.ds/expected/arraybuffer.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/arraybuffer.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-CREATE FUNCTION crash_test() RETURNS boolean
-LANGUAGE plv8 IMMUTABLE STRICT
-AS $$
-  var a = new ArrayBuffer(8);
-  return true;
-$$;
-SELECT crash_test();
- crash_test 
-------------
- t
-(1 row)
-
diff -Nru plv8-1.5.0.ds/expected/composites.out plv8-1.4.6.ds/expected/composites.out
--- plv8-1.5.0.ds/expected/composites.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/composites.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-CREATE TYPE acomp AS (x int, y text, z timestamptz);
-DO LANGUAGE PLV8 $$
-  var jres = plv8.execute("select $1::acomp[]", [ [ { "x": 2, "z": null, "y": null } ] ]);
-  plv8.elog(NOTICE,JSON.stringify(jres));
-$$;
-NOTICE:  [{"acomp":[{"x":2,"y":null,"z":null}]}]
diff -Nru plv8-1.5.0.ds/expected/es6.out plv8-1.4.6.ds/expected/es6.out
--- plv8-1.5.0.ds/expected/es6.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/es6.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
--- ES6 / harmony features
-CREATE TABLE rectangle (
-   id    INTEGER,
-   data  JSON
-);
-INSERT INTO rectangle (id, data) VALUES
-(1, '{"width": 20.3, "height": 1.5}'),
-(2, '{"width": 10.2, "height": 9.5}'),
-(3, '{"width": 3.5,  "height": 5.2}'),
-(4, '{"width": 8.2,  "height": 8.2}'),
-(5, '{"width": 9.4,  "height": 0.2}'),
-(6, '{"width": 1.2,  "height": 1.5}');
--- for..of loop over result array with break
-CREATE OR REPLACE FUNCTION get_rectangles_area(min_area NUMERIC)
-   RETURNS json AS $$
-      var rectangles = plv8.execute('SELECT id, data FROM rectangle ORDER BY id');
-      var result = [];
-      var area = 0.0;
-      for (var rectangle of rectangles) {
-	 area += rectangle.data.width * rectangle.data.height;
-	 result.push({id: rectangle.id, data: rectangle.data});
-	 if (area >= min_area) {
-	    break;
-	 }
-      }
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT get_rectangles_area(130.0);
-                                                         get_rectangles_area                                                          
---------------------------------------------------------------------------------------------------------------------------------------
- [{"id":1,"data":{"width":20.3,"height":1.5}},{"id":2,"data":{"width":10.2,"height":9.5}},{"id":3,"data":{"width":3.5,"height":5.2}}]
-(1 row)
-
--- same for..of loop, this time using a cursor within a generator
-CREATE OR REPLACE FUNCTION get_rectangles_area(min_area NUMERIC)
-   RETURNS json AS $$
-      var plan = plv8.prepare('SELECT id, data FROM rectangle ORDER BY id');
-      var cursor = plan.cursor();
-      var generator = function* () {
-	 var row;
-	 while (row = cursor.fetch()) {
-	    yield row;
-	 }
-      };
-      var rectangles = generator();
-      var result = [];
-      var area = 0.0;
-      for (var rectangle of rectangles) {
-	 area += rectangle.data.width * rectangle.data.height;
-	 result.push({id: rectangle.id, data: rectangle.data});
-	 if (area >= min_area) {
-	    break;
-	 }
-      }
-      cursor.close();
-      plan.free();
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT get_rectangles_area(130.0);
-                                                         get_rectangles_area                                                          
---------------------------------------------------------------------------------------------------------------------------------------
- [{"id":1,"data":{"width":20.3,"height":1.5}},{"id":2,"data":{"width":10.2,"height":9.5}},{"id":3,"data":{"width":3.5,"height":5.2}}]
-(1 row)
-
diff -Nru plv8-1.5.0.ds/expected/guc.out plv8-1.4.6.ds/expected/guc.out
--- plv8-1.5.0.ds/expected/guc.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/guc.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
--- enable strict mode with GUC, which allows usage of ES6 let and const keywords
-SET plv8.v8_flags = '--use_strict';
-CREATE OR REPLACE FUNCTION let_test()
-   RETURNS json AS $$
-      let result = ['Hello, World!'];
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT let_test();
-     let_test      
--------------------
- ["Hello, World!"]
-(1 row)
-
-DROP FUNCTION let_test();
diff -Nru plv8-1.5.0.ds/expected/inline.out plv8-1.4.6.ds/expected/inline.out
--- plv8-1.5.0.ds/expected/inline.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/inline.out	2016-03-27 19:49:02.000000000 +0000
@@ -1,5 +1,5 @@
 DO $$ plv8.elog(NOTICE, 'this', 'is', 'inline', 'code') $$ LANGUAGE plv8;
 NOTICE:  this is inline code
 DO $$ plv8.return_next(new Object());$$ LANGUAGE plv8;
-ERROR:  return_next called in context that cannot accept a set
+ERROR:  Error: return_next called in context that cannot accept a set
 DETAIL:  undefined() LINE 1:  plv8.return_next(new Object());
diff -Nru plv8-1.5.0.ds/expected/plv8-errors.out plv8-1.4.6.ds/expected/plv8-errors.out
--- plv8-1.5.0.ds/expected/plv8-errors.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/plv8-errors.out	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-CREATE FUNCTION test_sql_error() RETURNS void AS $$ plv8.execute("ERROR") $$ LANGUAGE plv8;
-SELECT test_sql_error();
-ERROR:  syntax error at or near "ERROR"
-DETAIL:  test_sql_error() LINE 1:  plv8.execute("ERROR") 
-CREATE FUNCTION catch_sql_error() RETURNS void AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e);
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error();
-NOTICE:  Error: syntax error at or near "throw"
- catch_sql_error 
------------------
- 
-(1 row)
-
-CREATE FUNCTION catch_sql_error_2() RETURNS text AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e);
-	return plv8.execute("select 'and can execute queries again' t").shift().t;
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error_2();
-NOTICE:  Error: syntax error at or near "throw"
-       catch_sql_error_2       
--------------------------------
- and can execute queries again
-(1 row)
-
-CREATE FUNCTION catch_sql_error_3() RETURNS text AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e.sqlerrcode);
-	return e.sqlerrcode;
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error_3();
-NOTICE:  42601
- catch_sql_error_3 
--------------------
- 42601
-(1 row)
-
--- subtransaction()
-CREATE TABLE subtrant(a int);
-CREATE FUNCTION test_subtransaction_catch() RETURNS void AS $$
-try {
-	plv8.subtransaction(function(){
-		plv8.execute("INSERT INTO subtrant VALUES(1)");
-		plv8.execute("INSERT INTO subtrant VALUES(1/0)");
-	});
-} catch (e) {
-	plv8.elog(NOTICE, e);
-	plv8.execute("INSERT INTO subtrant VALUES(2)");
-}
-$$ LANGUAGE plv8;
-SELECT test_subtransaction_catch();
-NOTICE:  Error: division by zero
- test_subtransaction_catch 
----------------------------
- 
-(1 row)
-
-SELECT * FROM subtrant;
- a 
----
- 2
-(1 row)
-
-TRUNCATE subtrant;
-CREATE FUNCTION test_subtransaction_throw() RETURNS void AS $$
-plv8.subtransaction(function(){
-	plv8.execute("INSERT INTO subtrant VALUES(1)");
-	plv8.execute("INSERT INTO subtrant VALUES(1/0)");
-});
-$$ LANGUAGE plv8;
-SELECT test_subtransaction_throw();
-ERROR:  division by zero
-DETAIL:  test_subtransaction_throw() LINE 2: plv8.subtransaction(function(){
-SELECT * FROM subtrant;
- a 
----
-(0 rows)
-
--- exception handling
-CREATE OR REPLACE FUNCTION v8_test_throw() RETURNS float AS
-$$ 
-throw new Error('Error');
-$$
-LANGUAGE plv8;
-CREATE OR REPLACE FUNCTION v8_test_catch_throw() RETURNS text AS
-$$
- try{
-   var res = plv8.execute('select * from  v8_test_throw()');
- } catch(e) {
-   return JSON.stringify({"result": "error"});
- }
-$$
-language plv8;
-SELECT v8_test_catch_throw();
- v8_test_catch_throw 
----------------------
- {"result":"error"}
-(1 row)
-
-CREATE FUNCTION catch_elog_error() RETURNS void AS $$
-function f (){
-}
-f.prototype.toString = function(){
-        throw 'custom exception';
-}
-try {
-	plv8.elog(NOTICE, (new f));
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, 'catch result:'+ e);
-}
-$$ LANGUAGE plv8;
-SELECT catch_elog_error();
-NOTICE:  catch result:custom exception
- catch_elog_error 
-------------------
- 
-(1 row)
-
-CREATE FUNCTION catch_elog_error2() RETURNS void AS $$
-function f (){
-}
-f.prototype.toString = function(){
-        throw 'custom exception';
-}
-
-plv8.elog(NOTICE, (new f));
-plv8.elog(NOTICE, "should not come here");
-
-$$ LANGUAGE plv8;
-SELECT catch_elog_error2();
-ERROR:  custom exception
-DETAIL:  catch_elog_error2() LINE 5:         throw 'custom exception';
diff -Nru plv8-1.5.0.ds/expected/plv8.out plv8-1.4.6.ds/expected/plv8.out
--- plv8-1.5.0.ds/expected/plv8.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/plv8.out	2016-03-27 19:49:02.000000000 +0000
@@ -221,7 +221,7 @@
 $$
 LANGUAGE plv8;
 SELECT * FROM set_of_record_but_non_obj();
-ERROR:  argument must be an object
+ERROR:  Error: argument must be an object
 DETAIL:  set_of_record_but_non_obj() LINE 2: 	plv8.return_next( "abc" );
 CREATE FUNCTION set_of_integers() RETURNS SETOF integer AS
 $$
@@ -281,7 +281,7 @@
 
 -- field names mismatch
 SELECT * FROM set_of_unnamed_records() AS x(a int, c int);
-ERROR:  field name / property name mismatch
+ERROR:  Error: field name / property name mismatch
 DETAIL:  set_of_unnamed_records() LINE 2:     plv8.return_next({"a": 1, "b": 2}); 
 -- name counts and values match
 SELECT * FROM set_of_unnamed_records() AS x(a int, b int);
@@ -367,7 +367,7 @@
 NOTICE:  args = ABC
 WARNING:  warning
 INFO:  Error: ERROR
-ERROR:  invalid error level
+ERROR:  Error: invalid error level
 DETAIL:  test_elog() LINE 9: 	plv8.elog(21, 'FATAL is not allowed');
 -- execute()
 CREATE TABLE test_tbl (i integer, s text);
@@ -419,6 +419,82 @@
  4 | s4
 (4 rows)
 
+CREATE FUNCTION test_sql_error() RETURNS void AS $$ plv8.execute("ERROR") $$ LANGUAGE plv8;
+SELECT test_sql_error();
+ERROR:  Error: syntax error at or near "ERROR"
+DETAIL:  test_sql_error() LINE 1:  plv8.execute("ERROR") 
+CREATE FUNCTION catch_sql_error() RETURNS void AS $$
+try {
+	plv8.execute("throw SQL error");
+	plv8.elog(NOTICE, "should not come here");
+} catch (e) {
+	plv8.elog(NOTICE, e);
+}
+$$ LANGUAGE plv8;
+SELECT catch_sql_error();
+NOTICE:  Error: syntax error at or near "throw"
+ catch_sql_error 
+-----------------
+ 
+(1 row)
+
+CREATE FUNCTION catch_sql_error_2() RETURNS text AS $$
+try {
+	plv8.execute("throw SQL error");
+	plv8.elog(NOTICE, "should not come here");
+} catch (e) {
+	plv8.elog(NOTICE, e);
+	return plv8.execute("select 'and can execute queries again' t").shift().t;
+}
+$$ LANGUAGE plv8;
+SELECT catch_sql_error_2();
+NOTICE:  Error: syntax error at or near "throw"
+       catch_sql_error_2       
+-------------------------------
+ and can execute queries again
+(1 row)
+
+-- subtransaction()
+CREATE TABLE subtrant(a int);
+CREATE FUNCTION test_subtransaction_catch() RETURNS void AS $$
+try {
+	plv8.subtransaction(function(){
+		plv8.execute("INSERT INTO subtrant VALUES(1)");
+		plv8.execute("INSERT INTO subtrant VALUES(1/0)");
+	});
+} catch (e) {
+	plv8.elog(NOTICE, e);
+	plv8.execute("INSERT INTO subtrant VALUES(2)");
+}
+$$ LANGUAGE plv8;
+SELECT test_subtransaction_catch();
+NOTICE:  Error: division by zero
+ test_subtransaction_catch 
+---------------------------
+ 
+(1 row)
+
+SELECT * FROM subtrant;
+ a 
+---
+ 2
+(1 row)
+
+TRUNCATE subtrant;
+CREATE FUNCTION test_subtransaction_throw() RETURNS void AS $$
+plv8.subtransaction(function(){
+	plv8.execute("INSERT INTO subtrant VALUES(1)");
+	plv8.execute("INSERT INTO subtrant VALUES(1/0)");
+});
+$$ LANGUAGE plv8;
+SELECT test_subtransaction_throw();
+ERROR:  Error: division by zero
+DETAIL:  test_subtransaction_throw() LINE 2: plv8.subtransaction(function(){
+SELECT * FROM subtrant;
+ a 
+---
+(0 rows)
+
 -- REPLACE FUNCTION
 CREATE FUNCTION replace_test() RETURNS integer AS $$ return 1; $$ LANGUAGE plv8;
 SELECT replace_test();
@@ -546,7 +622,7 @@
 DETAIL:  reference_error() LINE 1: not_defined
 CREATE FUNCTION throw() RETURNS void AS $$throw new Error("an error");$$ LANGUAGE plv8;
 SELECT throw();
-ERROR:  an error
+ERROR:  Error: an error
 DETAIL:  throw() LINE 1: throw new Error("an error");
 -- SPI operations
 CREATE FUNCTION prep1() RETURNS void AS $$
@@ -661,10 +737,10 @@
 (1 row)
 
 SELECT caller(10, 3);
-ERROR:  javascript function is not found for "sqlf"
+ERROR:  Error: javascript function is not found for "sqlf"
 DETAIL:  caller() LINE 8:     func = plv8.find_function("sqlf");
 SELECT caller(10, 4);
-ERROR:  function "callee(int, int)" does not exist
+ERROR:  Error: function "callee(int, int)" does not exist
 DETAIL:  caller() LINE 10:     func = plv8.find_function("callee(int, int)");
 SELECT caller(10, 5);
  caller 
@@ -714,7 +790,7 @@
  (2,10)
 (1 row)
 
-create table plv8test ( id numeric, data json, sum integer, num integer);
+create table plv8test ( id serial primary key, data json, sum integer, num integer);
 insert into plv8test (data, sum, num) values ('{"a": 1, "b": 2}', 0, 0);
 insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
 insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
diff -Nru plv8-1.5.0.ds/expected/window.out plv8-1.4.6.ds/expected/window.out
--- plv8-1.5.0.ds/expected/window.out	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/expected/window.out	2016-03-27 19:49:02.000000000 +0000
@@ -352,10 +352,10 @@
   winobj.set_partition_local(context);
 $$ LANGUAGE plv8 WINDOW;
 SELECT bad_alloc('5') OVER ();
-ERROR:  window local memory overflow
+ERROR:  Error: window local memory overflow
 DETAIL:  bad_alloc() LINE 5:   winobj.set_partition_local(context);
 SELECT bad_alloc('not a number') OVER ();
-ERROR:  window local memory overflow
+ERROR:  Error: window local memory overflow
 DETAIL:  bad_alloc() LINE 5:   winobj.set_partition_local(context);
 SELECT bad_alloc('1000') OVER (); -- not so bad
  bad_alloc 
@@ -367,5 +367,5 @@
   var winobj = plv8.get_window_object();
 $$ LANGUAGE plv8;
 SELECT non_window();
-ERROR:  get_window_object called in wrong context
+ERROR:  Error: get_window_object called in wrong context
 DETAIL:  non_window() LINE 2:   var winobj = plv8.get_window_object();
diff -Nru plv8-1.5.0.ds/Makefile plv8-1.4.6.ds/Makefile
--- plv8-1.5.0.ds/Makefile	2016-03-18 11:11:54.000000000 +0000
+++ plv8-1.4.6.ds/Makefile	2016-03-27 19:49:02.000000000 +0000
@@ -3,7 +3,7 @@
 # Makefile for plv8
 #
 # @param DISABLE_DIALECT if defined, not build dialects (i.e. plcoffee, etc)
-# @param ENABLE_DEBUGGER_SUPPORT enables v8 debugger agent
+# @param ENABLE_DEBUGGER_SUPPORT enables v8 deubbger agent
 #
 # There are two ways to build plv8.
 # 1. Dynamic link to v8 (default)
@@ -12,12 +12,12 @@
 #   'make static' will download v8 and build, then statically link to it.
 #
 #-----------------------------------------------------------------------------#
-PLV8_VERSION = 1.5.0
+PLV8_VERSION = 1.4.6
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 
-PG_VERSION_NUM := $(shell cat `$(PG_CONFIG) --includedir-server`/pg_config*.h \
+PG_VERSION_NUM := $(shell cat `$(PG_CONFIG) --includedir`/pg_config*.h \
 		   | perl -ne 'print $$1 and exit if /PG_VERSION_NUM\s+(\d+)/')
 
 # set your custom C++ compler
@@ -36,8 +36,8 @@
 		plls.control plls--$(PLV8_VERSION).sql
 endif
 DATA_built = plv8.sql
-REGRESS = init-extension plv8 plv8-errors inline json startup_pre startup varparam json_conv \
- 		  jsonb_conv window guc es6 arraybuffer composites
+REGRESS = init-extension plv8 inline json startup_pre startup varparam json_conv \
+		  jsonb_conv window
 ifndef DISABLE_DIALECT
 REGRESS += dialect
 endif
@@ -45,35 +45,18 @@
 SHLIB_LINK += -lv8
 ifdef V8_OUTDIR
 SHLIB_LINK += -L$(V8_OUTDIR)
-else
-SHLIB_LINK += -lv8_libplatform
 endif
 
-
 # v8's remote debugger is optional at the moment, since we don't know
 # how much of the v8 installation is built with debugger enabled.
 ifdef ENABLE_DEBUGGER_SUPPORT
 OPT_ENABLE_DEBUGGER_SUPPORT = -DENABLE_DEBUGGER_SUPPORT
 endif
-
-# for older g++ (e.g. 4.6.x), which do not support c++11
-#OPTFLAGS = -O2 -std=gnu++0x -fno-rtti
-
 OPTFLAGS = -O2 -std=c++11 -fno-rtti
-
 CCFLAGS = -Wall $(OPTFLAGS) $(OPT_ENABLE_DEBUGGER_SUPPORT)
 
 ifdef V8_SRCDIR
-override CPPFLAGS += -I$(V8_SRCDIR) -I$(V8_SRCDIR)/include
-endif
-
-ifeq ($(OS),Windows_NT)
-	# noop for now, it could come in handy later
-else
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S),Darwin)
-		# nothing to do anymore, setting -stdlib=libstdc++ breaks things
-	endif
+override CPPFLAGS += -I$(V8_SRCDIR)/include
 endif
 
 all:
diff -Nru plv8-1.5.0.ds/Makefile.v8 plv8-1.4.6.ds/Makefile.v8
--- plv8-1.5.0.ds/Makefile.v8	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/Makefile.v8	2016-03-27 19:49:02.000000000 +0000
@@ -7,67 +7,36 @@
 # structure in v8 which may be different from version to another, but user
 # can specify the v8 version by AUTOV8_VERSION, too.
 #-----------------------------------------------------------------------------#
-AUTOV8_VERSION = 4.3.66
-AUTOV8_DIR = build/v8-git-mirror-$(AUTOV8_VERSION)
-AUTOV8_OUT = build/v8-git-mirror-$(AUTOV8_VERSION)/out/native
-AUTOV8_DEPOT_TOOLS = build/depot_tools
+AUTOV8_VERSION = 3.14.5
+AUTOV8_DIR = build/v8-$(AUTOV8_VERSION)
+AUTOV8_OUT = build/v8-$(AUTOV8_VERSION)/out/native
 AUTOV8_LIB = $(AUTOV8_OUT)/libv8_snapshot.a
-AUTOV8_STATIC_LIBS = libv8_base.a libv8_snapshot.a libv8_libplatform.a libv8_libbase.a libicui18n.a libicuuc.a libicudata.a
-
-export PATH := $(abspath $(AUTOV8_DEPOT_TOOLS)):$(PATH)
+AUTOV8_STATIC_LIBS = libv8_base.a libv8_snapshot.a
 
 SHLIB_LINK += $(addprefix $(AUTOV8_OUT)/, $(AUTOV8_STATIC_LIBS))
 
 all: $(AUTOV8_LIB)
 
 # For some reason, this solves parallel make dependency.
-plv8_config.h plv8.so: $(AUTOV8_LIB)
+plv8_config.h: $(AUTOV8_LIB)
 
-$(AUTOV8_DEPOT_TOOLS):
+$(AUTOV8_DIR):
 	mkdir -p build
-	cd build; git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-
-$(AUTOV8_DIR): $(AUTOV8_DEPOT_TOOLS)
-	cd build; fetch v8; cd v8; git checkout $(AUTOV8_VERSION); gclient sync
-	mv build/v8 $(AUTOV8_DIR)
+	curl -L 'https://github.com/v8/v8/archive/$(AUTOV8_VERSION).tar.gz' \
+		| tar zxf - -C build
 
 $(AUTOV8_LIB): $(AUTOV8_DIR)
-	env CXXFLAGS=-fPIC CFLAGS=-fPIC $(MAKE) -C build/v8-git-mirror-$(AUTOV8_VERSION) native
+	env CXXFLAGS=-fPIC $(MAKE) -C build/v8-$(AUTOV8_VERSION) dependencies
+	env CXXFLAGS=-fPIC $(MAKE) -C build/v8-$(AUTOV8_VERSION) native
 	test -f $(AUTOV8_OUT)/libv8_base.a || \
 		ln -s $(abspath $(AUTOV8_OUT)/obj.target/tools/gyp/libv8_base.a) \
 			$(AUTOV8_OUT)/libv8_base.a
 	test -f $(AUTOV8_OUT)/libv8_snapshot.a || \
 		ln -s $(abspath $(AUTOV8_OUT)/obj.target/tools/gyp/libv8_snapshot.a) \
 			$(AUTOV8_OUT)/libv8_snapshot.a
-	test -f $(AUTOV8_OUT)/libv8_libbase.a || \
-		ln -s $(abspath $(AUTOV8_OUT)/obj.target/tools/gyp/libv8_libbase.a) \
-			$(AUTOV8_OUT)/libv8_libbase.a
-	test -f $(AUTOV8_OUT)/libv8_libplatform.a || \
-		ln -s $(abspath $(AUTOV8_OUT)/obj.target/tools/gyp/libv8_libplatform.a) \
-			$(AUTOV8_OUT)/libv8_libplatform.a
-	test -f $(AUTOV8_OUT)/libicui18n.a || \
-		ln -s $(abspath $(AUTOV8_OUT)/obj.target/third_party/icu/libicui18n.a) \
-			$(AUTOV8_OUT)/libicui18n.a
-	test -f $(AUTOV8_OUT)/libicuuc.a || \
-		ln -s $(abspath $(AUTOV8_OUT)/obj.target/third_party/icu/libicuuc.a) \
-			$(AUTOV8_OUT)/libicuuc.a
-	test -f $(AUTOV8_OUT)/libicudata.a || \
-		ln -s $(abspath $(AUTOV8_OUT)/obj.target/third_party/icu/libicudata.a) \
-			$(AUTOV8_OUT)/libicudata.a
 
 include Makefile
 
-CCFLAGS += -I$(AUTOV8_DIR)/include -I$(AUTOV8_DIR)
+CCFLAGS += -I$(AUTOV8_DIR)/include
 # We're gonna build static link.  Rip it out after include Makefile
 SHLIB_LINK := $(filter-out -lv8, $(SHLIB_LINK))
-
-ifeq ($(OS),Windows_NT)
-	# noop for now
-else
-	SHLIB_LINK += -L$(AUTOV8_OUT)
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S),Darwin)
-		CCFLAGS += -stdlib=libstdc++
-		SHLIB_LINK += -stdlib=libstdc++
-	endif
-endif
diff -Nru plv8-1.5.0.ds/META.json plv8-1.4.6.ds/META.json
--- plv8-1.5.0.ds/META.json	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/META.json	2016-03-27 19:49:02.000000000 +0000
@@ -2,13 +2,10 @@
     "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.5.0",
+    "version": "1.4.6",
     "maintainer": [
-        "Hitoshi Harada <umi.tanuki@gmail.com>",
-        "Andrew Dunstan <AMDunstan@gmail.com>",
-        "Takahiro Itagaki <itagaki.takahiro@gmail.com>",
-        "Kiswono Prayogo <kiswono@gmail.com>",
-        "Jerry Sievert <code@legitimatesounding.com>"
+        "Jerry Sievert <code@legitimatesounding.com>",
+        "Hitoshi Harada <umi.tanuki@gmail.com>"
     ],
     "license": {
         "PostgreSQL": "http://www.postgresql.org/about/licence"
@@ -27,21 +24,21 @@
     },
     "provides": {
         "plv8": {
-            "file": "plv8--1.5.0.sql",
+            "file": "plv8--1.4.6.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.5.0",
+            "version": "1.4.6",
             "abstract": "A procedural language in JavaScript"
          },
         "plcoffee": {
-            "file": "plcoffee--1.5.0.sql",
+            "file": "plcoffee--1.4.6.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.5.0",
+            "version": "1.4.6",
             "abstract": "A procedural language in CoffeeScript"
          },
         "plls": {
-            "file": "plls--1.5.0.sql",
+            "file": "plls--1.4.6.sql",
             "docfile": "doc/plv8.md",
-            "version": "1.5.0",
+            "version": "1.4.6",
             "abstract": "A procedural language in LiveScript"
          }
     },
diff -Nru plv8-1.5.0.ds/plv8.cc plv8-1.4.6.ds/plv8.cc
--- plv8-1.5.0.ds/plv8.cc	2016-03-18 11:11:54.000000000 +0000
+++ plv8-1.4.6.ds/plv8.cc	2016-03-27 19:49:02.000000000 +0000
@@ -6,8 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include "plv8.h"
-#include "libplatform/libplatform.h"
-
 #include <new>
 
 extern "C" {
@@ -88,8 +86,6 @@
 	Oid						argtypes[FUNC_MAX_ARGS];
 } plv8_proc_cache;
 
-Isolate* plv8_isolate = NULL;
-
 /*
  * The function and context are created at the first invocation.  Their
  * lifetime is same as plv8_proc, but they are not palloc'ed memory,
@@ -99,7 +95,6 @@
 {
 	Persistent<Object>		recv;
 	Persistent<Context>		context;
-	Local<Context> localContext() { return Local<Context>::New(plv8_isolate, context) ; }
 	struct plv8_exec_env   *next;
 } plv8_exec_env;
 
@@ -123,7 +118,6 @@
 typedef struct plv8_context
 {
 	Persistent<Context>		context;
-	Local<Context> localContext() { return Local<Context>::New(plv8_isolate, context) ; }
 	Oid						user_id;
 } plv8_context;
 
@@ -134,40 +128,6 @@
 extern const unsigned char coffee_script_binary_data[];
 extern const unsigned char livescript_binary_data[];
 
-class Plv8ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
- public:
-  virtual void* Allocate(size_t length) {
-    void* data = AllocateUninitialized(length);
-    return data == NULL ? data : memset(data, 0, length);
-  }
-  virtual void* AllocateUninitialized(size_t length) {
-			void *data = NULL;
-
-			PG_TRY();
-			{
-					data = palloc(length);
-			}
-			PG_CATCH();
-			{
-					throw pg_error();
-			}
-			PG_END_TRY();
-
-			return data;
-	}
-  virtual void Free(void* data, size_t) {
-			PG_TRY();
-			{
-					pfree(data);
-			}
-			PG_CATCH();
-			{
-					throw pg_error();
-			}
-			PG_END_TRY();
-	}
-};
-
 /*
  * lower_case_functions are postgres-like C functions.
  * They could raise errors with elog/ereport(ERROR).
@@ -181,10 +141,9 @@
  * They could raise errors with C++ throw statements, or never throw exceptions.
  */
 static plv8_exec_env *CreateExecEnv(Handle<Function> script);
-static plv8_exec_env *CreateExecEnv(Persistent<Function>& script);
 static plv8_proc *Compile(Oid fn_oid, FunctionCallInfo fcinfo,
 					bool validate, bool is_trigger, Dialect dialect);
-static Local<Function> CompileFunction(Persistent<Context>& global_context,
+static Local<Function> CompileFunction(Handle<Context> global_context,
 					const char *proname, int proarglen,
 					const char *proargs[], const char *prosrc,
 					bool is_trigger, bool retset, Dialect dialect);
@@ -193,15 +152,12 @@
 static Datum CallSRFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
 		int nargs, plv8_type argtypes[], plv8_type *rettype);
 static Datum CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv);
-static void GetGlobalContext(Persistent<Context>& global_context);
-static Local<ObjectTemplate> GetGlobalObjectTemplate();
+static Persistent<Context> GetGlobalContext();
+static Persistent<ObjectTemplate> GetGlobalObjectTemplate();
 
 /* A GUC to specify a custom start up function to call */
 static char *plv8_start_proc = NULL;
 
-/* A GUC to specify V8 flags (e.g. --es_staging) */
-static char *plv8_v8_flags = NULL;
-
 /* A GUC to specify the remote debugger port */
 static int plv8_debugger_port;
 /*
@@ -235,7 +191,7 @@
 _PG_init(void)
 {
 	HASHCTL    hash_ctl = { 0 };
-
+	
 	hash_ctl.keysize = sizeof(Oid);
 	hash_ctl.entrysize = sizeof(plv8_proc_cache);
 	hash_ctl.hash = oid_hash;
@@ -254,18 +210,6 @@
 							   NULL,
 							   NULL);
 
-	DefineCustomStringVariable("plv8.v8_flags",
-							   gettext_noop("V8 engine initialization flags (e.g. --es_staging for additional ES6 features)."),
-							   NULL,
-							   &plv8_v8_flags,
-							   NULL,
-							   PGC_USERSET, 0,
-#if PG_VERSION_NUM >= 90100
-							   NULL,
-#endif
-							   NULL,
-							   NULL);
-
 	DefineCustomIntVariable("plv8.debugger_port",
 							gettext_noop("V8 remote debug port."),
 							gettext_noop("The default value is 35432.  "
@@ -282,19 +226,6 @@
 	RegisterXactCallback(plv8_xact_cb, NULL);
 
 	EmitWarningsOnPlaceholders("plv8");
-
-	V8::SetArrayBufferAllocator(new Plv8ArrayBufferAllocator);
-
-	V8::InitializeICU();
-	Platform* platform = platform::CreateDefaultPlatform();
-	V8::InitializePlatform(platform);
-	V8::Initialize();
-	if (plv8_v8_flags != NULL) {
-	      V8::SetFlagsFromString(plv8_v8_flags, strlen(plv8_v8_flags));
-	}
-	plv8_isolate = Isolate::New();
-	plv8_isolate->Enter();
-
 }
 
 static void
@@ -306,7 +237,8 @@
 	{
 		if (!env->recv.IsEmpty())
 		{
-			env->recv.Reset();
+			env->recv.Dispose();
+			env->recv.Clear();
 		}
 		env = env->next;
 		/*
@@ -346,7 +278,7 @@
 #ifdef ENABLE_DEBUGGER_SUPPORT
 		Locker				lock;
 #endif  // ENABLE_DEBUGGER_SUPPORT
-		HandleScope	handle_scope(plv8_isolate);
+		HandleScope	handle_scope;
 
 		if (!fcinfo->flinfo->fn_extra)
 		{
@@ -405,12 +337,11 @@
 #ifdef ENABLE_DEBUGGER_SUPPORT
 		Locker				lock;
 #endif  // ENABLE_DEBUGGER_SUPPORT
-		HandleScope			handle_scope(plv8_isolate);
+		HandleScope			handle_scope;
 		char			   *source_text = codeblock->source_text;
 
-		Persistent<Context>	global_context;
-		GetGlobalContext(global_context);
-		Local<Function>	function = CompileFunction(global_context,
+		Handle<Context>	global_context = GetGlobalContext();
+		Handle<Function>	function = CompileFunction(global_context,
 										NULL, 0, NULL,
 										source_text, false, false, dialect);
 		plv8_exec_env	   *xenv = CreateExecEnv(function);
@@ -470,7 +401,7 @@
 CallFunction(PG_FUNCTION_ARGS, plv8_exec_env *xenv,
 	int nargs, plv8_type argtypes[], plv8_type *rettype)
 {
-	Local<Context>		context = xenv->localContext();
+	Handle<Context>		context = xenv->context;
 	Context::Scope		context_scope(context);
 	Handle<v8::Value>	args[FUNC_MAX_ARGS];
 	Handle<Object>		plv8obj;
@@ -497,11 +428,10 @@
 			args[i] = ToValue(fcinfo->arg[i], fcinfo->argnull[i], &argtypes[i]);
 	}
 
-	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
 	Local<Function>		fn =
-		Local<Function>::Cast(recv->GetInternalField(0));
+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
 	Local<v8::Value> result =
-		DoCall(fn, recv, nargs, args);
+		DoCall(fn, xenv->recv, nargs, args);
 
 	if (rettype)
 		return ToDatum(result, &fcinfo->isnull, rettype);
@@ -579,7 +509,7 @@
 
 	tupstore = CreateTupleStore(fcinfo, &tupdesc);
 
-	Handle<Context>		context = xenv->localContext();
+	Handle<Context>		context = xenv->context;
 	Context::Scope		context_scope(context);
 	Converter			conv(tupdesc, proc->functypclass == TYPEFUNC_SCALAR);
 	Handle<v8::Value>	args[FUNC_MAX_ARGS + 1];
@@ -593,11 +523,10 @@
 	for (int i = 0; i < nargs; i++)
 		args[i] = ToValue(fcinfo->arg[i], fcinfo->argnull[i], &argtypes[i]);
 
-	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
 	Local<Function>		fn =
-		Local<Function>::Cast(recv->GetInternalField(0));
+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
 
-	Handle<v8::Value> result = DoCall(fn, recv, nargs, args);
+	Handle<v8::Value> result = DoCall(fn, xenv->recv, nargs, args);
 
 	if (result->IsUndefined())
 	{
@@ -643,7 +572,7 @@
 	Handle<v8::Value>	args[10];
 	Datum				result = (Datum) 0;
 
-	Handle<Context>		context = xenv->localContext();
+	Handle<Context>		context = xenv->context;
 	Context::Scope		context_scope(context);
 
 	if (TRIGGER_FIRED_FOR_ROW(event))
@@ -657,13 +586,13 @@
 			// NEW
 			args[0] = conv.ToValue(trig->tg_trigtuple);
 			// OLD
-			args[1] = Undefined(plv8_isolate);
+			args[1] = Undefined();
 		}
 		else if (TRIGGER_FIRED_BY_DELETE(event))
 		{
 			result = PointerGetDatum(trig->tg_trigtuple);
 			// NEW
-			args[0] = Undefined(plv8_isolate);
+			args[0] = Undefined();
 			// OLD
 			args[1] = conv.ToValue(trig->tg_trigtuple);
 		}
@@ -678,7 +607,7 @@
 	}
 	else
 	{
-		args[0] = args[1] = Undefined(plv8_isolate);
+		args[0] = args[1] = Undefined();
 	}
 
 	// 2: TG_NAME
@@ -686,32 +615,32 @@
 
 	// 3: TG_WHEN
 	if (TRIGGER_FIRED_BEFORE(event))
-		args[3] = String::NewFromUtf8(plv8_isolate, "BEFORE");
+		args[3] = String::New("BEFORE");
 	else
-		args[3] = String::NewFromUtf8(plv8_isolate, "AFTER");
+		args[3] = String::New("AFTER");
 
 	// 4: TG_LEVEL
 	if (TRIGGER_FIRED_FOR_ROW(event))
-		args[4] = String::NewFromUtf8(plv8_isolate, "ROW");
+		args[4] = String::New("ROW");
 	else
-		args[4] = String::NewFromUtf8(plv8_isolate, "STATEMENT");
+		args[4] = String::New("STATEMENT");
 
 	// 5: TG_OP
 	if (TRIGGER_FIRED_BY_INSERT(event))
-		args[5] = String::NewFromUtf8(plv8_isolate, "INSERT");
+		args[5] = String::New("INSERT");
 	else if (TRIGGER_FIRED_BY_DELETE(event))
-		args[5] = String::NewFromUtf8(plv8_isolate, "DELETE");
+		args[5] = String::New("DELETE");
 	else if (TRIGGER_FIRED_BY_UPDATE(event))
-		args[5] = String::NewFromUtf8(plv8_isolate, "UPDATE");
+		args[5] = String::New("UPDATE");
 #ifdef TRIGGER_FIRED_BY_TRUNCATE
 	else if (TRIGGER_FIRED_BY_TRUNCATE(event))
-		args[5] = String::NewFromUtf8(plv8_isolate, "TRUNCATE");
+		args[5] = String::New("TRUNCATE");
 #endif
 	else
-		args[5] = String::NewFromUtf8(plv8_isolate, "?");
+		args[5] = String::New("?");
 
 	// 6: TG_RELID
-	args[6] = Uint32::New(plv8_isolate, RelationGetRelid(rel));
+	args[6] = Uint32::New(RelationGetRelid(rel));
 
 	// 7: TG_TABLE_NAME
 	args[7] = ToString(RelationGetRelationName(rel));
@@ -720,17 +649,16 @@
 	args[8] = ToString(get_namespace_name(RelationGetNamespace(rel)));
 
 	// 9: TG_ARGV
-	Handle<Array> tgargs = Array::New(plv8_isolate, trig->tg_trigger->tgnargs);
+	Handle<Array> tgargs = Array::New(trig->tg_trigger->tgnargs);
 	for (int i = 0; i < trig->tg_trigger->tgnargs; i++)
 		tgargs->Set(i, ToString(trig->tg_trigger->tgargs[i]));
 	args[9] = tgargs;
 
 	TryCatch			try_catch;
-	Local<Object> recv = Local<Object>::New(plv8_isolate, xenv->recv);
 	Local<Function>		fn =
-		Local<Function>::Cast(recv->GetInternalField(0));
+		Local<Function>::Cast(xenv->recv->GetInternalField(0));
 	Handle<v8::Value> newtup =
-		DoCall(fn, recv, lengthof(args), args);
+		DoCall(fn, xenv->recv, lengthof(args), args);
 
 	if (newtup.IsEmpty())
 		throw js_error(try_catch);
@@ -876,7 +804,8 @@
 				pfree(cache->prosrc);
 				cache->prosrc = NULL;
 			}
-			cache->function.Reset();
+			cache->function.Dispose();
+			cache->function.Clear();
 		}
 		else
 		{
@@ -985,46 +914,10 @@
 }
 
 static plv8_exec_env *
-CreateExecEnv(Persistent<Function>& function)
-{
-	plv8_exec_env	   *xenv;
-	HandleScope			handle_scope(plv8_isolate);
-
-	PG_TRY();
-	{
-		xenv = plv8_new_exec_env();
-	}
-	PG_CATCH();
-	{
-		throw pg_error();
-	}
-	PG_END_TRY();
-
-	GetGlobalContext(xenv->context);
-	Context::Scope		scope(xenv->localContext());
-
-	static Persistent<ObjectTemplate> recv_templ;
-	if (recv_templ.IsEmpty())
-	{
-		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
-		templ->SetInternalFieldCount(1);
-		recv_templ.Reset(plv8_isolate, templ);
-	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, recv_templ);
-	Local<Object> obj = templ->NewInstance();
-	Local<Function> f = Local<Function>::New(plv8_isolate, function);
-	obj->SetInternalField(0, f);
-	xenv->recv.Reset(plv8_isolate, obj);
-
-
-	return xenv;
-}
-
-static plv8_exec_env *
 CreateExecEnv(Handle<Function> function)
 {
 	plv8_exec_env	   *xenv;
-	HandleScope			handle_scope(plv8_isolate);
+	HandleScope			handle_scope;
 
 	PG_TRY();
 	{
@@ -1036,22 +929,18 @@
 	}
 	PG_END_TRY();
 
-	GetGlobalContext(xenv->context);
-	Context::Scope		scope(xenv->localContext());
+	xenv->context = GetGlobalContext();
+	Context::Scope		scope(xenv->context);
 
 	static Persistent<ObjectTemplate> recv_templ;
 	if (recv_templ.IsEmpty())
 	{
-		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
-		templ->SetInternalFieldCount(1);
-		recv_templ.Reset(plv8_isolate, templ);
-	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, recv_templ);
-	Local<Object> obj = templ->NewInstance();
-	Local<Function> f = Local<Function>::New(plv8_isolate, function);
-	obj->SetInternalField(0, f);
-	xenv->recv.Reset(plv8_isolate, obj);
+		recv_templ = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
+		recv_templ->SetInternalFieldCount(1);
+	}
+	xenv->recv = Persistent<Object>::New(recv_templ->NewInstance());
 
+	xenv->recv->SetInternalField(0, function);
 
 	return xenv;
 }
@@ -1060,14 +949,9 @@
 static char *
 CompileDialect(const char *src, Dialect dialect)
 {
-	HandleScope		handle_scope(plv8_isolate);
-	static Persistent<Context>	context;
-	if (context.IsEmpty()) {
-	   Local<Context> ctx = Context::New(plv8_isolate, (ExtensionConfiguration*)NULL);
-	   context.Reset(plv8_isolate, ctx);
-	}
-	Local<Context> ctx = Local<Context>::New(plv8_isolate, context);
-	Context::Scope	context_scope(ctx);
+	HandleScope		handle_scope;
+	static Persistent<Context>	context = Context::New((ExtensionConfiguration*)NULL);
+	Context::Scope	context_scope(context);
 	TryCatch		try_catch;
 	Local<String>	key;
 	char		   *cresult;
@@ -1078,24 +962,24 @@
 		case PLV8_DIALECT_COFFEE:
 			if (coffee_script_binary_data[0] == '\0')
 				throw js_error("CoffeeScript is not enabled");
-			key = String::NewFromUtf8(plv8_isolate, "CoffeeScript", String::kInternalizedString);
+			key = String::NewSymbol("CoffeeScript");
 			dialect_binary_data = (const char *) coffee_script_binary_data;
 			break;
 		case PLV8_DIALECT_LIVESCRIPT:
 			if (livescript_binary_data[0] == '\0')
 				throw js_error("LiveScript is not enabled");
-			key = String::NewFromUtf8(plv8_isolate, "LiveScript", String::kInternalizedString);
+			key = String::NewSymbol("LiveScript");
 			dialect_binary_data = (const char *) livescript_binary_data;
 			break;
 		default:
 			throw js_error("Unknown Dialect");
 	}
 
-	if (ctx->Global()->Get(key)->IsUndefined())
+	if (context->Global()->Get(key)->IsUndefined())
 	{
-		HandleScope		handle_scope(plv8_isolate);
+		HandleScope		handle_scope;
 		Local<Script>	script =
-			Script::Compile(ToString(dialect_binary_data), key);
+			Script::New(ToString(dialect_binary_data), key);
 		if (script.IsEmpty())
 			throw js_error(try_catch);
 		Local<v8::Value>	result = script->Run();
@@ -1103,9 +987,9 @@
 			throw js_error(try_catch);
 	}
 
-	Local<Object>	compiler = Local<Object>::Cast(ctx->Global()->Get(key));
+	Local<Object>	compiler = Local<Object>::Cast(context->Global()->Get(key));
 	Local<Function>	func = Local<Function>::Cast(
-			compiler->Get(String::NewFromUtf8(plv8_isolate, "compile", String::kInternalizedString)));
+			compiler->Get(String::NewSymbol("compile")));
 	const int		nargs = 1;
 	Handle<v8::Value>	args[nargs];
 
@@ -1165,10 +1049,9 @@
 		 * point.  Then some pointers of cache will become stale by pfree
 		 * and CompileFunction ends up compiling freed function source.
 		 */
-		HandleScope		handle_scope(plv8_isolate);
-		Persistent<Context>	global_context;
-		GetGlobalContext(global_context);
-		cache->function.Reset(plv8_isolate, CompileFunction(
+		HandleScope		handle_scope;
+		Handle<Context>	global_context = GetGlobalContext();
+		cache->function = Persistent<Function>::New(CompileFunction(
 						global_context,
 						cache->proname,
 						cache->nargs,
@@ -1184,7 +1067,7 @@
 
 static Local<Function>
 CompileFunction(
-	Persistent<Context>& global_context,
+	Handle<Context> global_context,
 	const char *proname,
 	int proarglen,
 	const char *proargs[],
@@ -1193,7 +1076,7 @@
 	bool retset,
 	Dialect dialect)
 {
-	EscapableHandleScope		handle_scope(plv8_isolate);
+	HandleScope		handle_scope;
 	StringInfoData	src;
 
 	initStringInfo(&src);
@@ -1236,14 +1119,13 @@
 	if (proname)
 		name = ToString(proname);
 	else
-		name = Undefined(plv8_isolate);
+		name = Undefined();
 	Local<String> source = ToString(src.data, src.len);
 	pfree(src.data);
 
-	Local<Context> context = Local<Context>::New(plv8_isolate, global_context);
-	Context::Scope	context_scope(context);
+	Context::Scope	context_scope(global_context);
 	TryCatch		try_catch;
-	Local<Script>	script = Script::Compile(source, Handle<String>::Cast(name));
+	Local<Script>	script = Script::New(source, name);
 
 	if (script.IsEmpty())
 		throw js_error(try_catch);
@@ -1252,7 +1134,7 @@
 	if (result.IsEmpty())
 		throw js_error(try_catch);
 
-	return handle_scope.Escape(Local<Function>::Cast(result));
+	return handle_scope.Close(Local<Function>::Cast(result));
 }
 
 Local<Function>
@@ -1303,7 +1185,7 @@
 
 		TryCatch			try_catch;
 
-		func = Local<Function>::New(plv8_isolate, proc->cache->function);
+		func = Local<Function>::New(proc->cache->function);
 	}
 	catch (js_error& e) { e.rethrow(); }
 	catch (pg_error& e) { e.rethrow(); }
@@ -1378,35 +1260,34 @@
 Handle<v8::Value>
 ThrowError(const char *message) throw()
 {
-	return plv8_isolate->ThrowException(Exception::Error(String::NewFromUtf8(plv8_isolate, message)));
+	return ThrowException(Exception::Error(String::New(message)));
 }
 
-static void
-GetGlobalContext(Persistent<Context>& global_context)
+static Persistent<Context>
+GetGlobalContext()
 {
 	Oid					user_id = GetUserId();
+	Persistent<Context>	global_context;
 	unsigned int		i;
 
 	for (i = 0; i < ContextVector.size(); i++)
 	{
 		if (ContextVector[i]->user_id == user_id)
 		{
-			global_context.Reset(plv8_isolate, ContextVector[i]->context);
+			global_context = ContextVector[i]->context;
 			break;
 		}
 	}
 	if (global_context.IsEmpty())
 	{
-		HandleScope				handle_scope(plv8_isolate);
-
-		Local<ObjectTemplate>	global = Local<ObjectTemplate>::New(plv8_isolate, GetGlobalObjectTemplate());
+		HandleScope				handle_scope;
+		Handle<ObjectTemplate>	global = GetGlobalObjectTemplate();
 		plv8_context		   *my_context;
 
-		global_context.Reset(plv8_isolate, Context::New(plv8_isolate, NULL, global));
+		global_context = Context::New(NULL, global);
 		my_context = (plv8_context *) MemoryContextAlloc(TopMemoryContext,
 														 sizeof(plv8_context));
-		new(&my_context->context) Persistent<Context>();
-		my_context->context.Reset(plv8_isolate, global_context);
+		my_context->context = global_context;
 		my_context->user_id = user_id;
 
 		/*
@@ -1422,8 +1303,8 @@
 		{
 			Local<Function>		func;
 
-			HandleScope			handle_scope(plv8_isolate);
-			Context::Scope		context_scope(my_context->localContext());
+			HandleScope			handle_scope;
+			Context::Scope		context_scope(global_context);
 			TryCatch			try_catch;
 			MemoryContext		ctx = CurrentMemoryContext;
 
@@ -1446,7 +1327,7 @@
 			if (!func.IsEmpty())
 			{
 				Handle<v8::Value>	result =
-					DoCall(func, my_context->localContext()->Global(), 0, NULL);
+					DoCall(func, global_context->Global(), 0, NULL);
 				if (result.IsEmpty())
 					throw js_error(try_catch);
 			}
@@ -1462,40 +1343,42 @@
 		v8::Debug::EnableAgent("plv8", plv8_debugger_port, false);
 #endif  // ENABLE_DEBUGGER_SUPPORT
 	}
+
+	return global_context;
 }
 
-static Local<ObjectTemplate>
+static Persistent<ObjectTemplate>
 GetGlobalObjectTemplate()
 {
 	static Persistent<ObjectTemplate>	global;
 
 	if (global.IsEmpty())
 	{
-		HandleScope				handle_scope(plv8_isolate);
+		HandleScope				handle_scope;
 
-		Local<ObjectTemplate> templ = ObjectTemplate::New();
+		global = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
 		// ERROR levels for elog
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG5", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG5));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG4", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG4));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG3", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG3));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG2", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG2));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG1", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG1));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "DEBUG", String::kInternalizedString), Int32::New(plv8_isolate, DEBUG5));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "LOG", String::kInternalizedString), Int32::New(plv8_isolate, LOG));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "INFO", String::kInternalizedString), Int32::New(plv8_isolate, INFO));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "NOTICE", String::kInternalizedString), Int32::New(plv8_isolate, NOTICE));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "WARNING", String::kInternalizedString), Int32::New(plv8_isolate, WARNING));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "ERROR", String::kInternalizedString), Int32::New(plv8_isolate, ERROR));
-		global.Reset(plv8_isolate, templ);
+		global->Set(String::NewSymbol("DEBUG5"), Int32::New(DEBUG5));
+		global->Set(String::NewSymbol("DEBUG4"), Int32::New(DEBUG4));
+		global->Set(String::NewSymbol("DEBUG3"), Int32::New(DEBUG3));
+		global->Set(String::NewSymbol("DEBUG2"), Int32::New(DEBUG2));
+		global->Set(String::NewSymbol("DEBUG1"), Int32::New(DEBUG1));
+		global->Set(String::NewSymbol("DEBUG"), Int32::New(DEBUG5));
+		global->Set(String::NewSymbol("LOG"), Int32::New(LOG));
+		global->Set(String::NewSymbol("INFO"), Int32::New(INFO));
+		global->Set(String::NewSymbol("NOTICE"), Int32::New(NOTICE));
+		global->Set(String::NewSymbol("WARNING"), Int32::New(WARNING));
+		global->Set(String::NewSymbol("ERROR"), Int32::New(ERROR));
 
 		Handle<ObjectTemplate>	plv8 = ObjectTemplate::New();
 
 		SetupPlv8Functions(plv8);
-		plv8->Set(String::NewFromUtf8(plv8_isolate, "version", String::kInternalizedString), String::NewFromUtf8(plv8_isolate, PLV8_VERSION));
+		plv8->Set(String::NewSymbol("version"), String::New(PLV8_VERSION));
 
-		templ->Set(String::NewFromUtf8(plv8_isolate, "plv8", String::kInternalizedString), plv8);
+		global->Set(String::NewSymbol("plv8"), plv8);
 	}
-	return Local<ObjectTemplate>::New(plv8_isolate, global);
+
+	return global;
 }
 
 /*
@@ -1590,7 +1473,7 @@
 Local<Object>
 Converter::ToValue(HeapTuple tuple)
 {
-	Local<Object>	obj = Object::New(plv8_isolate);
+	Local<Object>	obj = Object::New();
 
 	for (int c = 0; c < m_tupdesc->natts; c++)
 	{
@@ -1709,7 +1592,7 @@
 
 js_error::js_error(TryCatch &try_catch) throw()
 {
-	HandleScope			handle_scope(plv8_isolate);
+	HandleScope			handle_scope;
 	String::Utf8Value	exception(try_catch.Exception());
 	Handle<Message>		message = try_catch.Message();
 
@@ -1732,8 +1615,6 @@
 			 * at the first line to the javascript code.
 			 */
 			initStringInfo(&str);
-			if (strstr(m_msg, "Error: ") == m_msg)
-				m_msg += 7;
 			appendStringInfo(&str, "%s() LINE %d: %s",
 				script.str("?"), lineno - 1, source.str("?"));
 			m_detail = str.data;
diff -Nru plv8-1.5.0.ds/plv8_func.cc plv8-1.4.6.ds/plv8_func.cc
--- plv8-1.5.0.ds/plv8_func.cc	2016-03-18 11:11:54.000000000 +0000
+++ plv8-1.4.6.ds/plv8_func.cc	2016-03-27 19:49:02.000000000 +0000
@@ -7,6 +7,7 @@
  */
 #include "plv8.h"
 #include "plv8_param.h"
+#include <sstream>
 #include <string>
 
 extern "C" {
@@ -32,32 +33,32 @@
 
 using namespace v8;
 
-static void plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value>& args) throw();
-static void plv8_Elog(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_Execute(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_Prepare(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_PlanCursor(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_PlanExecute(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_PlanFree(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_CursorFetch(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_CursorClose(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_ReturnNext(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_Subtransaction(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_FindFunction(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinSetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetCurrentPosition(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetPartitionRowCount(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinSetMarkPosition(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinRowsArePeers(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetFuncArgInPartition(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetFuncArgInFrame(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_WinGetFuncArgCurrent(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_QuoteLiteral(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_QuoteNullable(const FunctionCallbackInfo<v8::Value>& args);
-static void plv8_QuoteIdent(const FunctionCallbackInfo<v8::Value>& args);
+static Handle<v8::Value> plv8_FunctionInvoker(const Arguments& args) throw();
+static Handle<v8::Value> plv8_Elog(const Arguments& args);
+static Handle<v8::Value> plv8_Execute(const Arguments& args);
+static Handle<v8::Value> plv8_Prepare(const Arguments& args);
+static Handle<v8::Value> plv8_PlanCursor(const Arguments& args);
+static Handle<v8::Value> plv8_PlanExecute(const Arguments& args);
+static Handle<v8::Value> plv8_PlanFree(const Arguments& args);
+static Handle<v8::Value> plv8_CursorFetch(const Arguments& args);
+static Handle<v8::Value> plv8_CursorMove(const Arguments& args);
+static Handle<v8::Value> plv8_CursorClose(const Arguments& args);
+static Handle<v8::Value> plv8_ReturnNext(const Arguments& args);
+static Handle<v8::Value> plv8_Subtransaction(const Arguments& args);
+static Handle<v8::Value> plv8_FindFunction(const Arguments& args);
+static Handle<v8::Value> plv8_GetWindowObject(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetPartitionLocal(const Arguments& args);
+static Handle<v8::Value> plv8_WinSetPartitionLocal(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetCurrentPosition(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetPartitionRowCount(const Arguments& args);
+static Handle<v8::Value> plv8_WinSetMarkPosition(const Arguments& args);
+static Handle<v8::Value> plv8_WinRowsArePeers(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetFuncArgInPartition(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetFuncArgInFrame(const Arguments& args);
+static Handle<v8::Value> plv8_WinGetFuncArgCurrent(const Arguments& args);
+static Handle<v8::Value> plv8_QuoteLiteral(const Arguments& args);
+static Handle<v8::Value> plv8_QuoteNullable(const Arguments& args);
+static Handle<v8::Value> plv8_QuoteIdent(const Arguments& args);
 
 /*
  * Window function API allows to store partition-local memory, but
@@ -87,26 +88,26 @@
 #endif
 
 static inline Local<v8::Value>
-WrapCallback(FunctionCallback func)
+WrapCallback(InvocationCallback func)
 {
-	return External::New(plv8_isolate,
+	return External::New(
 			reinterpret_cast<void *>(
 				reinterpret_cast<uintptr_t>(func)));
 }
 
-static inline FunctionCallback
+static inline InvocationCallback
 UnwrapCallback(Handle<v8::Value> value)
 {
-	return reinterpret_cast<FunctionCallback>(
+	return reinterpret_cast<InvocationCallback>(
 			reinterpret_cast<uintptr_t>(External::Cast(*value)->Value()));
 }
 
 static inline void
 SetCallback(Handle<ObjectTemplate> obj, const char *name,
-			FunctionCallback func, PropertyAttribute attr = None)
+			InvocationCallback func, PropertyAttribute attr = None)
 {
-	obj->Set(String::NewFromUtf8(plv8_isolate, name, String::kInternalizedString),
-				FunctionTemplate::New(plv8_isolate, plv8_FunctionInvoker,
+	obj->Set(String::NewSymbol(name),
+				FunctionTemplate::New(plv8_FunctionInvoker,
 					WrapCallback(func)), attr);
 }
 
@@ -127,10 +128,8 @@
 {
 	Local<v8::Value>	result;
 
-	if (status < 0) {
-		plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, FormatSPIStatus(status)));
-		return result;
-	}
+	if (status < 0)
+		return ThrowError(FormatSPIStatus(status));
 
 	switch (status)
 	{
@@ -141,7 +140,7 @@
 	{
 		int				nrows = SPI_processed;
 		Converter		conv(SPI_tuptable->tupdesc);
-		Local<Array>	rows = Array::New(plv8_isolate, nrows);
+		Local<Array>	rows = Array::New(nrows);
 
 		for (int r = 0; r < nrows; r++)
 			rows->Set(r, conv.ToValue(SPI_tuptable->vals[r]));
@@ -150,7 +149,7 @@
 		break;
 	}
 	default:
-		result = Int32::New(plv8_isolate, SPI_processed);
+		result = Int32::New(SPI_processed);
 		break;
 	}
 
@@ -167,6 +166,7 @@
 		throw js_error("out of transaction");
 
 	BeginInternalSubTransaction(NULL);
+
 }
 
 void
@@ -176,13 +176,15 @@
 		ReleaseCurrentSubTransaction();
 	else
 		RollbackAndReleaseCurrentSubTransaction();
+
+
 }
 
 JSONObject::JSONObject()
 {
-	Handle<Context> context = plv8_isolate->GetCurrentContext();
+	Handle<Context> context = Context::GetCurrent();
 	Handle<Object> global = context->Global();
-	m_json = global->Get(String::NewFromUtf8(plv8_isolate, "JSON", String::kInternalizedString))->ToObject();
+	m_json = global->Get(String::NewSymbol("JSON"))->ToObject();
 	if (m_json.IsEmpty())
 		throw js_error("JSON not found");
 }
@@ -194,7 +196,7 @@
 JSONObject::Parse(Handle<v8::Value> str)
 {
 	Handle<Function> parse_func =
-		Handle<Function>::Cast(m_json->Get(String::NewFromUtf8(plv8_isolate, "parse", String::kInternalizedString)));
+		Handle<Function>::Cast(m_json->Get(String::NewSymbol("parse")));
 
 	if (parse_func.IsEmpty())
 		throw js_error("JSON.parse() not found");
@@ -209,7 +211,7 @@
 JSONObject::Stringify(Handle<v8::Value> val)
 {
 	Handle<Function> stringify_func =
-		Handle<Function>::Cast(m_json->Get(String::NewFromUtf8(plv8_isolate, "stringify", String::kInternalizedString)));
+		Handle<Function>::Cast(m_json->Get(String::NewSymbol("stringify")));
 
 	if (stringify_func.IsEmpty())
 		throw js_error("JSON.stringify() not found");
@@ -241,12 +243,12 @@
  * v8 is not exception-safe! We cannot throw C++ exceptions over v8 functions.
  * So, we catch C++ exceptions and convert them to JavaScript ones.
  */
-static void
-plv8_FunctionInvoker(const FunctionCallbackInfo<v8::Value> &args) throw()
+static Handle<v8::Value>
+plv8_FunctionInvoker(const Arguments &args) throw()
 {
-	HandleScope		handle_scope(plv8_isolate);
+	HandleScope		handle_scope;
 	MemoryContext	ctx = CurrentMemoryContext;
-	FunctionCallback	fn = UnwrapCallback(args.Data());
+	InvocationCallback	fn = UnwrapCallback(args.Data());
 
 	try
 	{
@@ -254,58 +256,31 @@
 	}
 	catch (js_error& e)
 	{
-		args.GetReturnValue().Set(plv8_isolate->ThrowException(e.error_object()));
+		return ThrowException(e.error_object());
 	}
 	catch (pg_error& e)
 	{
 		MemoryContextSwitchTo(ctx);
 		ErrorData *edata = CopyErrorData();
-
 		Handle<String> message = ToString(edata->message);
-		Handle<String> sqlerrcode = ToString(unpack_sql_state(edata->sqlerrcode));
-#if PG_VERSION_NUM >= 90300
-		Handle<Primitive> schema_name = edata->schema_name ?
-			Handle<Primitive>(ToString(edata->schema_name)) : Null(plv8_isolate);
-		Handle<Primitive> table_name = edata->table_name ?
-			Handle<Primitive>(ToString(edata->table_name)) : Null(plv8_isolate);
-		Handle<Primitive> column_name = edata->column_name ?
-			Handle<Primitive>(ToString(edata->column_name)) : Null(plv8_isolate);
-		Handle<Primitive> datatype_name = edata->datatype_name ?
-			Handle<Primitive>(ToString(edata->datatype_name)) : Null(plv8_isolate);
-		Handle<Primitive> constraint_name = edata->constraint_name ?
-			Handle<Primitive>(ToString(edata->constraint_name)) : Null(plv8_isolate);
-#endif
-
 		// XXX: add other fields? (detail, hint, context, internalquery...)
 		FlushErrorState();
 		FreeErrorData(edata);
 
-		Handle<v8::Object> err = Exception::Error(message)->ToObject();
-		err->Set(String::NewFromUtf8(plv8_isolate, "sqlerrcode"), sqlerrcode);
-#if PG_VERSION_NUM >= 90300
-		err->Set(String::NewFromUtf8(plv8_isolate, "schema_name"), schema_name);
-		err->Set(String::NewFromUtf8(plv8_isolate, "table_name"), table_name);
-		err->Set(String::NewFromUtf8(plv8_isolate, "column_name"), column_name);
-		err->Set(String::NewFromUtf8(plv8_isolate, "datatype_name"), datatype_name);
-		err->Set(String::NewFromUtf8(plv8_isolate, "constraint_name"), constraint_name);
-#endif
-
-		args.GetReturnValue().Set(plv8_isolate->ThrowException(err));
+		return ThrowException(Exception::Error(message));
 	}
 }
 
 /*
  * plv8.elog(elevel, str)
  */
-static void
-plv8_Elog(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_Elog(const Arguments& args)
 {
 	MemoryContext	ctx = CurrentMemoryContext;
 
-	if (args.Length() < 2) {
-		args.GetReturnValue().Set(plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, "usage: plv8.elog(elevel, ...)")));
-		return;
-	}
+	if (args.Length() < 2)
+		return ThrowError("usage: plv8.elog(elevel, ...)");
 
 	int	elevel = args[0]->Int32Value();
 	switch (elevel)
@@ -322,8 +297,7 @@
 	case ERROR:
 		break;
 	default:
-		args.GetReturnValue().Set(plv8_isolate->ThrowException(String::NewFromUtf8(plv8_isolate, "invalid error level")));
-		return;
+		return ThrowError("invalid error level");
 	}
 
 	std::string msg;
@@ -334,8 +308,7 @@
 			msg += " ";
 		}
 		if (!CString::toStdString(args[i],buf)){
-			args.GetReturnValue().Set(Undefined(plv8_isolate));
-			return;
+			return Undefined();
 		}
 		msg += buf;
 	}
@@ -344,8 +317,7 @@
 	if (elevel != ERROR)
 	{
 		elog(elevel, "%s", message);
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
+		return Undefined();
 	}
 
 	/* ERROR case */
@@ -361,12 +333,11 @@
 		FlushErrorState();
 		FreeErrorData(edata);
 
-		args.GetReturnValue().Set(plv8_isolate->ThrowException(Exception::Error(message)));
-		return;
+		return ThrowException(Exception::Error(message));
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 static Datum
@@ -451,9 +422,9 @@
 }
 
 static Handle<Array>
-convertArgsToArray(const FunctionCallbackInfo<v8::Value> &args, int start, int downshift)
+convertArgsToArray(const Arguments &args, int start, int downshift)
 {
-	Local<Array> result = Array::New(plv8_isolate, args.Length() - start);
+	Local<Array> result = Array::New(args.Length() - start);
 	for (int i = start; i < args.Length(); i++)
 	{
 		result->Set(i - downshift, args[i]);
@@ -464,15 +435,13 @@
 /*
  * plv8.execute(statement, [param, ...])
  */
-static void
-plv8_Execute(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_Execute(const Arguments &args)
 {
 	int				status;
 
-	if (args.Length() < 1) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 
 	CString			sql(args[0]);
 	Handle<Array>	params;
@@ -507,14 +476,14 @@
 
 	subtran.exit(true);
 
-	args.GetReturnValue().Set(SPIResultToValue(status));
+	return SPIResultToValue(status);
 }
 
 /*
  * plv8.prepare(statement, args...)
  */
-static void
-plv8_Prepare(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_Prepare(const Arguments &args)
 {
 	SPIPlanPtr		initial = NULL, saved;
 	CString			sql(args[0]);
@@ -570,29 +539,28 @@
 
 	if (PlanTemplate.IsEmpty())
 	{
-		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
-		base->SetClassName(String::NewFromUtf8(plv8_isolate, "PreparedPlan", String::kInternalizedString));
+		Local<FunctionTemplate> base = FunctionTemplate::New();
+		base->SetClassName(String::NewSymbol("PreparedPlan"));
 		Local<ObjectTemplate> templ = base->InstanceTemplate();
 		templ->SetInternalFieldCount(2);
 		SetCallback(templ, "cursor", plv8_PlanCursor);
 		SetCallback(templ, "execute", plv8_PlanExecute);
 		SetCallback(templ, "free", plv8_PlanFree);
-		PlanTemplate.Reset(plv8_isolate, templ);
+		PlanTemplate = Persistent<ObjectTemplate>::New(templ);
 	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, PlanTemplate);
 
-	Local<v8::Object> result = templ->NewInstance();
-	result->SetInternalField(0, External::New(plv8_isolate, saved));
-	result->SetInternalField(1, External::New(plv8_isolate, parstate));
+	Local<v8::Object> result = PlanTemplate->NewInstance();
+	result->SetInternalField(0, External::New(saved));
+	result->SetInternalField(1, External::New(parstate));
 
-	args.GetReturnValue().Set(result);
+	return result;
 }
 
 /*
  * plan.cursor(args, ...)
  */
-static void
-plv8_PlanCursor(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_PlanCursor(const Arguments &args)
 {
 	Handle<v8::Object>	self = args.This();
 	SPIPlanPtr			plan;
@@ -605,15 +573,6 @@
 
 	plan = static_cast<SPIPlanPtr>(
 			Handle<External>::Cast(self->GetInternalField(0))->Value());
-
-	if (plan == NULL) {
-		StringInfoData	buf;
-
-		initStringInfo(&buf);
-		appendStringInfo(&buf,
-				"plan unexpectedly null");
-		throw js_error(pstrdup(buf.data));
-	}
 	/* XXX: Add plan validation */
 
 	if (args.Length() > 0)
@@ -692,28 +651,27 @@
 	 */
 	if (CursorTemplate.IsEmpty())
 	{
-		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
-		base->SetClassName(String::NewFromUtf8(plv8_isolate, "Cursor", String::kInternalizedString));
+		Local<FunctionTemplate> base = FunctionTemplate::New();
+		base->SetClassName(String::NewSymbol("Cursor"));
 		Local<ObjectTemplate> templ = base->InstanceTemplate();
 		templ->SetInternalFieldCount(1);
 		SetCallback(templ, "fetch", plv8_CursorFetch);
 		SetCallback(templ, "move", plv8_CursorMove);
 		SetCallback(templ, "close", plv8_CursorClose);
-		CursorTemplate.Reset(plv8_isolate, templ);
+		CursorTemplate = Persistent<ObjectTemplate>::New(templ);
 	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, CursorTemplate);
 
-	Local<v8::Object> result = templ->NewInstance();
+	Local<v8::Object> result = CursorTemplate->NewInstance();
 	result->SetInternalField(0, cname);
 
-	args.GetReturnValue().Set(result);
+	return result;
 }
 
 /*
  * plan.execute(args, ...)
  */
-static void
-plv8_PlanExecute(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_PlanExecute(const Arguments &args)
 {
 	Handle<v8::Object>	self = args.This();
 	SPIPlanPtr			plan;
@@ -802,16 +760,14 @@
 
 	subtran.exit(true);
 
-	args.GetReturnValue().Set(SPIResultToValue(status));
-
-
+	return SPIResultToValue(status);
 }
 
 /*
  * plan.free()
  */
-static void
-plv8_PlanFree(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_PlanFree(const Arguments &args)
 {
 	Handle<v8::Object>	self = args.This();
 	SPIPlanPtr			plan;
@@ -824,23 +780,23 @@
 	if (plan)
 		status = SPI_freeplan(plan);
 
-	self->SetInternalField(0, External::New(plv8_isolate, 0));
+	self->SetInternalField(0, External::New(0));
 
 	parstate = static_cast<plv8_param_state *>(
 			Handle<External>::Cast(self->GetInternalField(1))->Value());
 
 	if (parstate)
 		pfree(parstate);
-	self->SetInternalField(1, External::New(plv8_isolate, 0));
+	self->SetInternalField(1, External::New(0));
 
-	args.GetReturnValue().Set(Int32::New(plv8_isolate, status));
+	return Int32::New(status);
 }
 
 /*
  * cursor.fetch([n])
  */
-static void
-plv8_CursorFetch(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_CursorFetch(const Arguments &args)
 {
 	Handle<v8::Object>	self = args.This();
 	CString				cname(self->GetInternalField(0));
@@ -879,31 +835,24 @@
 		if (!wantarray)
 		{
 			Handle<v8::Object>	result = conv.ToValue(SPI_tuptable->vals[0]);
-			args.GetReturnValue().Set(result);
-			SPI_freetuptable(SPI_tuptable);
-
-			return;
+			return result;
 		}
 		else
 		{
-			Handle<Array> array = Array::New(plv8_isolate);
+			Handle<Array> array = Array::New();
 			for (unsigned int i = 0; i < SPI_processed; i++)
 				array->Set(i, conv.ToValue(SPI_tuptable->vals[i]));
-			args.GetReturnValue().Set(array);
-			SPI_freetuptable(SPI_tuptable);
-			return;
+			return array;
 		}
 	}
-
-	SPI_freetuptable(SPI_tuptable);
-	args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 /*
  * cursor.move(n)
  */
-static void
-plv8_CursorMove(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_CursorMove(const Arguments& args)
 {
 	Handle<v8::Object>	self = args.This();
 	CString				cname(self->GetInternalField(0));
@@ -914,10 +863,8 @@
 	if (!cursor)
 		throw js_error("cannot find cursor");
 
-	if (args.Length() < 1) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 
 	nmove = args[0]->Int32Value();
 	if (nmove < 0)
@@ -936,14 +883,14 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 /*
  * cursor.close()
  */
-static void
-plv8_CursorClose(const FunctionCallbackInfo<v8::Value> &args)
+static Handle<v8::Value>
+plv8_CursorClose(const Arguments &args)
 {
 	Handle<v8::Object>	self = args.This();
 	CString				cname(self->GetInternalField(0));
@@ -962,14 +909,14 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Int32::New(plv8_isolate, cursor ? 1 : 0));
+	return Int32::New(cursor ? 1 : 0);
 }
 
 /*
  * plv8.return_next(retval)
  */
-static void
-plv8_ReturnNext(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_ReturnNext(const Arguments& args)
 {
 	Handle<v8::Object>	self = args.This();
 	Handle<v8::Value>	conv_value = self->GetInternalField(PLV8_INTNL_CONV);
@@ -986,23 +933,19 @@
 
 	conv->ToDatum(args[0], tupstore);
 
-	args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 /*
  * plv8.subtransaction(func(){ ... })
  */
-static void
-plv8_Subtransaction(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_Subtransaction(const Arguments& args)
 {
-	if (args.Length() < 1) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
-	if (!args[0]->IsFunction()) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
+	if (!args[0]->IsFunction())
+		return Undefined();
 	Handle<Function>	func = Handle<Function>::Cast(args[0]);
 	SubTranBlock		subtran;
 
@@ -1016,19 +959,17 @@
 
 	if (result.IsEmpty())
 		throw js_error(try_catch);
-	args.GetReturnValue().Set(result);
+	return result;
 }
 
 /*
  * plv8.find_function("signature")
  */
-static void
-plv8_FindFunction(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_FindFunction(const Arguments& args)
 {
-	if (args.Length() < 1) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 	CString				signature(args[0]);
 	Local<Function>		func;
 
@@ -1042,15 +983,15 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(func);
+	return func;
 }
 
 /*
  * plv8.get_window_object()
  * Returns window object in window functions, which provides window function API.
  */
-static void
-plv8_GetWindowObject(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_GetWindowObject(const Arguments& args)
 {
 	Handle<v8::Object>	self = args.This();
 	Handle<v8::Value>	fcinfo_value =
@@ -1062,8 +1003,8 @@
 	if (WindowObjectTemplate.IsEmpty())
 	{
 		/* Initialize it if we haven't yet. */
-		Local<FunctionTemplate> base = FunctionTemplate::New(plv8_isolate);
-		base->SetClassName(String::NewFromUtf8(plv8_isolate, "WindowObject", String::kInternalizedString));
+		Local<FunctionTemplate> base = FunctionTemplate::New();
+		base->SetClassName(String::NewSymbol("WindowObject"));
 		Local<ObjectTemplate> templ = base->InstanceTemplate();
 
 		/* We store fcinfo here. */
@@ -1081,25 +1022,24 @@
 		SetCallback(templ, "get_func_arg_current", plv8_WinGetFuncArgCurrent);
 
 		/* Constants for get_func_in_XXX() */
-		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_CURRENT", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_CURRENT));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_HEAD", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_HEAD));
-		templ->Set(String::NewFromUtf8(plv8_isolate, "SEEK_TAIL", String::kInternalizedString), Int32::New(plv8_isolate, WINDOW_SEEK_TAIL));
+		templ->Set(String::NewSymbol("SEEK_CURRENT"), Int32::New(WINDOW_SEEK_CURRENT));
+		templ->Set(String::NewSymbol("SEEK_HEAD"), Int32::New(WINDOW_SEEK_HEAD));
+		templ->Set(String::NewSymbol("SEEK_TAIL"), Int32::New(WINDOW_SEEK_TAIL));
 
-		WindowObjectTemplate.Reset(plv8_isolate, templ);
+		WindowObjectTemplate = Persistent<ObjectTemplate>::New(templ);
 	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, WindowObjectTemplate);
 
-	Local<v8::Object> js_winobj = templ->NewInstance();
+	Local<v8::Object> js_winobj = WindowObjectTemplate->NewInstance();
 	js_winobj->SetInternalField(0, fcinfo_value);
 
-	args.GetReturnValue().Set(js_winobj);
+	return js_winobj;
 }
 
 /*
  * Short-cut routine for window function API
  */
 static inline WindowObject
-plv8_MyWindowObject(const FunctionCallbackInfo<v8::Value>& args)
+plv8_MyWindowObject(const Arguments& args)
 {
 	Handle<v8::Object>	self = args.This();
 	/* fcinfo is embedded in the internal field.  See plv8_GetWindowObject() */
@@ -1122,7 +1062,7 @@
  * argument information enough.  Thus, we obtain it from function expression.
  */
 static inline plv8_type *
-plv8_MyArgType(const FunctionCallbackInfo<v8::Value>& args, int argno)
+plv8_MyArgType(const Arguments& args, int argno)
 {
 	Handle<v8::Object>	self = args.This();
 	FunctionCallInfo fcinfo = static_cast<FunctionCallInfo>(
@@ -1140,8 +1080,8 @@
  * The default allocation size is 1K, but the caller can override this value
  * by the argument at the first call.
  */
-static void
-plv8_WinGetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetPartitionLocal(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 	size_t			size;
@@ -1169,10 +1109,8 @@
 		storage->maxlen = size;
 
 	/* If nothing is stored, undefined is returned. */
-	if (storage->len == 0) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (storage->len == 0)
+		return Undefined();
 
 	/*
 	 * Currently we support only serializable JSON object to be stored.
@@ -1180,7 +1118,7 @@
 	JSONObject JSON;
 	Handle<v8::Value> value = ToString(storage->data, storage->len);
 
-	args.GetReturnValue().Set(JSON.Parse(value));
+	return JSON.Parse(value);
 }
 
 /*
@@ -1188,15 +1126,13 @@
  * If the storage has not been allocated, it's allocated based on the
  * size of JSON-ized input string.
  */
-static void
-plv8_WinSetPartitionLocal(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinSetPartitionLocal(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 
-	if (args.Length() < 1) {
-		args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 
 	JSONObject JSON;
 	Handle<v8::Value> value = JSON.Stringify(args[0]);
@@ -1227,14 +1163,14 @@
 	storage->len = str_size;
 	memcpy(storage->data, str, str_size);
 
-        args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 /*
  * winobj.get_current_position()
  */
-static void
-plv8_WinGetCurrentPosition(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetCurrentPosition(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 	int64			pos = 0;
@@ -1249,14 +1185,14 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Integer::New(plv8_isolate, pos));
+	return Integer::New(pos);
 }
 
 /*
  * winobj.get_partition_row_count()
  */
-static void
-plv8_WinGetPartitionRowCount(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetPartitionRowCount(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 	int64			pos = 0;
@@ -1271,20 +1207,18 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Integer::New(plv8_isolate, pos));
+	return Integer::New(pos);
 }
 
 /*
  * winobj.set_mark_pos(pos)
  */
-static void
-plv8_WinSetMarkPosition(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinSetMarkPosition(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
-	if (args.Length() < 1) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-        }
+	if (args.Length() < 1)
+		return Undefined();
 	int64		markpos = args[0]->IntegerValue();
 
 	PG_TRY();
@@ -1297,20 +1231,18 @@
 	}
 	PG_END_TRY();
 
-        args.GetReturnValue().Set(Undefined(plv8_isolate));
+	return Undefined();
 }
 
 /*
  * winobj.rows_are_peers(pos1, pos2)
  */
-static void
-plv8_WinRowsArePeers(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinRowsArePeers(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
-	if (args.Length() < 2) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 2)
+		return Undefined();
 	int64		pos1 = args[0]->IntegerValue();
 	int64		pos2 = args[1]->IntegerValue();
 	bool		res = false;
@@ -1325,14 +1257,14 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(Boolean::New(plv8_isolate, res));
+	return Boolean::New(res);
 }
 
 /*
  * winobj.get_func_arg_in_partition(argno, relpos, seektype, set_mark)
  */
-static void
-plv8_WinGetFuncArgInPartition(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetFuncArgInPartition(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 	/* Since we return undefined in "isout" case, throw if arg isn't enough. */
@@ -1362,21 +1294,19 @@
 	PG_END_TRY();
 
 	/* Return undefined to tell it's out of partition. */
-	if (isout) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (isout)
+		return Undefined();
 
 	plv8_type *type = plv8_MyArgType(args, argno);
 
-	args.GetReturnValue().Set(ToValue(res, isnull, type));
+	return ToValue(res, isnull, type);
 }
 
 /*
  * winobj.get_func_arg_in_frame(argno, relpos, seektype, set_mark)
  */
-static void
-plv8_WinGetFuncArgInFrame(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetFuncArgInFrame(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
 	/* Since we return undefined in "isout" case, throw if arg isn't enough. */
@@ -1406,27 +1336,23 @@
 	PG_END_TRY();
 
 	/* Return undefined to tell it's out of frame. */
-	if (isout) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (isout)
+		return Undefined();
 
 	plv8_type *type = plv8_MyArgType(args, argno);
 
-	args.GetReturnValue().Set(ToValue(res, isnull, type));
+	return ToValue(res, isnull, type);
 }
 
 /*
  * winobj.get_func_arg_current(argno)
  */
-static void
-plv8_WinGetFuncArgCurrent(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_WinGetFuncArgCurrent(const Arguments& args)
 {
 	WindowObject	winobj = plv8_MyWindowObject(args);
-	if (args.Length() < 1) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-        }
+	if (args.Length() < 1)
+		return Undefined();
 	int			argno = args[0]->Int32Value();
 	bool		isnull;
 	Datum		res;
@@ -1445,19 +1371,17 @@
 
 	plv8_type *type = plv8_MyArgType(args, argno);
 
-	args.GetReturnValue().Set(ToValue(res, isnull, type));
+	return ToValue(res, isnull, type);
 }
 
 /*
  * plv8.quote_literal(str)
  */
-static void
-plv8_QuoteLiteral(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_QuoteLiteral(const Arguments& args)
 {
-	if (args.Length() < 1) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 	CString			instr(args[0]);
 	char		   *result;
 
@@ -1471,26 +1395,22 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(ToString(result));
+	return ToString(result);
 }
 
 /*
  * plv8.quote_nullable(str)
  */
-static void
-plv8_QuoteNullable(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_QuoteNullable(const Arguments& args)
 {
-	if (args.Length() < 1) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 	CString			instr(args[0]);
 	char		   *result;
 
-	if (args[0]->IsNull() || args[0]->IsUndefined()) {
-		args.GetReturnValue().Set(ToString("NULL"));
-		return;
-	}
+	if (args[0]->IsNull() || args[0]->IsUndefined())
+		return ToString("NULL");
 
 	PG_TRY();
 	{
@@ -1502,19 +1422,17 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(ToString(result));
+	return ToString(result);
 }
 
 /*
  * plv8.quote_ident(str)
  */
-static void
-plv8_QuoteIdent(const FunctionCallbackInfo<v8::Value>& args)
+static Handle<v8::Value>
+plv8_QuoteIdent(const Arguments& args)
 {
-	if (args.Length() < 1) {
-                args.GetReturnValue().Set(Undefined(plv8_isolate));
-		return;
-	}
+	if (args.Length() < 1)
+		return Undefined();
 	CString			instr(args[0]);
 	const char	   *result;
 
@@ -1528,5 +1446,5 @@
 	}
 	PG_END_TRY();
 
-	args.GetReturnValue().Set(ToString(result));
+	return ToString(result);
 }
diff -Nru plv8-1.5.0.ds/plv8.h plv8-1.4.6.ds/plv8.h
--- plv8-1.5.0.ds/plv8.h	2016-03-18 11:11:54.000000000 +0000
+++ plv8-1.4.6.ds/plv8.h	2016-03-27 19:49:02.000000000 +0000
@@ -14,6 +14,7 @@
 #include <v8-debug.h>
 #endif  // ENABLE_DEBUGGER_SUPPORT
 #include <vector>
+#include <string>
 
 extern "C" {
 #include "postgres.h"
@@ -24,7 +25,6 @@
 #include "utils/tuplestore.h"
 #include "windowapi.h"
 }
-#include <string>
 
 #ifdef _MSC_VER
 #define __attribute__(what)		__declspec what
@@ -81,7 +81,6 @@
 	bool		byval;
 	char		align;
 	char		category;
-	bool		is_composite;
 	FmgrInfo	fn_input;
 	FmgrInfo	fn_output;
 	v8::ExternalArrayType ext_array;
@@ -104,8 +103,7 @@
 	operator const char* () const	{ return m_str; }
 	const char* str(const char *ifnull = NULL) const
 	{ return m_str ? m_str : ifnull; }
-
-    static bool toStdString(v8::Handle<v8::Value> value, std::string &out);
+	static bool toStdString(v8::Handle<v8::Value> value, std::string &out);
 
 private:
 	CString(const CString&);
@@ -173,16 +171,13 @@
 		if (WindowObjectIsValid(m_winobj))
 		{
 			m_plv8obj = v8::Handle<v8::Object>::Cast(
-					context->Global()->Get(v8::String::NewFromUtf8(
-						context->GetIsolate(),
-						"plv8",
-						v8::String::kInternalizedString)));
+					context->Global()->Get(v8::String::NewSymbol("plv8")));
 			if (m_plv8obj.IsEmpty())
 				throw js_error("plv8 object not found");
 			/* Stash the current item, just in case of nested call */
 			m_prev_fcinfo = m_plv8obj->GetInternalField(PLV8_INTNL_FCINFO);
 			m_plv8obj->SetInternalField(PLV8_INTNL_FCINFO,
-					v8::External::New(context->GetIsolate(), fcinfo));
+					v8::External::New(fcinfo));
 		}
 	}
 	bool IsWindowCall() { return WindowObjectIsValid(m_winobj); }
@@ -213,18 +208,15 @@
 			   Converter *conv, Tuplestorestate *tupstore)
 	{
 		m_plv8obj = v8::Handle<v8::Object>::Cast(
-				context->Global()->Get(v8::String::NewFromUtf8(
-					context->GetIsolate(),
-					"plv8",
-					v8::String::kInternalizedString)));
+				context->Global()->Get(v8::String::NewSymbol("plv8")));
 		if (m_plv8obj.IsEmpty())
 			throw js_error("plv8 object not found");
 		m_prev_conv = m_plv8obj->GetInternalField(PLV8_INTNL_CONV);
 		m_prev_tupstore = m_plv8obj->GetInternalField(PLV8_INTNL_TUPSTORE);
 		m_plv8obj->SetInternalField(PLV8_INTNL_CONV,
-									v8::External::New(context->GetIsolate(), conv));
+									v8::External::New(conv));
 		m_plv8obj->SetInternalField(PLV8_INTNL_TUPSTORE,
-									v8::External::New(context->GetIsolate(), tupstore));
+									v8::External::New(tupstore));
 	}
 	~SRFSupport()
 	{
@@ -234,7 +226,6 @@
 	}
 };
 
-extern v8::Isolate* plv8_isolate;
 extern v8::Local<v8::Function> find_js_function(Oid fn_oid);
 extern v8::Local<v8::Function> find_js_function_by_name(const char *signature);
 extern const char *FormatSPIStatus(int status) throw();
@@ -253,7 +244,7 @@
 
 // plv8_func.cc
 extern v8::Handle<v8::Function> CreateYieldFunction(Converter *conv, Tuplestorestate *tupstore);
-extern void Subtransaction(const v8::FunctionCallbackInfo<v8::Value>& info) throw();
+extern v8::Handle<v8::Value> Subtransaction(const v8::Arguments& args) throw();
 
 extern void SetupPlv8Functions(v8::Handle<v8::ObjectTemplate> plv8);
 
diff -Nru plv8-1.5.0.ds/plv8_type.cc plv8-1.4.6.ds/plv8_type.cc
--- plv8-1.5.0.ds/plv8_type.cc	2016-03-18 11:11:54.000000000 +0000
+++ plv8-1.4.6.ds/plv8_type.cc	2016-03-27 19:49:02.000000000 +0000
@@ -18,7 +18,6 @@
 #include "access/htup_details.h"
 #endif
 #include "catalog/pg_type.h"
-#include "parser/parse_coerce.h"
 #include "utils/array.h"
 #include "utils/date.h"
 #include "utils/datetime.h"
@@ -30,10 +29,6 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
-#if PG_VERSION_NUM >= 90400
-#include "utils/jsonb.h"
-#endif
-
 #undef delete
 #undef namespace
 #undef typeid
@@ -67,7 +62,6 @@
 	type->typid = typid;
 	type->fn_input.fn_mcxt = type->fn_output.fn_mcxt = mcxt;
 	get_type_category_preferred(typid, &type->category, &ispreferred);
-	type->is_composite = (type->category == TYPCATEGORY_COMPOSITE);
 	get_typlenbyvalalign(typid, &type->len, &type->byval, &type->align);
 
 	if (get_typtype(typid) == TYPTYPE_DOMAIN)
@@ -127,7 +121,6 @@
 				(errmsg("cannot determine element type of array: %u", typid)));
 
 		type->typid = elemid;
-		type->is_composite = (TypeCategory(elemid) == TYPCATEGORY_COMPOSITE);
 		get_typlenbyvalalign(type->typid, &type->len, &type->byval, &type->align);
 	}
 }
@@ -170,12 +163,11 @@
 
 	if (externalArray.IsEmpty())
 	{
-		Local<ObjectTemplate> templ = ObjectTemplate::New(plv8_isolate);
-		templ->SetInternalFieldCount(1);
-		externalArray.Reset(plv8_isolate, templ);
+		externalArray = Persistent<ObjectTemplate>::New(ObjectTemplate::New());
+		externalArray->SetInternalFieldCount(1);
 	}
-	Local<ObjectTemplate> templ = Local<ObjectTemplate>::New(plv8_isolate, externalArray);
-	Local<Object> array = templ->NewInstance();
+
+	Local<Object> array = externalArray->NewInstance();
 	int		length;
 
 	switch (array_type)
@@ -203,8 +195,8 @@
 	}
 	array->SetIndexedPropertiesToExternalArrayData(
 			data, array_type, length);
-	array->ForceSet(String::NewFromUtf8(plv8_isolate, "length"), Int32::New(plv8_isolate, length), ReadOnly);
-	array->SetInternalField(0, External::New(plv8_isolate, DatumGetPointer(datum)));
+	array->Set(String::New("length"), Int32::New(length), ReadOnly);
+	array->SetInternalField(0, External::New(DatumGetPointer(datum)));
 
 	return array;
 }
@@ -395,14 +387,8 @@
 	values = (Datum *) palloc(sizeof(Datum) * length);
 	nulls = (bool *) palloc(sizeof(bool) * length);
 	ndims[0] = length;
-	for (int i = 0; i < length; i++) {
-		if (type->is_composite)
-		{
-			values[i] = ToRecordDatum(array->Get(i), &nulls[i], type);
-		} else {
-			values[i] = ToScalarDatum(array->Get(i), &nulls[i], type);
-		}
-	}
+	for (int i = 0; i < length; i++)
+		values[i] = ToScalarDatum(array->Get(i), &nulls[i], type);
 
 	result = construct_md_array(values, nulls, 1, ndims, lbs,
 				type->typid, type->len, type->byval, type->align);
@@ -449,7 +435,7 @@
 ToValue(Datum datum, bool isnull, plv8_type *type)
 {
 	if (isnull)
-		return Local<v8::Value>::New(plv8_isolate, Null(plv8_isolate));
+		return Local<v8::Value>(*Null());
 	else if (type->category == TYPCATEGORY_ARRAY || type->typid == RECORDARRAYOID)
 		return ToArrayValue(datum, isnull, type);
 	else if (type->category == TYPCATEGORY_COMPOSITE || type->typid == RECORDOID)
@@ -464,27 +450,27 @@
 	switch (type->typid)
 	{
 	case OIDOID:
-		return Uint32::New(plv8_isolate, DatumGetObjectId(datum));
+		return Uint32::New(DatumGetObjectId(datum));
 	case BOOLOID:
-		return Boolean::New(plv8_isolate, DatumGetBool(datum));
+		return Local<v8::Value>(*(Boolean::New((bool) DatumGetBool(datum))));
 	case INT2OID:
-		return Int32::New(plv8_isolate, DatumGetInt16(datum));
+		return Int32::New(DatumGetInt16(datum));
 	case INT4OID:
-		return Int32::New(plv8_isolate, DatumGetInt32(datum));
+		return Int32::New(DatumGetInt32(datum));
 	case INT8OID:
-		return Number::New(plv8_isolate, DatumGetInt64(datum));
+		return Number::New(DatumGetInt64(datum));
 	case FLOAT4OID:
-		return Number::New(plv8_isolate, DatumGetFloat4(datum));
+		return Number::New(DatumGetFloat4(datum));
 	case FLOAT8OID:
-		return Number::New(plv8_isolate, DatumGetFloat8(datum));
+		return Number::New(DatumGetFloat8(datum));
 	case NUMERICOID:
-		return Number::New(plv8_isolate, DatumGetFloat8(
+		return Number::New(DatumGetFloat8(
 			DirectFunctionCall1(numeric_float8, datum)));
 	case DATEOID:
-		return Date::New(plv8_isolate, DateToEpoch(DatumGetDateADT(datum)));
+		return Date::New(DateToEpoch(DatumGetDateADT(datum)));
 	case TIMESTAMPOID:
 	case TIMESTAMPTZOID:
-		return Date::New(plv8_isolate, TimestampTzToEpoch(DatumGetTimestampTz(datum)));
+		return Date::New(TimestampTzToEpoch(DatumGetTimestampTz(datum)));
 	case TEXTOID:
 	case VARCHAROID:
 	case BPCHAROID:
@@ -518,7 +504,7 @@
 
 		Local<v8::Value>	jsonString = ToString(str, len);
 		JSONObject JSON;
-		Local<v8::Value> result = Local<v8::Value>::New(plv8_isolate, JSON.Parse(jsonString));
+		Local<v8::Value> result = Local<v8::Value>::New(JSON.Parse(jsonString));
 
 		if (p != DatumGetPointer(datum))
 			pfree(p);	// free if detoasted
@@ -530,7 +516,7 @@
 	{
 		Local<v8::Value>	jsonString = ToString(datum, type);
 		JSONObject JSON;
-		Local<v8::Value> result = Local<v8::Value>::New(plv8_isolate, JSON.Parse(jsonString));
+		Local<v8::Value> result = Local<v8::Value>::New(JSON.Parse(jsonString));
 
 		return result;
 	}
@@ -574,7 +560,7 @@
 	deconstruct_array(DatumGetArrayTypeP(datum),
 						type->typid, type->len, type->byval, type->align,
 						&values, &nulls, &nelems);
-	Local<Array>  result = Array::New(plv8_isolate, nelems);
+	Local<Array>  result = Array::New(nelems);
 	plv8_type base = { 0 };
 	bool    ispreferred;
 
@@ -658,7 +644,7 @@
 
 	Local<String>	result =
 		encoding == PG_UTF8
-			? String::NewFromUtf8(plv8_isolate, str)
+			? String::New(str)
 			: ToString(str, strlen(str), encoding);
 	pfree(str);
 
@@ -686,7 +672,7 @@
 
 	if (utf8 != str)
 		len = strlen(utf8);
-	Local<String> result = String::NewFromUtf8(plv8_isolate, utf8, String::kNormalString, len);
+	Local<String> result = String::New(utf8, len);
 	if (utf8 != str)
 		pfree(utf8);
 	return result;
diff -Nru plv8-1.5.0.ds/README plv8-1.4.6.ds/README
--- plv8-1.5.0.ds/README	1970-01-01 00:00:00.000000000 +0000
+++ plv8-1.4.6.ds/README	2016-03-27 19:49:02.000000000 +0000
@@ -0,0 +1,112 @@
+A Procedural Language in JavaScript powered by V8
+=================================================
+
+plv8 is a shared library that provides a PostgreSQL procedural language powered
+by V8 JavaScript Engine.  With this program you can write in JavaScript your
+function that is callable from SQL.
+
+REQUIREMENT
+-----------
+
+plv8 is tested with:
+
+- PG: version 8.4, 9.0, 9.1, 9.2 and 9.3dev (maybe older are allowed)
+- V8: version 3.14.5
+- g++: version 4.5.1
+
+It is also known to work with some older versions of gcc and v8.
+
+Also all tools that PostgreSQL and V8 require to be built are required if you
+are building those from source.
+
+INSTALL
+-------
+
+There are two ways to build plv8.  The first is default `make`, which depends
+on system-installed libv8 and plv8 will be dynamically link to it.  The second
+is `make static`, which will download v8 soure at a specific version and build
+it, and statically link plv8 to it.  PGXN install will use the former, while
+you can do the latter manually if you have not installed v8 yet.
+
+Once you installed plv8 into your dabase, create language via
+
+  $ psql -c 'CREATE EXTENSION plv8'
+  $ psql -c 'CREATE EXTENSION plls'
+  $ psql -c 'CREATE EXTENSION plcoffee'
+
+in 9.1 or later, or in the prior versions
+
+  $ psql -f plv8.sql
+
+to create database objects.
+
+In mingw64, you may have difficulty in building plv8.  If so, try to make
+the following changes in Makefile.
+
+  CUSTOM_CC = gcc
+  SHLIB_LINK := $(SHLIB_LINK) -lv8 -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm
+
+For more detail, please refer to http://code.google.com/p/plv8js/issues/detail?id=29
+
+TEST
+----
+
+plv8 supports installcheck test.  Make sure set custom_variable_classes = 'plv8'
+in your postgresql.conf (before 9.2) and run
+
+  $ make installcheck
+
+EXAMPLE (JAVASCRIPT)
+--------------------
+
+  CREATE OR REPLACE FUNCTION plv8_test(keys text[], vals text[])
+  RETURNS text AS $$
+    var o = {};
+    for(var i=0; i<keys.length; i++){
+      o[keys[i]] = vals[i];
+    }
+    return JSON.stringify(o);
+  $$ LANGUAGE plv8 IMMUTABLE STRICT;
+  
+  SELECT plv8_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
+           plv8_test        
+  ---------------------------
+   {"name":"Tom","age":"29"}
+  (1 row)
+
+EXAMPLE (COFFEESCRIPT)
+----------------------
+
+  CREATE OR REPLACE FUNCTION plcoffee_test(keys text[], vals text[])
+  RETURNS text AS $$
+    return JSON.stringify(keys.reduce(((o, key, idx) ->
+      o[key] = vals[idx]; return o), {}), {})
+  $$ LANGUAGE plcoffee IMMUTABLE STRICT;
+  
+  SELECT plcoffee_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
+         plcoffee_test       
+  ---------------------------
+   {"name":"Tom","age":"29"}
+  (1 row)
+
+EXAMPLE (LIVESCRIPT)
+--------------------
+
+  CREATE OR REPLACE FUNCTION plls_test(keys text[], vals text[])
+  RETURNS text AS $$
+    return JSON.stringify { [key, vals[idx]] for key, idx in keys }
+  $$ LANGUAGE plls IMMUTABLE STRICT;
+  
+  SELECT plls_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
+           plls_test        
+  ---------------------------
+   {"name":"Tom","age":"29"}
+  (1 row)
+
+NOTES
+-----
+plv8 is hosted at Google Project Hosting
+http://code.google.com/p/plv8js/
+
+and distributed by PGXN.  For more detail, see
+http://pgxn.org/dist/plv8/doc/plv8.html
diff -Nru plv8-1.5.0.ds/README.md plv8-1.4.6.ds/README.md
--- plv8-1.5.0.ds/README.md	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-A Procedural Language in JavaScript powered by V8
-=================================================
-
-plv8 is a shared library that provides a PostgreSQL procedural language powered
-by V8 JavaScript Engine.  With this program you can write in JavaScript your
-function that is callable from SQL.
-
-REQUIREMENT
------------
-
-plv8 is tested with:
-
-- PG: version 9.2, 9.3, 9.4 and 9.5 (maybe older/newer are allowed)
-- V8: version 4.2 - 4.3.66 (as of v1.5.0)
-- g++: version 4.8.2
-- clang++
-
-It is also known to work with some older versions of gcc and v8.
-
-Also all tools that PostgreSQL and V8 require to be built are required if you
-are building those from source.
-
-INSTALL
--------
-
-There are two ways to build plv8.  The first is default `make`, which depends
-on system-installed libv8 and plv8 will be dynamically link to it.  The second
-is `make static`, which will download v8 source at a specific version and build
-it, and statically link plv8 to it.  PGXN install will use the former, while
-you can do the latter manually if you have not installed v8 yet.
-
-Once you installed plv8 into your dabase, create language via
-
-```
-  $ psql -c 'CREATE EXTENSION plv8'
-  $ psql -c 'CREATE EXTENSION plls'
-  $ psql -c 'CREATE EXTENSION plcoffee'
-```
-
-in 9.1 or later, or in the prior versions
-
-```
-  $ psql -f plv8.sql
-```
-
-to create database objects.
-
-In mingw64, you may have difficulty in building plv8.  If so, try to make
-the following changes in Makefile.
-
-```
-  CUSTOM_CC = gcc
-  SHLIB_LINK := $(SHLIB_LINK) -lv8 -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm
-```
-
-For more detail, please refer to https://github.com/plv8/plv8/issues/29
-
-TEST
-----
-
-plv8 supports installcheck test.  Make sure set custom_variable_classes = 'plv8'
-in your postgresql.conf (before 9.2) and run
-
-```
-  $ make installcheck
-```
-
-EXAMPLE (JAVASCRIPT)
---------------------
-
-```
-  CREATE OR REPLACE FUNCTION plv8_test(keys text[], vals text[])
-  RETURNS text AS $$
-    var o = {};
-    for(var i=0; i<keys.length; i++){
-      o[keys[i]] = vals[i];
-    }
-    return JSON.stringify(o);
-  $$ LANGUAGE plv8 IMMUTABLE STRICT;
-
-  SELECT plv8_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
-           plv8_test
-  ---------------------------
-   {"name":"Tom","age":"29"}
-  (1 row)
-```
-
-EXAMPLE (COFFEESCRIPT)
-----------------------
-
-```
-  CREATE OR REPLACE FUNCTION plcoffee_test(keys text[], vals text[])
-  RETURNS text AS $$
-    return JSON.stringify(keys.reduce(((o, key, idx) ->
-      o[key] = vals[idx]; return o), {}), {})
-  $$ LANGUAGE plcoffee IMMUTABLE STRICT;
-
-  SELECT plcoffee_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
-         plcoffee_test
-  ---------------------------
-   {"name":"Tom","age":"29"}
-  (1 row)
-```
-
-EXAMPLE (LIVESCRIPT)
---------------------
-
-```
-  CREATE OR REPLACE FUNCTION plls_test(keys text[], vals text[])
-  RETURNS text AS $$
-    return JSON.stringify { [key, vals[idx]] for key, idx in keys }
-  $$ LANGUAGE plls IMMUTABLE STRICT;
-
-  SELECT plls_test(ARRAY['name', 'age'], ARRAY['Tom', '29']);
-           plls_test
-  ---------------------------
-   {"name":"Tom","age":"29"}
-  (1 row)
-```
-
-NOTES
------
-plv8 is hosted on github
-https://github.com/plv8/plv8
-
-and distributed by PGXN.  For more detail, see
-http://pgxn.org/dist/plv8/doc/plv8.html
diff -Nru plv8-1.5.0.ds/sql/arraybuffer.sql plv8-1.4.6.ds/sql/arraybuffer.sql
--- plv8-1.5.0.ds/sql/arraybuffer.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/arraybuffer.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-CREATE FUNCTION crash_test() RETURNS boolean
-LANGUAGE plv8 IMMUTABLE STRICT
-AS $$
-  var a = new ArrayBuffer(8);
-  return true;
-$$;
-
-SELECT crash_test();
diff -Nru plv8-1.5.0.ds/sql/composites.sql plv8-1.4.6.ds/sql/composites.sql
--- plv8-1.5.0.ds/sql/composites.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/composites.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-CREATE TYPE acomp AS (x int, y text, z timestamptz);
-DO LANGUAGE PLV8 $$
-  var jres = plv8.execute("select $1::acomp[]", [ [ { "x": 2, "z": null, "y": null } ] ]);
-  plv8.elog(NOTICE,JSON.stringify(jres));
-$$;
diff -Nru plv8-1.5.0.ds/sql/es6.sql plv8-1.4.6.ds/sql/es6.sql
--- plv8-1.5.0.ds/sql/es6.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/es6.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
--- ES6 / harmony features
-CREATE TABLE rectangle (
-   id    INTEGER,
-   data  JSON
-);
-INSERT INTO rectangle (id, data) VALUES
-(1, '{"width": 20.3, "height": 1.5}'),
-(2, '{"width": 10.2, "height": 9.5}'),
-(3, '{"width": 3.5,  "height": 5.2}'),
-(4, '{"width": 8.2,  "height": 8.2}'),
-(5, '{"width": 9.4,  "height": 0.2}'),
-(6, '{"width": 1.2,  "height": 1.5}');
-
--- for..of loop over result array with break
-CREATE OR REPLACE FUNCTION get_rectangles_area(min_area NUMERIC)
-   RETURNS json AS $$
-      var rectangles = plv8.execute('SELECT id, data FROM rectangle ORDER BY id');
-      var result = [];
-      var area = 0.0;
-      for (var rectangle of rectangles) {
-	 area += rectangle.data.width * rectangle.data.height;
-	 result.push({id: rectangle.id, data: rectangle.data});
-	 if (area >= min_area) {
-	    break;
-	 }
-      }
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT get_rectangles_area(130.0);
-
--- same for..of loop, this time using a cursor within a generator
-CREATE OR REPLACE FUNCTION get_rectangles_area(min_area NUMERIC)
-   RETURNS json AS $$
-      var plan = plv8.prepare('SELECT id, data FROM rectangle ORDER BY id');
-      var cursor = plan.cursor();
-      var generator = function* () {
-	 var row;
-	 while (row = cursor.fetch()) {
-	    yield row;
-	 }
-      };
-      var rectangles = generator();
-      var result = [];
-      var area = 0.0;
-      for (var rectangle of rectangles) {
-	 area += rectangle.data.width * rectangle.data.height;
-	 result.push({id: rectangle.id, data: rectangle.data});
-	 if (area >= min_area) {
-	    break;
-	 }
-      }
-      cursor.close();
-      plan.free();
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT get_rectangles_area(130.0);
diff -Nru plv8-1.5.0.ds/sql/guc.sql plv8-1.4.6.ds/sql/guc.sql
--- plv8-1.5.0.ds/sql/guc.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/guc.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
--- enable strict mode with GUC, which allows usage of ES6 let and const keywords
-SET plv8.v8_flags = '--use_strict';
-CREATE OR REPLACE FUNCTION let_test()
-   RETURNS json AS $$
-      let result = ['Hello, World!'];
-      return result;
-   $$ LANGUAGE plv8 STABLE STRICT;
-SELECT let_test();
-DROP FUNCTION let_test();
diff -Nru plv8-1.5.0.ds/sql/plv8-errors.sql plv8-1.4.6.ds/sql/plv8-errors.sql
--- plv8-1.5.0.ds/sql/plv8-errors.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/plv8-errors.sql	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-CREATE FUNCTION test_sql_error() RETURNS void AS $$ plv8.execute("ERROR") $$ LANGUAGE plv8;
-SELECT test_sql_error();
-
-CREATE FUNCTION catch_sql_error() RETURNS void AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e);
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error();
-
-CREATE FUNCTION catch_sql_error_2() RETURNS text AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e);
-	return plv8.execute("select 'and can execute queries again' t").shift().t;
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error_2();
-
-CREATE FUNCTION catch_sql_error_3() RETURNS text AS $$
-try {
-	plv8.execute("throw SQL error");
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, e.sqlerrcode);
-	return e.sqlerrcode;
-}
-$$ LANGUAGE plv8;
-SELECT catch_sql_error_3();
-
--- subtransaction()
-CREATE TABLE subtrant(a int);
-CREATE FUNCTION test_subtransaction_catch() RETURNS void AS $$
-try {
-	plv8.subtransaction(function(){
-		plv8.execute("INSERT INTO subtrant VALUES(1)");
-		plv8.execute("INSERT INTO subtrant VALUES(1/0)");
-	});
-} catch (e) {
-	plv8.elog(NOTICE, e);
-	plv8.execute("INSERT INTO subtrant VALUES(2)");
-}
-$$ LANGUAGE plv8;
-SELECT test_subtransaction_catch();
-SELECT * FROM subtrant;
-
-TRUNCATE subtrant;
-CREATE FUNCTION test_subtransaction_throw() RETURNS void AS $$
-plv8.subtransaction(function(){
-	plv8.execute("INSERT INTO subtrant VALUES(1)");
-	plv8.execute("INSERT INTO subtrant VALUES(1/0)");
-});
-$$ LANGUAGE plv8;
-SELECT test_subtransaction_throw();
-SELECT * FROM subtrant;
-
--- exception handling
-CREATE OR REPLACE FUNCTION v8_test_throw() RETURNS float AS
-$$ 
-throw new Error('Error');
-$$
-LANGUAGE plv8;
-
-CREATE OR REPLACE FUNCTION v8_test_catch_throw() RETURNS text AS
-$$
- try{
-   var res = plv8.execute('select * from  v8_test_throw()');
- } catch(e) {
-   return JSON.stringify({"result": "error"});
- }
-$$
-language plv8;
-
-SELECT v8_test_catch_throw();
-
-CREATE FUNCTION catch_elog_error() RETURNS void AS $$
-function f (){
-}
-f.prototype.toString = function(){
-        throw 'custom exception';
-}
-try {
-	plv8.elog(NOTICE, (new f));
-	plv8.elog(NOTICE, "should not come here");
-} catch (e) {
-	plv8.elog(NOTICE, 'catch result:'+ e);
-}
-$$ LANGUAGE plv8;
-SELECT catch_elog_error();
-
-CREATE FUNCTION catch_elog_error2() RETURNS void AS $$
-function f (){
-}
-f.prototype.toString = function(){
-        throw 'custom exception';
-}
-
-plv8.elog(NOTICE, (new f));
-plv8.elog(NOTICE, "should not come here");
-
-$$ LANGUAGE plv8;
-SELECT catch_elog_error2();
-
diff -Nru plv8-1.5.0.ds/sql/plv8.sql plv8-1.4.6.ds/sql/plv8.sql
--- plv8-1.5.0.ds/sql/plv8.sql	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/sql/plv8.sql	2016-03-27 19:49:02.000000000 +0000
@@ -236,6 +236,56 @@
 LANGUAGE plv8;
 SELECT * FROM return_sql();
 
+CREATE FUNCTION test_sql_error() RETURNS void AS $$ plv8.execute("ERROR") $$ LANGUAGE plv8;
+SELECT test_sql_error();
+
+CREATE FUNCTION catch_sql_error() RETURNS void AS $$
+try {
+	plv8.execute("throw SQL error");
+	plv8.elog(NOTICE, "should not come here");
+} catch (e) {
+	plv8.elog(NOTICE, e);
+}
+$$ LANGUAGE plv8;
+SELECT catch_sql_error();
+
+CREATE FUNCTION catch_sql_error_2() RETURNS text AS $$
+try {
+	plv8.execute("throw SQL error");
+	plv8.elog(NOTICE, "should not come here");
+} catch (e) {
+	plv8.elog(NOTICE, e);
+	return plv8.execute("select 'and can execute queries again' t").shift().t;
+}
+$$ LANGUAGE plv8;
+SELECT catch_sql_error_2();
+
+-- subtransaction()
+CREATE TABLE subtrant(a int);
+CREATE FUNCTION test_subtransaction_catch() RETURNS void AS $$
+try {
+	plv8.subtransaction(function(){
+		plv8.execute("INSERT INTO subtrant VALUES(1)");
+		plv8.execute("INSERT INTO subtrant VALUES(1/0)");
+	});
+} catch (e) {
+	plv8.elog(NOTICE, e);
+	plv8.execute("INSERT INTO subtrant VALUES(2)");
+}
+$$ LANGUAGE plv8;
+SELECT test_subtransaction_catch();
+SELECT * FROM subtrant;
+
+TRUNCATE subtrant;
+CREATE FUNCTION test_subtransaction_throw() RETURNS void AS $$
+plv8.subtransaction(function(){
+	plv8.execute("INSERT INTO subtrant VALUES(1)");
+	plv8.execute("INSERT INTO subtrant VALUES(1/0)");
+});
+$$ LANGUAGE plv8;
+SELECT test_subtransaction_throw();
+SELECT * FROM subtrant;
+
 -- REPLACE FUNCTION
 CREATE FUNCTION replace_test() RETURNS integer AS $$ return 1; $$ LANGUAGE plv8;
 SELECT replace_test();
@@ -426,7 +476,7 @@
 SELECT f_attdrop(t.*) FROM t;
 SELECT f_attdrop(2);
 
-create table plv8test ( id numeric, data json, sum integer, num integer);
+create table plv8test ( id serial primary key, data json, sum integer, num integer);
 insert into plv8test (data, sum, num) values ('{"a": 1, "b": 2}', 0, 0);
 insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
 insert into plv8test (data, sum, num) values ('{"a": 3, "b": 4}', 0, 0);
diff -Nru plv8-1.5.0.ds/.travis.yml plv8-1.4.6.ds/.travis.yml
--- plv8-1.5.0.ds/.travis.yml	2016-03-18 11:06:37.000000000 +0000
+++ plv8-1.4.6.ds/.travis.yml	2016-03-27 19:49:02.000000000 +0000
@@ -3,8 +3,8 @@
   - sudo /etc/init.d/postgresql stop
   - sudo apt-get -y --purge remove postgresql libpq-dev libpq5 postgresql-client-common postgresql-common
   - sudo rm -rf /var/lib/postgresql
-  - wget --no-check-certificate  --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-  - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main $PGVERSION >> /etc/apt/sources.list.d/postgresql.list"
+  - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main $PGVERSION >> /etc/apt/sources.list.d/postgresql.list"
   - sudo apt-get update -qq
   - sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confnew" install postgresql-$PGVERSION postgresql-server-dev-$PGVERSION
   - sudo chmod 777 /etc/postgresql/$PGVERSION/main/pg_hba.conf
@@ -13,62 +13,37 @@
   - sudo echo "host    all         all         127.0.0.1/32          trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
   - sudo echo "host    all         all         ::1/128               trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
   - sudo /etc/init.d/postgresql restart
-  - sudo apt-get install -y clang-3.5 llvm-3.5-dev libedit-dev
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -qq
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8" LD="g++-4.8"; fi
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
 
 before_script:
-  - export V=1
-  - g++ -v
-  - gcc -v
-  - pushd ..
-  - git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-  - export PATH="$PATH":`pwd`/depot_tools
-  - popd
-  - pushd ..
-  - fetch v8; cd v8
-  - export tag=`git ls-remote |grep tags/$v8 | cut -f 3 -d / | sort  -k 3,3n -k 4,4n -t .|tail -1`
-  - git checkout $tag && gclient sync > /dev/null
-  - git describe --always
-  - make dependencies > /dev/null || true
-  - export CXX=clang++
-  - export LD=clang++
-  - make native library=shared -j8 werror=no snapshot=no i18nsupport=off
-  - sudo cp -rf include/* /usr/include
-  - sudo cp -rf include /usr/include
-  - sudo install -v --mode=0644 out/native/lib.target/* /usr/lib
-  - sudo install -v out/native/d8 /usr/bin/
-  - sudo install out/native/obj.target/tools/gyp/*.a /usr/lib
-  - popd
-  - createuser -U postgres -s travis
-
+  - git clone -b $v8 --depth 10 git://github.com/v8/v8.git
+  - cd v8 && git describe --always
+  - make dependencies && make native library=shared -j8
+  - sudo install -v --mode=0644 include/* /usr/include
+  - sudo install -v --mode=0644 out/native/lib.target/libv8.so /usr/lib/libv8.so
+  - sudo install -v out/native/d8 /usr/bin/d8
+  - cd ..
 
 env:
   matrix:
-    - PGVERSION=9.5 v8=4.3
-    - PGVERSION=9.5 v8=4.2
-    - PGVERSION=9.4 v8=4.3
-    - PGVERSION=9.4 v8=4.2
-    - PGVERSION=9.3 v8=4.3
-    - PGVERSION=9.3 v8=4.2
-    - PGVERSION=9.2 v8=4.3
-    - PGVERSION=9.2 v8=4.2
-
+    - PGVERSION=9.4 v8=3.18
+    - PGVERSION=9.4 v8=3.20
+    - PGVERSION=9.4 v8=3.22
+    - PGVERSION=9.3 v8=3.18
+    - PGVERSION=9.3 v8=3.20
+    - PGVERSION=9.3 v8=3.22
+    - PGVERSION=9.2 v8=3.18
+    - PGVERSION=9.2 v8=3.20
+    - PGVERSION=9.2 v8=3.22
+    - PGVERSION=9.1 v8=3.18
+    - PGVERSION=9.1 v8=3.20
+    - PGVERSION=9.1 v8=3.22
+    - PGVERSION=9.0 v8=3.18
+    - PGVERSION=9.0 v8=3.20
+    - PGVERSION=9.0 v8=3.22
 
 language: cpp
 compiler:
-  - clang
+#  - clang
   - gcc
 
-sudo: required
-dist: trusty
-
-script:
-  - make && sudo make install && make installcheck
-
-after_script:
-  - cat regression.diffs || true
-  - cat regression.out || true
+script: make