Improve tests

Author: za-arthur

expected/pg_variables.out

@@ -577,10 +577,16 @@ SELECT pgv_insert('vars3', 'r2', row(1, 'str1', 'str2'));
 
 (1 row)
 
-SELECT pgv_update('vars3', 'r2', row(1, 'str2', 'str1'));
+SELECT pgv_update('vars3', 'r1', row(3, 'str22'::varchar));
  pgv_update 
 ------------
- t
+ f
+(1 row)
+
+select pgv_delete('vars3', 'r2', NULL::int);
+ pgv_delete 
+------------
+ f
 (1 row)
 
 -- Test NULL values
@@ -611,6 +617,8 @@ SELECT pgv_select('vars3', 'r1', 1);
  (1,str11)
 (1 row)
 
+SELECT pgv_select('vars3', 'r1', 1::float); -- fail
+ERROR:  requested value type differs from variable "r1" key type
 SELECT pgv_select('vars3', 'r1', 0);
  pgv_select 
 ------------
@@ -641,6 +649,12 @@ SELECT pgv_update('vars3', 'r1', tab) FROM tab;
  t
 (4 rows)
 
+SELECT pgv_update('vars3', 'r1', row(4, 'str44'::varchar));
+ pgv_update 
+------------
+ f
+(1 row)
+
 SELECT pgv_select('vars3', 'r1');
  pgv_select 
 ------------

pg_variables.c

@@ -918,15 +918,7 @@ remove_package(PG_FUNCTION_ARGS)
 	package_name = PG_GETARG_TEXT_PP(0);
 
 	package = getPackageByName(package_name, false, true);
-	if (package)
-		removePackageInternal(package);
-	else
-	{
-		getKeyFromName(package_name, key);
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("unrecognized package \"%s\"", key)));
-	}
+	removePackageInternal(package);
 
 	resetVariablesCache(true);
 

sql/pg_variables.sql

@@ -163,7 +163,8 @@ SELECT pgv_select('vars3', 'r1', ARRAY[[1,2]]); -- fail
 
 -- Test variables caching
 SELECT pgv_insert('vars3', 'r2', row(1, 'str1', 'str2'));
-SELECT pgv_update('vars3', 'r2', row(1, 'str2', 'str1'));
+SELECT pgv_update('vars3', 'r1', row(3, 'str22'::varchar));
+select pgv_delete('vars3', 'r2', NULL::int);
 
 -- Test NULL values
 SELECT pgv_insert('vars3', 'r2', NULL); -- fail
@@ -173,12 +174,14 @@ SELECT pgv_select('vars3', 'r1', NULL::int[]); -- fail
 
 SELECT pgv_select('vars3', 'r1');
 SELECT pgv_select('vars3', 'r1', 1);
+SELECT pgv_select('vars3', 'r1', 1::float); -- fail
 SELECT pgv_select('vars3', 'r1', 0);
 SELECT pgv_select('vars3', 'r1', NULL::int);
 SELECT pgv_select('vars3', 'r1', ARRAY[1, 0, NULL]);
 
 UPDATE tab SET t = 'str33' WHERE id = 1;
 SELECT pgv_update('vars3', 'r1', tab) FROM tab;
+SELECT pgv_update('vars3', 'r1', row(4, 'str44'::varchar));
 SELECT pgv_select('vars3', 'r1');
 
 SELECT pgv_delete('vars3', 'r1', 1);