Forgot to add files.

diff --git a/Makefile.am b/Makefile.am
index c98fb99651afbfb7873aee8decaf236e619c7b10..352c536e33e325a60d36ce9c02047c3bae221c3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ CLEANFILES = pgpool.8
 EXTRA_DIST = pgpool.8.in sql/system_db.sql sample/pgpool.pam doc/pgpool-ja.html doc/pgpool-en.html \
                doc/tutorial-ja.html doc/tutorial-en.html doc/pgpool.css \
                doc/where_to_send_queries.pdf doc/where_to_send_queries.odg doc/pgpool-ja.css \
+               doc/basebackup.sh doc/pgpool_remote_start doc/recovery.conf.sample \
                sample/pgpool_remote_start sample/pgpool_recovery sample/pgpool_recovery_pitr \
                sample/dist_def_pgbench.sql sample/replicate_def_pgbench.sql \
                sql/Makefile \
@@ -70,7 +71,7 @@ EXTRA_DIST = pgpool.8.in sql/system_db.sql sample/pgpool.pam doc/pgpool-ja.html
                sql/pgpool-recovery/pgpool-recovery.sql.in sql/pgpool-recovery/Makefile \
                sql/pgpool-regclass/pgpool-regclass.c \
                sql/pgpool-regclass/pgpool-regclass.sql.in sql/pgpool-regclass/Makefile \
-               sql/pgpool-walrecrunning/pgpool-walrecrunning.c \
+               sql/pgpool-walrecrunning/README sql/pgpool-walrecrunning/pgpool-walrecrunning.c \
                sql/pgpool-walrecrunning/pgpool-walrecrunning.sql.in sql/pgpool-walrecrunning/Makefile \
                test/parser/expected/copy.out test/parser/expected/create.out \
                test/parser/expected/cursor.out test/parser/expected/delete.out \
@@ -95,16 +96,21 @@ EXTRA_DIST = pgpool.8.in sql/system_db.sql sample/pgpool.pam doc/pgpool-ja.html
                test/parser/README test/parser/main.c \
                test/parser/pool.h test/parser/run-test \
                test/parser/parse_schedule \
+               test/C/Makefile test/C/test_extended.c \
                test/jdbc/*.java test/jdbc/README.euc_jp test/jdbc/pgpool.properties test/jdbc/prepare.sql test/jdbc/run.sh \
                test/jdbc/expected/autocommit test/jdbc/expected/batch \
                test/jdbc/expected/column test/jdbc/expected/lock test/jdbc/expected/select \
-               test/jdbc/expected/update test/jdbc/expected/insert \
+               test/jdbc/expected/update test/jdbc/expected/insert test/jdbc/expected/CreateTempTable \
+               test/pdo-test/README.euc_jp test/pdo-test/collections.inc test/pdo-test/def.inc \
+               test/pdo-test/log.txt test/pdo-test/pdotest.php test/pdo-test/regsql.inc \
+               test/pdo-test/SQLlist/test1.sql test/pdo-test/SQLlist/test2.sql \
+               test/pdo-test/mod/database.inc test/pdo-test/mod/def.inc test/pdo-test/mod/errorhandler.inc \
                test/timestamp/Makefile test/timestamp/input/insert.sql \
                test/timestamp/input/update.sql test/timestamp/input/misc.sql \
                test/timestamp/expected/insert.out test/timestamp/expected/update.out \
                test/timestamp/expected/misc.out test/timestamp/main.c \
                test/timestamp/parse_schedule test/timestamp/run-test \
-               redhat/pgpool.init redhat/pgpool.sysconfig
+               redhat/pgpool.init redhat/pgpool.sysconfig redhat/pgpool.conf.sample.patch
 
 
 SUBDIRS = parser pcp

diff --git a/Makefile.in b/Makefile.in
index 73f9167d13b7597af8c0421380aa9fe7c653392f..d8ccbdc207d24b90615b35c8c6b6f50365eb60bb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -308,13 +308,15 @@ CLEANFILES = pgpool.8
 EXTRA_DIST = pgpool.8.in sql/system_db.sql sample/pgpool.pam doc/pgpool-ja.html doc/pgpool-en.html \
                doc/tutorial-ja.html doc/tutorial-en.html doc/pgpool.css \
                doc/where_to_send_queries.pdf doc/where_to_send_queries.odg doc/pgpool-ja.css \
+               doc/basebackup.sh doc/pgpool_remote_start doc/recovery.conf.sample \
                sample/pgpool_remote_start sample/pgpool_recovery sample/pgpool_recovery_pitr \
                sample/dist_def_pgbench.sql sample/replicate_def_pgbench.sql \
+               sql/Makefile \
                sql/pgpool-recovery/pgpool-recovery.c \
                sql/pgpool-recovery/pgpool-recovery.sql.in sql/pgpool-recovery/Makefile \
                sql/pgpool-regclass/pgpool-regclass.c \
                sql/pgpool-regclass/pgpool-regclass.sql.in sql/pgpool-regclass/Makefile \
-               sql/pgpool-walrecrunning/pgpool-walrecrunning.c \
+               sql/pgpool-walrecrunning/README sql/pgpool-walrecrunning/pgpool-walrecrunning.c \
                sql/pgpool-walrecrunning/pgpool-walrecrunning.sql.in sql/pgpool-walrecrunning/Makefile \
                test/parser/expected/copy.out test/parser/expected/create.out \
                test/parser/expected/cursor.out test/parser/expected/delete.out \
@@ -339,16 +341,21 @@ EXTRA_DIST = pgpool.8.in sql/system_db.sql sample/pgpool.pam doc/pgpool-ja.html
                test/parser/README test/parser/main.c \
                test/parser/pool.h test/parser/run-test \
                test/parser/parse_schedule \
+               test/C/Makefile test/C/test_extended.c \
                test/jdbc/*.java test/jdbc/README.euc_jp test/jdbc/pgpool.properties test/jdbc/prepare.sql test/jdbc/run.sh \
                test/jdbc/expected/autocommit test/jdbc/expected/batch \
                test/jdbc/expected/column test/jdbc/expected/lock test/jdbc/expected/select \
-               test/jdbc/expected/update test/jdbc/expected/insert \
+               test/jdbc/expected/update test/jdbc/expected/insert test/jdbc/expected/CreateTempTable \
+               test/pdo-test/README.euc_jp test/pdo-test/collections.inc test/pdo-test/def.inc \
+               test/pdo-test/log.txt test/pdo-test/pdotest.php test/pdo-test/regsql.inc \
+               test/pdo-test/SQLlist/test1.sql test/pdo-test/SQLlist/test2.sql \
+               test/pdo-test/mod/database.inc test/pdo-test/mod/def.inc test/pdo-test/mod/errorhandler.inc \
                test/timestamp/Makefile test/timestamp/input/insert.sql \
                test/timestamp/input/update.sql test/timestamp/input/misc.sql \
                test/timestamp/expected/insert.out test/timestamp/expected/update.out \
                test/timestamp/expected/misc.out test/timestamp/main.c \
                test/timestamp/parse_schedule test/timestamp/run-test \
-               redhat/pgpool.init redhat/pgpool.sysconfig
+               redhat/pgpool.init redhat/pgpool.sysconfig redhat/pgpool.conf.sample.patch
 
 SUBDIRS = parser pcp
 all: config.h

diff --git a/test/parser/expected/scanner.out b/test/parser/expected/scanner.out
new file mode 100644 (file)
index 0000000..a871766
--- /dev/null
+++ b/test/parser/expected/scanner.out
@@ -0,0 +1,30 @@
+pset 0
+ SELECT ''''
+ SELECT ''''
+ SELECT 'A
+BC'
+ SELECT 'A
+BC'
+syntax error: SELECT U&'d\0061t\+000061'; --error
+pset 1
+syntax error: SELECT '\''; -- error
+ SELECT ''''
+ SELECT 'A\\nBC'
+ SELECT 'A
+BC'
+pset 0
+ SELECT * FROM "data"
+ SELECT 'data'
+ SELECT 'data'
+ SELECT 'data'
+syntax error: SELECT E'\u3042\u3044\u3046\u3048\u304a'; -- error
+syntax error: SELECT U&'\3042\3044\3046\3048\304a'; -- error
+pset 6
+ SELECT * FROM "data"
+ SELECT 'data'
+ SELECT 'data'
+ SELECT 'data'
+ SELECT 'あいうえお'
+ SELECT 'あいうえお'
+ SELECT '𐀀'
+ SELECT '𐀀'

diff --git a/test/parser/expected/v90.out b/test/parser/expected/v90.out
new file mode 100644 (file)
index 0000000..dbecf1f
--- /dev/null
+++ b/test/parser/expected/v90.out
@@ -0,0 +1,25 @@
+ SELECT "func"(a := 7,b := 12)
+ SELECT "array_agg"("a" ORDER BY "b","c")
+ SELECT "mleast"(VARIADIC ARRAY [10,-1,5,4.4])
+ SELECT "avg"("c1") OVER ( ROWS 1 PRECEDING) FROM "r1"
+ SELECT "avg"("c1") OVER "w1" FROM "r1" WINDOW "w1" AS ( ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING)
+ SELECT * FROM "t1" OFFSET 1 LIMIT 2
+ SELECT * FROM "t1" LIMIT 2
+
+pset 90000
+EXPLAIN (analyze , verbose ) SELECT 1
+EXPLAIN (analyze 'true', verbose 'true', costs 'true', buffers 'true', format 'xml') SELECT 1
+EXPLAIN (analyze 'false', verbose 'false', costs 'false', buffers 'false', format 'json') SELECT 1
+COPY "t" FROM STDIN 
+COPY "t" FROM 'xxx' (format 'binary')
+COPY "t" FROM 'xxx' (format 'csv', header 1, quote '#', escape '$', force_not_null ("foo", "bar"))
+COPY "t" FROM 'xxx' (oids 1)
+COPY "t" FROM 'xxx' (delimiter ',')
+COPY "t" FROM 'xxx' (null 'x')
+COPY "t" FROM STDIN (format 'text')
+COPY "t" FROM STDIN (format 'csv')
+COPY "t" FROM STDIN (format 'binary')
+COPY "t" FROM 'f' (oids 'false')
+COPY "t" FROM 'f' (oids 'true', delimiter '|', null '<N>', header 'false')
+COPY "t" FROM 'f' (header 'true', quote '"', escape '@')
+COPY "t" FROM 'f' (force_quote *, force_not_null ("one", "two", "three"))

diff --git a/test/parser/input/scanner.sql b/test/parser/input/scanner.sql
new file mode 100644 (file)
index 0000000..9d71e24
--- /dev/null
+++ b/test/parser/input/scanner.sql
@@ -0,0 +1,34 @@
+\pset standard_conforming_strings off
+SELECT '\'';
+SELECT '''';
+SELECT 'A\nBC';
+SELECT E'A\nBC';
+SELECT U&'d\0061t\+000061'; --error
+\pset standard_conforming_strings on
+SELECT '\''; -- error
+SELECT '''';
+SELECT 'A\nBC';
+SELECT E'A\nBC';
+
+\pset server_encoding SQL_ASCII
+# unicode ident
+SELECT * FROM U&"d\0061t\+000061";
+# unicode literal
+SELECT E'd\u0061t\U00000061';
+SELECT U&'d\0061t\+000061';
+SELECT U&'d!0061t!+000061' UESCAPE '!';
+SELECT E'\u3042\u3044\u3046\u3048\u304a'; -- error
+SELECT U&'\3042\3044\3046\3048\304a'; -- error
+
+\pset server_encoding UTF8
+# unicode ident
+SELECT * FROM U&"d\0061t\+000061";
+# unicode literal
+SELECT E'd\u0061t\U00000061';
+SELECT U&'d\0061t\+000061';
+SELECT U&'d!0061t!+000061' UESCAPE '!';
+SELECT E'\u3042\u3044\u3046\u3048\u304a';
+SELECT U&'\3042\3044\3046\3048\304a';
+# surrogate pair
+SELECT E'\ud800\udc00';
+SELECT U&'\d800\dc00';

diff --git a/test/parser/input/v90.sql b/test/parser/input/v90.sql
new file mode 100644 (file)
index 0000000..4b11b14
--- /dev/null
+++ b/test/parser/input/v90.sql
@@ -0,0 +1,38 @@
+# named parameter
+SELECT func(a := 7, b := 12);
+# order by aggrigator
+SELECT array_agg(a ORDER BY b, c);
+# variadic from html/xfunc-sql.html
+SELECT mleast(VARIADIC ARRAY[10, -1, 5, 4.4]);
+# window function
+SELECT avg(c1) OVER (ROWS 1 PRECEDING) FROM r1;
+SELECT avg(c1) OVER w1 FROM r1 WINDOW w1 AS (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING);
+# offset
+SELECT * FROM t1 OFFSET 1 ROWS FETCH FIRST 2 ROWS ONLY;
+SELECT * FROM t1 FETCH NEXT 2 ROWS ONLY;
+# DO
+DO LANGUAGE PLPGSQL $$BEGIN RAISE NOTICE 'hello'; END$$;
+
+\pset server_version 9.0.0
+# explain
+# old syntax
+EXPLAIN ANALYZE VERBOSE SELECT 1;
+# new syntax
+EXPLAIN (ANALYZE true,VERBOSE true,COSTS true,BUFFERS true,FORMAT XML) SELECT 1;
+EXPLAIN (ANALYZE false,VERBOSE false,COSTS false,BUFFERS false,FORMAT JSON) SELECT 1;
+# copy
+# old syntax
+COPY t FROM stdin;
+COPY t FROM 'xxx' BINARY;
+COPY t FROM 'xxx' CSV HEADER QUOTE AS '#' ESCAPE AS '$' FORCE NOT NULL foo,bar;
+COPY t FROM 'xxx' OIDS;
+COPY t FROM 'xxx' DELIMITER ',';
+COPY t FROM 'xxx' NULL 'x';
+# new syntax
+COPY t FROM stdin (FORMAT 'text');
+COPY t FROM stdin (FORMAT 'csv');
+COPY t FROM stdin (FORMAT 'binary');
+COPY t FROM 'f' (OIDS false);
+COPY t FROM 'f' (OIDS true, DELIMITER '|', NULL '<N>', HEADER false);
+COPY t FROM 'f' (HEADER true, QUOTE '"', ESCAPE '@');
+COPY t FROM 'f' (FORCE_QUOTE *, FORCE_NOT_NULL(one, two, three));