Update of /home/cvsd/slony1/slony1-engine/src/parsestatements
In directory main.slony.info:/tmp/cvs-serv4776

Modified Files:
      Tag: REL_1_2_STABLE
	emptytestresult.expected.win32 test_sql.expected.win32 
Log Message:
Revised expected parsing test results - per Hiroshi Saito


Index: emptytestresult.expected.win32
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/parsestatements/emptytestresult.expected.win32,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
Binary files /tmp/cvsAW52qT and /tmp/cvscAo13H differ

Index: test_sql.expected.win32
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/parsestatements/test_sql.expected.win32,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** test_sql.expected.win32	22 Jun 2006 15:40:12 -0000	1.3
--- test_sql.expected.win32	29 Aug 2007 15:14:31 -0000	1.3.2.1
***************
*** 38,41 ****
--- 38,80 ----
  
  
+ -- Here is a rule creation with an embedded semicolon
+ -- "Dmitry Koterov" <dmitry at koterov.ru>
+ 
+ create table "public"."position";
+ 
+ CREATE RULE "position_get_last_id_on_insert2"
+ AS ON INSERT TO "public"."position" DO (SELECT
+ currval('position_position_id_seq'::regclass) AS id;);
+ 
+ -- Added to verify handling of queries tried by
+ -- "Dmitry Koterov" <dmitry at koterov.ru>
+ 
+ CREATE INDEX aaa ON public.bbb USING btree ((-ccc), ddd);
+ 
+ --  Apparently a pair of backslashes fold down into one?
+ -- "Dmitry Koterov" <dmitry at koterov.ru>
+ 
+ CREATE UNIQUE INDEX "i_dictionary_uni_abbr" ON "static"."dictionary"
+ USING btree ((substring(dic_russian, E'^([^(]*[^( ]) *\\('::text)))
+ WHERE (dic_category_id = 26);
+ 
+ -- Some more torturing per Weslee Bilodeau
+ 
+ -- I figure the $_$, $$, etc edge-casees would be another fun one to roll
+ -- into a custom parser.
+ 
+ CREATE FUNCTION test( ) RETURNS text AS $_$ SELECT ';', E'\';\'',
+ '"";""', E'"\';' ; SELECT 'OK'::text ; $_$ LANGUAGE SQL ;
+ 
+ SELECT $_$ hello; this ; - is '\" a '''' test $_$ ;
+ 
+ SELECT $$ $ test ; $ ;  $$ ;
+ 
+ -- All really funky, but perfectly valid.
+ 
+ -- Force a query to be at the end...
+ 
+ create table foo;
+ 
  statement 0
  -------------------------------------------
***************
*** 115,117 ****
      return NULL;
    end;
! $$ language plpgsql;
\ No newline at end of file
--- 154,223 ----
      return NULL;
    end;
! $$ language plpgsql;
! statement 14
! -------------------------------------------
! 
! 
! 
! -- Here is a rule creation with an embedded semicolon
! -- "Dmitry Koterov" <dmitry at koterov.ru>
! 
! create table "public"."position";
! statement 15
! -------------------------------------------
! 
! 
! CREATE RULE "position_get_last_id_on_insert2"
! AS ON INSERT TO "public"."position" DO (SELECT
! currval('position_position_id_seq'::regclass) AS id;);
! statement 16
! -------------------------------------------
! 
! 
! -- Added to verify handling of queries tried by
! -- "Dmitry Koterov" <dmitry at koterov.ru>
! 
! CREATE INDEX aaa ON public.bbb USING btree ((-ccc), ddd);
! statement 17
! -------------------------------------------
! 
! 
! --  Apparently a pair of backslashes fold down into one?
! -- "Dmitry Koterov" <dmitry at koterov.ru>
! 
! CREATE UNIQUE INDEX "i_dictionary_uni_abbr" ON "static"."dictionary"
! USING btree ((substring(dic_russian, E'^([^(]*[^( ]) *\\('::text)))
! WHERE (dic_category_id = 26);
! statement 18
! -------------------------------------------
! 
! 
! -- Some more torturing per Weslee Bilodeau
! 
! -- I figure the $_$, $$, etc edge-casees would be another fun one to roll
! -- into a custom parser.
! 
! CREATE FUNCTION test( ) RETURNS text AS $_$ SELECT ';', E'\';\'',
! '"";""', E'"\';' ; SELECT 'OK'::text ; $_$ LANGUAGE SQL ;
! statement 19
! -------------------------------------------
! 
! 
! SELECT $_$ hello; this ; - is '\" a '''' test $_$ ;
! statement 20
! -------------------------------------------
! 
! 
! SELECT $$ $ test ; $ ;  $$ ;
! statement 21
! -------------------------------------------
! 
! 
! -- All really funky, but perfectly valid.
! 
! -- Force a query to be at the end...
! 
! create table foo;
! statement 22
! -------------------------------------------
!   
\ No newline at end of file