Fix a valid state of a newly created variable after removing its package

CherkashinSergey · CherkashinSergey · commit 370ddfe34dfb · 2018-06-20T15:01:06.000+03:00
diff --git a/expected/pg_variables_trans.out b/expected/pg_variables_trans.out
@@ -1801,3 +1801,40 @@ SELECT package FROM pgv_stats();
 ---------
 (0 rows)
 
+BEGIN;
+SELECT pgv_set('vars', 'trans1', 'package created'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'trans1', 'package restored'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans1 | t
+(1 row)
+
+COMMIT;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
diff --git a/pg_variables.c b/pg_variables.c
@@ -1471,8 +1471,8 @@ createVariableInternal(Package *package, text *name, Oid typid,
 							&scalar->typbyval);
 			varState->value.scalar.is_null = true;
 		}
-		varState->state.is_valid = true;
 	}
+	getActualStateOfContainer(variable)->is_valid = true;
 	/* If it is necessary, put variable to changedVars */
 	if (is_transactional)
 		addToChangedVars(variable);
diff --git a/sql/pg_variables_trans.sql b/sql/pg_variables_trans.sql
@@ -451,3 +451,12 @@ SELECT package FROM pgv_stats();
 SELECT * FROM pgv_list() ORDER BY package, name;
 COMMIT;
 SELECT package FROM pgv_stats();
+
+BEGIN;
+SELECT pgv_set('vars', 'trans1', 'package created'::text, true);
+SELECT pgv_remove('vars');
+SELECT * FROM pgv_list() ORDER BY package, name;
+SELECT pgv_set('vars', 'trans1', 'package restored'::text, true);
+SELECT * FROM pgv_list() ORDER BY package, name;
+COMMIT;
+SELECT pgv_remove('vars');

Original file line number	Diff line number	Diff line change
`@@ -1471,8 +1471,8 @@ createVariableInternal(Package package, text name, Oid typid,`
`1471`	`1471`	`&scalar->typbyval);`
`1472`	`1472`	`varState->value.scalar.is_null = true;`
`1473`	`1473`	`}`
`1474`		`- varState->state.is_valid = true;`
`1475`	`1474`	`}`
	`1475`	`+ getActualStateOfContainer(variable)->is_valid = true;`
`1476`	`1476`	`/* If it is necessary, put variable to changedVars */`
`1477`	`1477`	`if (is_transactional)`
`1478`	`1478`	`addToChangedVars(variable);`