* Added start procedures

* Added lint flags for lint checks
* Some minor code cleanup and rearranging
* More comments

Author: JerrySievert

Makefile

@@ -29,7 +29,7 @@ endif
 
 REGRESS = init-extension function json jsonb json_conv types bytea context \
 	cursor array_spread plv8_regressions memory_limits inline composites \
-	trigger procedure find_function
+	trigger procedure find_function start_proc
 
 all: deps/quickjs/quickjs.h deps/quickjs/libquickjs.a pljs--$(PLJS_VERSION).sql
 
@@ -52,7 +52,7 @@ pljs--$(PLJS_VERSION).sql: pljs.sql
 	$(CP) pljs.sql pljs--$(PLJS_VERSION).sql
 
 lintcheck:
-	clang-tidy $(SRCS) -- -I$(INCLUDEDIR) -I$(INCLUDEDIR_SERVER) -I$(PWD) --std=c11
+	clang-tidy $(SRCS) -- $(LINTFLAGS) -I$(INCLUDEDIR) -I$(INCLUDEDIR_SERVER) -I$(PWD) --std=c11
 
 all: deps/quickjs/quickjs.h deps/quickjs/libquickjs.a pljs--$(PLJS_VERSION).sql
 

README.md

@@ -19,8 +19,6 @@ It compiles, and is on track to match functionality of [PLV8](https://github.com
 Missing:
 
 - Windows
-- SRF
-- startup functions
 
 Also, WASM will likely never be added to this extension.
 

ROADMAP.md

@@ -28,7 +28,7 @@ Current Release Version: `0.8`
 - [x] caching of contexts and functions
 - [x] set returning functions
 - [ ] windows
-- [ ] startup functions
+- [x] startup functions
 - [x] procedures/transactions
 - [x] find function
 - [x] `BigInt`

expected/start_proc.out

@@ -0,0 +1,47 @@
+CREATE FUNCTION start() RETURNS void AS
+$$
+  pljs.elog(NOTICE, 'start function executed');
+  pljs.current_scope = {
+    "name": "current_scope"
+  };
+$$ LANGUAGE pljs;
+SET pljs.start_proc = 'start';
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+NOTICE:  searching for function
+NOTICE:  start function executed
+NOTICE:  current_scope
+-- setting a start proc after the context is created should change do anything
+SET pljs.start_proc = 'end';
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+NOTICE:  current_scope
+-- a missing start proc should cause an error
+-- force the creation of a new context
+CREATE ROLE new_context;
+SET ROLE new_context;
+SET pljs.start_proc = 'end';
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+WARNING:  failed to find pljs function function "end" does not exist: 
+ERROR:  execution error
+DETAIL:  TypeError: cannot read property 'name' of undefined
+    at <anonymous> (<function>:2)
+    at <eval> (<function>:3)
+
+RESET ROLE;
+DROP ROLE new_context;
+-- reset the start_proc
+SET pljs.start_proc = '';
+DROP FUNCTION start;
+-- test startup permissions failure
+CREATE FUNCTION start() RETURNS void AS $$ pljs.elog(NOTICE, 'nope'); $$ LANGUAGE pljs;
+CREATE ROLE someone_else;
+REVOKE EXECUTE ON FUNCTION start() FROM public;
+SET pljs.start_proc = 'start';
+REVOKE EXECUTE ON FUNCTION start() FROM public;
+SET ROLE TO someone_else;
+DO $$ pljs.elog(NOTICE, 'hello') $$ LANGUAGE pljs;
+WARNING:  failed to find or no permission for js function start
+NOTICE:  hello
+RESET ROLE;
+DROP ROLE someone_else;
+RESET pljs.start_proc;
+DROP FUNCTION start;

sql/start_proc.sql

@@ -0,0 +1,52 @@
+CREATE FUNCTION start() RETURNS void AS
+$$
+  pljs.elog(NOTICE, 'start function executed');
+  pljs.current_scope = {
+    "name": "current_scope"
+  };
+$$ LANGUAGE pljs;
+
+SET pljs.start_proc = 'start';
+
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+
+-- setting a start proc after the context is created should change do anything
+SET pljs.start_proc = 'end';
+
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+
+-- a missing start proc should cause an error
+-- force the creation of a new context
+CREATE ROLE new_context;
+SET ROLE new_context;
+
+SET pljs.start_proc = 'end';
+DO $$ pljs.elog(NOTICE, pljs.current_scope.name); $$ language pljs;
+
+RESET ROLE;
+DROP ROLE new_context;
+
+-- reset the start_proc
+SET pljs.start_proc = '';
+
+DROP FUNCTION start;
+
+-- test startup permissions failure
+CREATE FUNCTION start() RETURNS void AS $$ pljs.elog(NOTICE, 'nope'); $$ LANGUAGE pljs;
+
+CREATE ROLE someone_else;
+
+REVOKE EXECUTE ON FUNCTION start() FROM public;
+
+SET pljs.start_proc = 'start';
+REVOKE EXECUTE ON FUNCTION start() FROM public;
+
+SET ROLE TO someone_else;
+DO $$ pljs.elog(NOTICE, 'hello') $$ LANGUAGE pljs;
+
+RESET ROLE;
+DROP ROLE someone_else;
+
+RESET pljs.start_proc;
+
+DROP FUNCTION start;

src/cache.c

@@ -63,6 +63,9 @@ void pljs_cache_reset(void) {
  * Creates a #pljs_context_cache_value and fills it with the
  * javascript context and #HTAB storing #pljs_function_cache_value
  * entries by `fn_oid`.
+ *
+ * @param user_id #Oid - user ID for the #JSContext to be assigned to
+ * @param ctx #JSContext - context to be added to the cache
  */
 void pljs_cache_context_add(Oid user_id, JSContext *ctx) {
   bool found;
@@ -107,7 +110,7 @@ void pljs_cache_context_add(Oid user_id, JSContext *ctx) {
  * @brief Removes a #pljs_context_cache_value for a `user_id`.
  *
  * Removes a cache entry from the cache by `user_id`.
- * @param user_id #Oid
+ * @param user_id #Oid - user ID for which to remove the cache entries
  */
 void pljs_cache_context_remove(Oid user_id) {
   bool found;
@@ -125,7 +128,7 @@ void pljs_cache_context_remove(Oid user_id) {
  * @brief Finds a #pljs_context_cache_value for a `user_id`.
  *
  * @param user_id #Oid
- * @returns #pljs_context_cache_value that is found, or `NULL` if not found.
+ * @returns #pljs_context_cache_value that is found, or `NULL` if not found
  */
 pljs_context_cache_value *pljs_cache_context_find(Oid user_id) {
   pljs_context_cache_value *value = (pljs_context_cache_value *)hash_search(
@@ -186,7 +189,7 @@ void pljs_cache_function_add(pljs_context *context) {
  *
  * @param user_id #Oid
  * @param fn_oid #Oid
- * @returns #pljs_function_cache_value that is found, or `NULL` if not found.
+ * @returns #pljs_function_cache_value that is found, or `NULL` if not found
  */
 pljs_function_cache_value *pljs_cache_function_find(Oid user_id, Oid fn_oid) {
   bool found;

src/functions.c

@@ -743,52 +743,25 @@ static JSValue pljs_find_function(JSContext *ctx, JSValueConst this_val,
   const char *signature = JS_ToCString(ctx, argv[0]);
   JSValue func = JS_UNDEFINED;
 
-  // Stack-allocate FunctionCallInfoBaseData with
-  // space for 2 arguments:
-  LOCAL_FCINFO(fake_fcinfo, 2);
-
-  FmgrInfo flinfo;
-
-  char perm[16];
-  strcpy(perm, "EXECUTE");
-  text *arg = (text *)palloc(8 + VARHDRSZ);
-  memcpy(VARDATA(arg), perm, 8);
-  SET_VARSIZE(arg, 8 + VARHDRSZ);
-  Oid funcoid;
-
   PG_TRY();
   {
-    if (strchr(signature, '(') == NULL) {
-      funcoid = DatumGetObjectId(
-          DirectFunctionCall1(regprocin, CStringGetDatum(signature)));
-    } else {
-      funcoid = DatumGetObjectId(
-          DirectFunctionCall1(regprocedurein, CStringGetDatum(signature)));
-    }
-
-    MemSet(&flinfo, 0, sizeof(flinfo));
-    fake_fcinfo->flinfo = &flinfo;
-    flinfo.fn_oid = InvalidOid;
-    flinfo.fn_mcxt = CurrentMemoryContext;
-    fake_fcinfo->nargs = 2;
-    fake_fcinfo->args[0].value = ObjectIdGetDatum(funcoid);
-    fake_fcinfo->args[1].value = PointerGetDatum(arg);
+    Oid funcoid;
 
-    Datum ret = has_function_privilege_id(fake_fcinfo);
-
-    if (ret == 0) {
-      elog(WARNING, "failed to find or no permission for js function %s",
-           signature);
+    if (!has_permission_to_execute(signature)) {
       return func;
     } else {
-      if (DatumGetBool(ret)) {
-        func = pljs_find_js_function(funcoid);
-
-        if (JS_IsUndefined(func)) {
-          elog(ERROR, "javascript function is not found for \"%s\"", signature);
-        }
+      if (strchr(signature, '(') == NULL) {
+        funcoid = DatumGetObjectId(
+            DirectFunctionCall1(regprocin, CStringGetDatum(signature)));
       } else {
-        elog(WARNING, "no permission to execute js function %s", signature);
+        funcoid = DatumGetObjectId(
+            DirectFunctionCall1(regprocedurein, CStringGetDatum(signature)));
+      }
+
+      func = pljs_find_js_function(funcoid, ctx);
+
+      if (JS_IsUndefined(func)) {
+        elog(ERROR, "javascript function is not found for \"%s\"", signature);
       }
     }
   }
@@ -808,11 +781,6 @@ static JSValue pljs_find_function(JSContext *ctx, JSValueConst this_val,
 
 static JSValue pljs_return_next(JSContext *ctx, JSValueConst this_val, int argc,
                                 JSValueConst *argv) {
-  const char *sql;
-  JSValue params = {0};
-  int nparams;
-  Oid *types = NULL;
-  SPIPlanPtr initial = NULL, saved = NULL;
   pljs_return_state *retstate = NULL;
 
   JSValue global_obj = JS_GetGlobalObject(ctx);