Added schema parameter to install_extension (#285)

Co-authored-by: Michal Kleczek <michal.kleczek@sap.com>
Co-authored-by: Adam Guo <adamguo@amazon.com>

Author: 3 people

Makefile

@@ -1,13 +1,13 @@
 EXTENSION = pg_tle
-EXTVERSION = 1.4.1
+EXTVERSION = 1.5.0
 
 SCHEMA = pgtle
 MODULE_big = $(EXTENSION)
 
 OBJS = src/tleextension.o src/guc-file.o src/feature.o src/passcheck.o src/uni_api.o src/datatype.o src/clientauth.o
 
 EXTRA_CLEAN	= src/guc-file.c pg_tle.control pg_tle--$(EXTVERSION).sql
-DATA = pg_tle.control pg_tle--1.0.0.sql pg_tle--1.0.0--1.0.1.sql pg_tle--1.0.1--1.0.4.sql pg_tle--1.0.4.sql pg_tle--1.0.4--1.1.1.sql pg_tle--1.1.0--1.1.1.sql pg_tle--1.1.1.sql pg_tle--1.1.1--1.2.0.sql pg_tle--1.2.0--1.3.0.sql pg_tle--1.3.0--1.3.3.sql pg_tle--1.3.3--1.3.4.sql pg_tle--1.3.4--1.4.0.sql pg_tle--1.4.0--1.4.1.sql
+DATA = pg_tle.control pg_tle--1.0.0.sql pg_tle--1.0.0--1.0.1.sql pg_tle--1.0.1--1.0.4.sql pg_tle--1.0.4.sql pg_tle--1.0.4--1.1.1.sql pg_tle--1.1.0--1.1.1.sql pg_tle--1.1.1.sql pg_tle--1.1.1--1.2.0.sql pg_tle--1.2.0--1.3.0.sql pg_tle--1.3.0--1.3.3.sql pg_tle--1.3.3--1.3.4.sql pg_tle--1.3.4--1.4.0.sql pg_tle--1.4.0--1.4.1.sql pg_tle--1.4.1--1.5.0.sql
 
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))

pg_tle--1.4.1--1.5.0.sql

@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_tle" to load this file. \quit
+
+DROP FUNCTION pgtle.install_extension
+(
+  name text,
+  version text,
+  description text,
+  ext text,
+  requires text[]
+);
+
+CREATE FUNCTION pgtle.install_extension
+(
+  name text,
+  version text,
+  description text,
+  ext text,
+  requires text[] DEFAULT NULL,
+  schema text DEFAULT NULL
+)
+RETURNS boolean
+SET search_path TO 'pgtle'
+AS 'MODULE_PATHNAME', 'pg_tle_install_extension'
+LANGUAGE C;
+
+REVOKE EXECUTE ON FUNCTION pgtle.install_extension
+(
+  name text,
+  version text,
+  description text,
+  ext text,
+  requires text[],
+  schema text
+) FROM PUBLIC;
+
+GRANT EXECUTE ON FUNCTION pgtle.install_extension
+(
+  name text,
+  version text,
+  description text,
+  ext text,
+  requires text[],
+  schema text
+) TO pgtle_admin;

src/tleextension.c

@@ -914,7 +914,6 @@ parse_extension_control_file(ExtensionControlFile *control,
 		control->directory = NULL;
 		control->module_pathname = NULL;
 		control->relocatable = false;
-		control->schema = NULL;
 		control->superuser = false;
 		control->trusted = false;
 		control->encoding = -1; /* encoding is that of the server_side
@@ -999,6 +998,12 @@ build_extension_control_file_string(ExtensionControlFile *control)
 						 quote_literal_cstr(reqstr->data));
 	}
 
+	if (control->schema != NULL)
+	{
+		appendStringInfo(ctlstr, "schema = %s\n",
+						 quote_literal_cstr(control->schema));
+	}
+
 	return ctlstr;
 }
 
@@ -4398,6 +4403,7 @@ pg_tle_install_extension(PG_FUNCTION_ARGS)
 	char	   *extdesc;
 	char	   *sql_str;
 	ArrayType  *extrequires;
+	char	   *extschema;
 	char	   *ctlname;
 	StringInfo	ctlstr;
 	char	   *sqlname;
@@ -4415,7 +4421,7 @@ pg_tle_install_extension(PG_FUNCTION_ARGS)
 	Oid			ctlfuncid;
 	Oid			sqlfuncid;
 
-	if (PG_ARGISNULL(0))
+	if (PG_ARGISNULL(0) || !PG_GETARG_DATUM(0))
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("\"name\" is a required argument")));
@@ -4434,29 +4440,29 @@ pg_tle_install_extension(PG_FUNCTION_ARGS)
 				 errmsg("control file already exists for the %s extension",
 						extname)));
 
-	if (PG_ARGISNULL(1))
+	if (PG_ARGISNULL(1) || !PG_GETARG_DATUM(1))
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("\"version\" is a required argument")));
 
 	extvers = text_to_cstring(PG_GETARG_TEXT_PP(1));
 	check_valid_version_name(extvers);
 
-	if (PG_ARGISNULL(2))
+	if (PG_ARGISNULL(2) || !PG_GETARG_DATUM(2))
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("\"description\" is a required argument")));
 
 	extdesc = text_to_cstring(PG_GETARG_TEXT_PP(2));
 
-	if (PG_ARGISNULL(3))
+	if (PG_ARGISNULL(3) || !PG_GETARG_DATUM(3))
 		ereport(ERROR,
 				(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 				 errmsg("\"ext\" is a required argument")));
 
 	sql_str = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
-	if (PG_ARGISNULL(4))
+	if (PG_ARGISNULL(4) || !PG_GETARG_DATUM(4))
 		reqlist = NIL;
 	else
 	{
@@ -4465,6 +4471,13 @@ pg_tle_install_extension(PG_FUNCTION_ARGS)
 		check_requires_list(reqlist);
 	}
 
+	if (PG_ARGISNULL(5) || !PG_GETARG_DATUM(5))
+		extschema = NULL;
+	else
+	{
+		extschema = pstrdup(text_to_cstring(PG_GETARG_TEXT_PP(5)));
+	}
+
 	/*
 	 * Build appropriate function names based on extension name and version.
 	 */
@@ -4504,6 +4517,7 @@ pg_tle_install_extension(PG_FUNCTION_ARGS)
 	control->default_version = pstrdup(extvers);
 	control->comment = pstrdup(extdesc);
 	control->requires = reqlist;
+	control->schema = extschema;
 
 	ctlstr = build_extension_control_file_string(control);
 

test/expected/pg_tle_api_clusterwide.out

@@ -370,3 +370,12 @@ SELECT pgtle.uninstall_extension('test_unregister_feature');
 DROP SCHEMA pass CASCADE;
 NOTICE:  drop cascades to function pass.password_check_length_greater_than_8(text,text,pgtle.password_types,timestamp with time zone,boolean)
 DROP EXTENSION pg_tle;
+ALTER SYSTEM SET pgtle.passcheck_db_name = '';
+SELECT pg_reload_conf();
+ pg_reload_conf 
+----------------
+ t
+(1 row)
+
+-- reconnect to ensure reload settings are propagated immediately
+\c -