2 files changed, 47 insertions, 0 deletions
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index cf040fbd803..3819bf5e254 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -141,6 +141,25 @@ SELECT $1, $2 \parse stmt3
 ERROR:  there is no parameter $1
 LINE 1: SELECT $1, $2 
                ^
+-- Last \bind_named wins
+\bind_named stmt2 'foo' \bind_named stmt3 'foo2' 'bar2' \g
+ ?column? | ?column? 
+----------+----------
+ foo2     | bar2
+(1 row)
+
+-- Multiple \g calls mean multiple executions
+\bind_named stmt2 'foo3' \g \bind_named stmt3 'foo4' 'bar4' \g
+ ?column? 
+----------
+ foo3
+(1 row)
+
+ ?column? | ?column? 
+----------+----------
+ foo4     | bar4
+(1 row)
+
 -- \close (extended query protocol)
 \close
 \close: missing required argument
@@ -173,6 +192,25 @@ SELECT $1, $2 \bind 'foo' 'bar' \g
  foo      | bar
 (1 row)
 
+-- last \bind wins
+select $1::int as col \bind 'foo' \bind 2 \g
+ col 
+-----
+   2
+(1 row)
+
+-- Multiple \g calls mean multiple executions
+select $1::int as col \bind 1 \g \bind 2 \g
+ col 
+-----
+   1
+(1 row)
+
+ col 
+-----
+   2
+(1 row)
+
 -- errors
 -- parse error
 SELECT foo \bind \g
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 8de90c805c0..c5021fc0b13 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -63,6 +63,10 @@ SELECT $1, $2 \parse stmt3
 \bind_named stmt4
 \bind_named
 \g
+-- Last \bind_named wins
+\bind_named stmt2 'foo' \bind_named stmt3 'foo2' 'bar2' \g
+-- Multiple \g calls mean multiple executions
+\bind_named stmt2 'foo3' \g \bind_named stmt3 'foo4' 'bar4' \g
 
 -- \close (extended query protocol)
 \close
@@ -76,6 +80,11 @@ SELECT 1 \bind \g
 SELECT $1 \bind 'foo' \g
 SELECT $1, $2 \bind 'foo' 'bar' \g
 
+-- last \bind wins
+select $1::int as col \bind 'foo' \bind 2 \g
+-- Multiple \g calls mean multiple executions
+select $1::int as col \bind 1 \g \bind 2 \g
+
 -- errors
 -- parse error
 SELECT foo \bind \g