Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit660968a

Browse files
committed
Improve tests
1 parentc163b97 commit660968a

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

‎expected/pg_variables.out‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,10 +577,16 @@ SELECT pgv_insert('vars3', 'r2', row(1, 'str1', 'str2'));
577577

578578
(1 row)
579579

580-
SELECT pgv_update('vars3', 'r2', row(1, 'str2', 'str1'));
580+
SELECT pgv_update('vars3', 'r1', row(3, 'str22'::varchar));
581581
pgv_update
582582
------------
583-
t
583+
f
584+
(1 row)
585+
586+
select pgv_delete('vars3', 'r2', NULL::int);
587+
pgv_delete
588+
------------
589+
f
584590
(1 row)
585591

586592
-- Test NULL values
@@ -611,6 +617,8 @@ SELECT pgv_select('vars3', 'r1', 1);
611617
(1,str11)
612618
(1 row)
613619

620+
SELECT pgv_select('vars3', 'r1', 1::float); -- fail
621+
ERROR: requested value type differs from variable "r1" key type
614622
SELECT pgv_select('vars3', 'r1', 0);
615623
pgv_select
616624
------------
@@ -641,6 +649,12 @@ SELECT pgv_update('vars3', 'r1', tab) FROM tab;
641649
t
642650
(4 rows)
643651

652+
SELECT pgv_update('vars3', 'r1', row(4, 'str44'::varchar));
653+
pgv_update
654+
------------
655+
f
656+
(1 row)
657+
644658
SELECT pgv_select('vars3', 'r1');
645659
pgv_select
646660
------------

‎pg_variables.c‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -918,15 +918,7 @@ remove_package(PG_FUNCTION_ARGS)
918918
package_name=PG_GETARG_TEXT_PP(0);
919919

920920
package=getPackageByName(package_name, false, true);
921-
if (package)
922-
removePackageInternal(package);
923-
else
924-
{
925-
getKeyFromName(package_name,key);
926-
ereport(ERROR,
927-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
928-
errmsg("unrecognized package \"%s\"",key)));
929-
}
921+
removePackageInternal(package);
930922

931923
resetVariablesCache(true);
932924

‎sql/pg_variables.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ SELECT pgv_select('vars3', 'r1', ARRAY[[1,2]]); -- fail
163163

164164
-- Test variables caching
165165
SELECT pgv_insert('vars3','r2', row(1,'str1','str2'));
166-
SELECT pgv_update('vars3','r2', row(1,'str2','str1'));
166+
SELECT pgv_update('vars3','r1', row(3,'str22'::varchar));
167+
select pgv_delete('vars3','r2',NULL::int);
167168

168169
-- Test NULL values
169170
SELECT pgv_insert('vars3','r2',NULL);-- fail
@@ -173,12 +174,14 @@ SELECT pgv_select('vars3', 'r1', NULL::int[]); -- fail
173174

174175
SELECT pgv_select('vars3','r1');
175176
SELECT pgv_select('vars3','r1',1);
177+
SELECT pgv_select('vars3','r1',1::float);-- fail
176178
SELECT pgv_select('vars3','r1',0);
177179
SELECT pgv_select('vars3','r1',NULL::int);
178180
SELECT pgv_select('vars3','r1', ARRAY[1,0,NULL]);
179181

180182
UPDATE tabSET t='str33'WHERE id=1;
181183
SELECT pgv_update('vars3','r1', tab)FROM tab;
184+
SELECT pgv_update('vars3','r1', row(4,'str44'::varchar));
182185
SELECT pgv_select('vars3','r1');
183186

184187
SELECT pgv_delete('vars3','r1',1);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp