summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorThomas G. Lockhart2000-07-14 15:43:57 +0000
committerThomas G. Lockhart2000-07-14 15:43:57 +0000
commitbe703cd9e8359d00c9f5498c713ab9fc282f21c4 (patch)
tree53cb9d4b7fee0efc22ac8d274bf669afec991854 /src/test
parent1e901bbe8430ce870f7dbfcc33c14f4c82c2f9aa (diff)
Implement nested block comments in the backend and in psql.
Include updates for the comment.sql regression test. Implement SET SESSION CHARACTERISTICS and SET DefaultXactIsoLevel. Implement SET SESSION CHARACTERISTICS TRANSACTION COMMIT and SET AutoCommit in the parser only. Need to add code to actually do something. Implement WITHOUT TIME ZONE type qualifier. Define SCHEMA keyword, along with stubbed-out grammar. Implement "[IN|INOUT|OUT] [varname] type" function arguments in parser only; INOUT and OUT throws an elog(ERROR). Add PATH as a type-specific token, since PATH is in SQL99 to support schema resource search and resolution.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/regress/expected/comments.out28
-rw-r--r--src/test/regress/sql/comments.sql28
2 files changed, 55 insertions, 1 deletions
diff --git a/src/test/regress/expected/comments.out b/src/test/regress/expected/comments.out
index 3cbde72c07a..33f612e6332 100644
--- a/src/test/regress/expected/comments.out
+++ b/src/test/regress/expected/comments.out
@@ -34,4 +34,32 @@ SELECT 'after multi-line' AS fifth;
after multi-line
(1 row)
+--
+-- Nested comments
+--
+/*
+SELECT 'trailing' as x1; -- inside block comment
+*/
+/* This block comment surrounds a query which itself has a block comment...
+SELECT /* embedded single line */ 'embedded' AS x2;
+*/
+SELECT -- continued after the following block comments...
+/* Deeply nested comment.
+ This includes a single apostrophe to make sure we aren't decoding this part as a string.
+SELECT 'deep nest' AS n1;
+/* Second level of nesting...
+SELECT 'deeper nest' as n2;
+/* Third level of nesting...
+SELECT 'deepest nest' as n3;
+*/
+Hoo boy. Still two deep...
+*/
+Now just one deep...
+*/
+'deeply nested example' AS sixth;
+ sixth
+-----------------------
+ deeply nested example
+(1 row)
+
/* and this is the end of the file */
diff --git a/src/test/regress/sql/comments.sql b/src/test/regress/sql/comments.sql
index 527988f4a5e..e47db1ae598 100644
--- a/src/test/regress/sql/comments.sql
+++ b/src/test/regress/sql/comments.sql
@@ -12,5 +12,31 @@ SELECT 'before multi-line' AS fourth;
*/
SELECT 'after multi-line' AS fifth;
-/* and this is the end of the file */
+--
+-- Nested comments
+--
+
+/*
+SELECT 'trailing' as x1; -- inside block comment
+*/
+/* This block comment surrounds a query which itself has a block comment...
+SELECT /* embedded single line */ 'embedded' AS x2;
+*/
+
+SELECT -- continued after the following block comments...
+/* Deeply nested comment.
+ This includes a single apostrophe to make sure we aren't decoding this part as a string.
+SELECT 'deep nest' AS n1;
+/* Second level of nesting...
+SELECT 'deeper nest' as n2;
+/* Third level of nesting...
+SELECT 'deepest nest' as n3;
+*/
+Hoo boy. Still two deep...
+*/
+Now just one deep...
+*/
+'deeply nested example' AS sixth;
+
+/* and this is the end of the file */