Merge 7fd2800 into 99ceb56

Author: zverevgeny

ydb/tests/functional/suite_tests/postgres/create_table.test

@@ -88,13 +88,13 @@ CREATE TABLE person (
  PRIMARY KEY (name)
 );
 
-statement error Unexpected token 'INHERITS'
+statement error
 CREATE TABLE emp (
  salary int32,
  manager name
 ) INHERITS (person) WITH OIDS;
 
-statement error Unexpected token 'WITH'
+statement error
 CREATE TABLE emp (
  salary int32,
  manager name
@@ -166,15 +166,15 @@ CREATE TABLE road (
  thepath path
 );
 
-statement error Unexpected token
+statement error
 CREATE TABLE ihighway () INHERITS (road);
 
 statement error
 CREATE TABLE shighway (
  surface text
 ) INHERITS (road);
 
-statement error Unknown type: 'Path'
+statement error
 CREATE TABLE real_city (
  pop int32,
  cname string,

ydb/tests/functional/suite_tests/postgres/jointest/join1.test

@@ -43,7 +43,7 @@ INSERT INTO J1_TBL (i, j, t) VALUES (0, NULL, 'zero');
 statement ok
 INSERT INTO J1_TBL (i, j, t) VALUES (NULL, NULL, 'null');
 
-statement ok
+statement skipped_cs ok
 INSERT INTO J1_TBL (i, j, t) VALUES (NULL, 0, 'zero');
 
 statement ok
@@ -67,10 +67,10 @@ INSERT INTO J2_TBL (i, k) VALUES (5, -5);
 statement ok
 INSERT INTO J2_TBL (i, k) VALUES (0, NULL);
 
-statement ok
+statement skipped_cs ok
 INSERT INTO J2_TBL (i, k) VALUES (NULL, NULL);
 
-statement ok
+statement skipped_cs ok
 INSERT INTO J2_TBL (i, k) VALUES (NULL, 0);
 
 
@@ -104,7 +104,7 @@ SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL JOIN J2_TBL USING (i)
   ORDER BY i, j, t, k
 
-statement query
+statement skipped_cs query
 SELECT t1.b as b, t1.a as a, c, t2.a as a2  FROM (
   select i as a, j as b, t as c from J1_TBL) as t1
   JOIN (select i as a, k as b from J2_TBL) as t2 USING (b)
@@ -179,15 +179,11 @@ SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.i)
 ORDER BY i, j, t, k;
 
-statement query
+statement skipped_cs query
 SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.k)
 ORDER BY i;
 
---
--- Non-equi-joins
---
-
 statement error JOIN ON expression must be a conjunction of equality predicates
 SELECT J1_TBL.i as i1, J2_TBL.i as i2, j, t, k
   FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i <= J2_TBL.k);
@@ -197,32 +193,32 @@ SELECT J1_TBL.i as i1, J2_TBL.i as i2, j, t, k
 -- Note that OUTER is a noise word
 --
 
-statement query
+statement skipped_cs query
 SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL LEFT OUTER JOIN J2_TBL USING (i)
   ORDER BY i, j, k, t;
 
-statement query
+statement skipped_cs query
 SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL LEFT JOIN J2_TBL USING (i)
   ORDER BY i, j, k, t;
 
-statement query
+statement skipped_cs query
 SELECT J2_TBL.i as i, j, t, k
   FROM J1_TBL RIGHT OUTER JOIN J2_TBL USING (i)
   ORDER BY i, j, t, k
 
-statement query
+statement skipped_cs query
 SELECT J2_TBL.i as i, j, t, k
   FROM J1_TBL RIGHT JOIN J2_TBL USING (i)
   ORDER BY i, j, t, k
 
-statement query
+statement skipped_cs query
 SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL FULL OUTER JOIN J2_TBL USING (i)
   ORDER BY i, k, t;
 
-statement query
+statement skipped_cs query
 SELECT J1_TBL.i as i, j, t, k
   FROM J1_TBL FULL JOIN J2_TBL USING (i)
   ORDER BY i, k, t, j;

ydb/tests/functional/suite_tests/postgres/jointest/join2.test

@@ -33,7 +33,7 @@ INSERT INTO t3 (name, n) VALUES ( 'cc', 23 );
 statement ok
 INSERT INTO t3 (name, n) VALUES ( 'dd', 33 );
 
-statement query
+statement skipped_cs query
 select IF(SQ.name is Null, t3.name, SQ.name) as name,
 SQ.n1 as n1, SQ.n2 as n2, t3.n as n3
 FROM t3 FULL JOIN
@@ -62,7 +62,7 @@ LEFT JOIN
 USING (name)
 order by name
 
-statement query
+statement skipped_cs query
 SELECT IF(s3.name is not Null, s3.name, s2.name) as name, s2.n as n2, s3.n as n3 FROM
 (SELECT * FROM t2) as s2
 FULL JOIN

ydb/tests/functional/suite_tests/postgres/jointest/join4.test

@@ -2,7 +2,7 @@
 -- nested nestloops can require nested PlaceHolderVars
 --
 
-statement ok
+statement skipped_cs ok
 create table nt1 (
   id int,
   a1 bool,
@@ -23,34 +23,34 @@ create table nt3 (
   primary key(id)
 );
 
-statement ok
+statement skipped_cs ok
 insert into nt1 (id, a1, a2) values (1,true,true);
 
-statement ok
+statement skipped_cs ok
 insert into nt1 (id, a1, a2) values (2,true,false);
 
-statement ok
+statement skipped_cs ok
 insert into nt1 (id, a1, a2) values (3,false,false);
 
-statement ok
+statement skipped_cs ok
 insert into nt2 (id, nt1_id, b1, b2) values (1,1,true,true);
 
-statement ok
+statement skipped_cs ok
 insert into nt2 (id, nt1_id, b1, b2) values (2,2,true,false);
 
-statement ok
+statement skipped_cs ok
 insert into nt2 (id, nt1_id, b1, b2) values (3,3,false,false);
 
-statement ok
+statement skipped_cs ok
 insert into nt3 (id, nt2_id, c1) values (1,1,true);
 
-statement ok
+statement skipped_cs ok
 insert into nt3 (id, nt2_id, c1) values (2,2,false);
 
-statement ok
+statement skipped_cs ok
 insert into nt3 (id, nt2_id, c1) values (3,3,true);
 
-statement query
+statement skipped_cs query
 select nt3.id as id
 from nt3 as nt3
   left join

ydb/tests/functional/suite_tests/postgres/select_distinct.test

@@ -1,8 +1,3 @@
----
---- statement skipped: IS (NOT) DISTINCT FROM
---- https://wiki.postgresql.org/wiki/Is_distinct_from
----
-
 statement ok
 CREATE TABLE onek (
  unique1 int32,
@@ -110,7 +105,7 @@ INSERT INTO disttable (f1) VALUES(3);
 statement ok
 INSERT INTO disttable (f1) VALUES(NULL);
 
-statement skipped
+statement skipped query
 SELECT f1, f1 IS DISTINCT FROM 2 as "not 2" FROM disttable;
 ------------
  f1 | not 2

ydb/tests/functional/suite_tests/postgres/window.test

@@ -548,7 +548,7 @@ SELECT count(*) OVER (PARTITION BY four) FROM (SELECT * FROM tenk1 WHERE FALSE)s
  count
 -------
 
-statement query
+statement skipped_cs query
 SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
 
 statement skipped query

ydb/tests/functional/suite_tests/sqllogictest/select2-1.test

@@ -405,7 +405,7 @@ select case a+1 when b then 111 when c then 222
 from t1
 order by col1,col2
 
-statement query
+statement skipped_cs query
 select case when c>avg_c then a*2 else b*10 end as col1,
        abs(a) as col2,
        case a+1 when b then 111 when c then 222
@@ -545,7 +545,7 @@ from t1
 where (a>b-2 and a<b+2)
     or (e>a and e<b)
 
-statement query
+statement skipped_cs query
 select b-c as col1,
        a+b*2+c*3 as col2,
        case when c>avg_c then a*2 else b*10 end as col3,
@@ -598,7 +598,7 @@ where (c<=d-2 or c>=d+2)
     or (e>c or e<d)
 order by col1,col2
 
-statement query
+statement skipped_cs query
 select case a+1 when b then 111 when c then 222
         when d then 333  when e then 444 else 555 end as col1
 from t1
@@ -793,7 +793,7 @@ from t1
 where (a>b-2 and a<b+2)
 order by col2,col1,col3
 
-statement query
+statement skipped_cs query
 select d-e as col1,
        case a+1 when b then 111 when c then 222
         when d then 333  when e then 444 else 555 end as col2,
@@ -1048,7 +1048,7 @@ from t1
 where exists(select 1 from t1 as x where x.b<t1.b)
     or e+d between a+b-10 and c+130
 
-statement query
+statement skipped_cs query
 select b-c as col1
 from t1
 where a is null
@@ -1333,7 +1333,7 @@ where (c<=d-2 or c>=d+2)
     or (e>c or e<d)
     or c>d
 
-statement query
+statement skipped_cs query
 select (a+b+c+d+e)/5 as col1,
        c-d as col2,
        case a+1 when b then 111 when c then 222
@@ -1346,7 +1346,7 @@ where a>b
    and a is null
 order by col5,col3,col2,col4,col1
 
-statement query
+statement skipped_cs query
 select a+b*2+c*3 as col1,
        a+b*2+c*3+d*4+e*5 as col2,
        d as col3,
@@ -1434,7 +1434,7 @@ from t1
 where c>d
 order by col1,col3,col2
 
-statement query
+statement skipped_cs query
 select abs(b-c) as col1,
        (a+b+c+d+e)/5 as col2,
        d as col3
@@ -1857,7 +1857,7 @@ select d-e as col1
 from t1
 order by col1
 
-statement query
+statement skipped_cs query
 select b-c as col1,
        case when c>avg_c then a*2 else b*10 end as col2,
        case when a<b-3 then 111 when a<=b then 222
@@ -2080,7 +2080,7 @@ from t1
 where c between b-2 and d+2
 order by col1
 
-statement query
+statement skipped_cs query
 select d as col1,
        a-b as col2,
        c-d as col3,
@@ -2224,7 +2224,7 @@ from t1
 where b is not null
     or d>e
 
-statement query
+statement skipped_cs query
 select a+b*2+c*3+d*4+e*5 as col1,
        case when a<b-3 then 111 when a<=b then 222
         when a<b+3 then 333 else 444 end as col2,