fix(endtoend): Ensure all SQL works against PostgreSQL (#2684)

* test(endtoend): Fix issues with PostgreSQL tests

* Manually regenerate because the regen script is broken

* Fix build issues

internal/endtoend/testdata/citext/pgx/query.sql

@@ -1,3 +1,5 @@
+CREATE EXTENSION IF NOT EXISTS citext;
+
 CREATE TABLE foo (
     bar citext,
     bat citext not null
@@ -6,4 +8,3 @@ CREATE TABLE foo (
 -- name: GetCitexts :many
 SELECT bar, bat
 FROM foo;
-

internal/endtoend/testdata/citext/stdlib/query.sql

@@ -1,3 +1,5 @@
+CREATE EXTENSION IF NOT EXISTS citext;
+
 CREATE TABLE foo (
     bar citext,
     bat citext not null

internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v4/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar TEXT);
-ALTER TABLE foo ALTER bar TYPE TEXT ARRAY;
+ALTER TABLE foo ALTER bar TYPE TEXT ARRAY USING bar::text[];

internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v5/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar TEXT);
-ALTER TABLE foo ALTER bar TYPE TEXT ARRAY;
+ALTER TABLE foo ALTER bar TYPE TEXT ARRAY USING bar::text[];

internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/stdlib/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar TEXT);
-ALTER TABLE foo ALTER bar TYPE TEXT ARRAY;
+ALTER TABLE foo ALTER bar TYPE TEXT ARRAY USING bar::text[];

internal/endtoend/testdata/ddl_alter_table_drop_constraint/postgresql/pgx/v4/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE venues (id SERIAL PRIMARY KEY);
-ALTER TABLE venues DROP CONSTRAINT venues_id_pkey;
+ALTER TABLE venues DROP CONSTRAINT venues_pkey;

internal/endtoend/testdata/ddl_alter_table_drop_constraint/postgresql/pgx/v5/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE venues (id SERIAL PRIMARY KEY);
-ALTER TABLE venues DROP CONSTRAINT venues_id_pkey;
+ALTER TABLE venues DROP CONSTRAINT venues_pkey;

internal/endtoend/testdata/ddl_alter_table_drop_constraint/postgresql/stdlib/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE venues (id SERIAL PRIMARY KEY);
-ALTER TABLE venues DROP CONSTRAINT venues_id_pkey;
+ALTER TABLE venues DROP CONSTRAINT venues_pkey;

internal/endtoend/testdata/ddl_alter_table_index/postgresql/pgx/v4/schema.sql

@@ -1,4 +1,17 @@
-CREATE TABLE temp(a TEXT);
+CREATE TABLE measurement (
+    city_id         int not null,
+    logdate         date not null,
+    peaktemp        int,
+    unitsales       int
+) PARTITION BY RANGE (logdate);
 
-CREATE INDEX temp_idx ON temp(a);
-ALTER INDEX temp_idx ATTACH PARTITION temp_partition_idx;
+CREATE TABLE measurement_y2006m02 PARTITION OF measurement
+    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01');
+
+CREATE INDEX measurement_usls_idx ON ONLY measurement (unitsales);
+
+CREATE INDEX measurement_usls_200602_idx
+    ON measurement_y2006m02 (unitsales);
+
+ALTER INDEX measurement_usls_idx
+    ATTACH PARTITION measurement_usls_200602_idx;

internal/endtoend/testdata/ddl_alter_table_index/postgresql/pgx/v5/schema.sql

@@ -1,4 +1,17 @@
-CREATE TABLE temp(a TEXT);
+CREATE TABLE measurement (
+    city_id         int not null,
+    logdate         date not null,
+    peaktemp        int,
+    unitsales       int
+) PARTITION BY RANGE (logdate);
 
-CREATE INDEX temp_idx ON temp(a);
-ALTER INDEX temp_idx ATTACH PARTITION temp_partition_idx;
+CREATE TABLE measurement_y2006m02 PARTITION OF measurement
+    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01');
+
+CREATE INDEX measurement_usls_idx ON ONLY measurement (unitsales);
+
+CREATE INDEX measurement_usls_200602_idx
+    ON measurement_y2006m02 (unitsales);
+
+ALTER INDEX measurement_usls_idx
+    ATTACH PARTITION measurement_usls_200602_idx;

internal/endtoend/testdata/ddl_alter_table_index/postgresql/stdlib/schema.sql

@@ -1,5 +1,17 @@
-CREATE TABLE temp(a TEXT);
+CREATE TABLE measurement (
+    city_id         int not null,
+    logdate         date not null,
+    peaktemp        int,
+    unitsales       int
+) PARTITION BY RANGE (logdate);
 
-CREATE INDEX temp_idx ON temp(a);
-ALTER INDEX temp_idx ATTACH PARTITION temp_partition_idx;
+CREATE TABLE measurement_y2006m02 PARTITION OF measurement
+    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01');
 
+CREATE INDEX measurement_usls_idx ON ONLY measurement (unitsales);
+
+CREATE INDEX measurement_usls_200602_idx
+    ON measurement_y2006m02 (unitsales);
+
+ALTER INDEX measurement_usls_idx
+    ATTACH PARTITION measurement_usls_200602_idx;

internal/endtoend/testdata/ddl_alter_table_set_data_type/postgresql/pgx/v4/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar text);
-ALTER TABLE foo ALTER bar SET DATA TYPE bool;
+ALTER TABLE foo ALTER bar SET DATA TYPE bool USING bar::boolean;

internal/endtoend/testdata/ddl_alter_table_set_data_type/postgresql/pgx/v5/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar text);
-ALTER TABLE foo ALTER bar SET DATA TYPE bool;
+ALTER TABLE foo ALTER bar SET DATA TYPE bool USING bar::boolean;

internal/endtoend/testdata/ddl_alter_table_set_data_type/postgresql/stdlib/schema.sql

@@ -1,2 +1,2 @@
 CREATE TABLE foo (bar text);
-ALTER TABLE foo ALTER bar SET DATA TYPE bool;
+ALTER TABLE foo ALTER bar SET DATA TYPE bool USING bar::boolean;

internal/endtoend/testdata/ddl_create_function_return/postgresql/pgx/v4/schema.sql

@@ -1 +1 @@
-CREATE FUNCTION foo(bar TEXT, baz TEXT="baz") RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar TEXT, baz TEXT='baz') RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_function_return/postgresql/pgx/v5/schema.sql

@@ -1 +1 @@
-CREATE FUNCTION foo(bar TEXT, baz TEXT="baz") RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar TEXT, baz TEXT='baz') RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_function_return/postgresql/stdlib/schema.sql

@@ -1 +1 @@
-CREATE FUNCTION foo(bar TEXT, baz TEXT="baz") RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar TEXT, baz TEXT='baz') RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v4/schema.sql

@@ -1,2 +1,2 @@
 CREATE FUNCTION foo(bar TEXT) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
-CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT "baz" $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT 'baz' $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v5/schema.sql

@@ -1,2 +1,2 @@
 CREATE FUNCTION foo(bar TEXT) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
-CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT "baz" $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT 'baz' $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_function_types/postgresql/stdlib/schema.sql

@@ -1,2 +1,2 @@
 CREATE FUNCTION foo(bar TEXT) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
-CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT "baz" $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT 'baz' $$ LANGUAGE sql;

internal/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/v4/schema.sql

@@ -1,5 +1,5 @@
 CREATE TABLE foo (
-    id uuid PRIMARY KEY,
+    id uuid NOT NULL,
     other_id uuid NOT NULL
 ) PARTITION BY HASH (other_id);
 

internal/endtoend/testdata/ddl_create_table_partition/postgresql/pgx/v5/schema.sql

@@ -1,5 +1,5 @@
 CREATE TABLE foo (
-    id uuid PRIMARY KEY,
+    id uuid NOT NULL,
     other_id uuid NOT NULL
 ) PARTITION BY HASH (other_id);
 

internal/endtoend/testdata/ddl_create_table_partition/postgresql/stdlib/schema.sql

@@ -1,5 +1,5 @@
 CREATE TABLE foo (
-    id uuid PRIMARY KEY,
+    id uuid NOT NULL,
     other_id uuid NOT NULL
 ) PARTITION BY HASH (other_id);
 

internal/endtoend/testdata/ddl_drop_schema/postgresql/pgx/v4/schema.sql

@@ -1,3 +1,3 @@
 CREATE SCHEMA foo;
 CREATE TABLE foo.bar (baz text);
-DROP SCHEMA foo;
+DROP SCHEMA foo CASCADE;

internal/endtoend/testdata/ddl_drop_schema/postgresql/pgx/v5/schema.sql

@@ -1,3 +1,3 @@
 CREATE SCHEMA foo;
 CREATE TABLE foo.bar (baz text);
-DROP SCHEMA foo;
+DROP SCHEMA foo CASCADE;

internal/endtoend/testdata/ddl_drop_schema/postgresql/stdlib/schema.sql

@@ -1,3 +1,3 @@
 CREATE SCHEMA foo;
 CREATE TABLE foo.bar (baz text);
-DROP SCHEMA foo;
+DROP SCHEMA foo CASCADE;

internal/endtoend/testdata/ddl_pg_temp/postgresql/pgx/v4/schema.sql

@@ -1,3 +1,5 @@
+CREATE TABLE old_table (val SERIAL);
+CREATE TABLE new_table (val SERIAL);
 CREATE TABLE pg_temp.migrate (val SERIAL);
-INSERT INTO pg_temp.migrate (val) SELECT val FROM old;
-INSERT INTO new (val) SELECT val FROM pg_temp.migrate;
+INSERT INTO pg_temp.migrate (val) SELECT val FROM old_table;
+INSERT INTO new_table (val) SELECT val FROM pg_temp.migrate;

internal/endtoend/testdata/ddl_pg_temp/postgresql/pgx/v5/schema.sql

@@ -1,3 +1,5 @@
+CREATE TABLE old_table (val SERIAL);
+CREATE TABLE new_table (val SERIAL);
 CREATE TABLE pg_temp.migrate (val SERIAL);
-INSERT INTO pg_temp.migrate (val) SELECT val FROM old;
-INSERT INTO new (val) SELECT val FROM pg_temp.migrate;
+INSERT INTO pg_temp.migrate (val) SELECT val FROM old_table;
+INSERT INTO new_table (val) SELECT val FROM pg_temp.migrate;

internal/endtoend/testdata/ddl_pg_temp/postgresql/stdlib/schema.sql

@@ -1,3 +1,5 @@
+CREATE TABLE old_table (val SERIAL);
+CREATE TABLE new_table (val SERIAL);
 CREATE TABLE pg_temp.migrate (val SERIAL);
-INSERT INTO pg_temp.migrate (val) SELECT val FROM old;
-INSERT INTO new (val) SELECT val FROM pg_temp.migrate;
+INSERT INTO pg_temp.migrate (val) SELECT val FROM old_table;
+INSERT INTO new_table (val) SELECT val FROM pg_temp.migrate;

internal/endtoend/testdata/func_return/postgresql/pgx/v4/schema.sql

@@ -1,9 +1,11 @@
 CREATE TABLE users (
-    id integer,
-    first_name varchar(255) NOT NULL
+   id integer,
+   first_name varchar(255) NOT NULL
 );
 
-CREATE FUNCTION users_func() RETURNS SETOF users AS $func$ BEGIN QUERY
-SELECT *
-FROM users
-END $func$ LANGUAGE plpgsql;
+CREATE FUNCTION users_func() RETURNS SETOF users AS $func$
+    BEGIN
+        SELECT *
+        FROM users;
+    END;
+$func$ LANGUAGE plpgsql;

internal/endtoend/testdata/func_return/postgresql/pgx/v5/schema.sql

@@ -1,9 +1,11 @@
 CREATE TABLE users (
-    id integer,
-    first_name varchar(255) NOT NULL
+   id integer,
+   first_name varchar(255) NOT NULL
 );
 
-CREATE FUNCTION users_func() RETURNS SETOF users AS $func$ BEGIN QUERY
-SELECT *
-FROM users
-END $func$ LANGUAGE plpgsql;
+CREATE FUNCTION users_func() RETURNS SETOF users AS $func$
+    BEGIN
+        SELECT *
+        FROM users;
+    END;
+$func$ LANGUAGE plpgsql;

internal/endtoend/testdata/func_return/postgresql/stdlib/schema.sql

@@ -3,7 +3,9 @@ CREATE TABLE users (
    first_name varchar(255) NOT NULL
 );
 
-CREATE FUNCTION users_func() RETURNS SETOF users AS $func$ BEGIN QUERY
-SELECT *
-FROM users
-END $func$ LANGUAGE plpgsql;
+CREATE FUNCTION users_func() RETURNS SETOF users AS $func$
+    BEGIN
+        SELECT *
+        FROM users;
+    END;
+$func$ LANGUAGE plpgsql;

internal/endtoend/testdata/hstore/pgx/v4/hstore.sql

@@ -1,3 +1,5 @@
+CREATE EXTENSION IF NOT EXISTS hstore;
+
 CREATE TABLE foo (
         bar hstore NOT NULL,
         baz hstore

internal/endtoend/testdata/hstore/pgx/v5/hstore.sql

@@ -1,3 +1,5 @@
+CREATE EXTENSION IF NOT EXISTS hstore;
+
 CREATE TABLE foo (
         bar hstore NOT NULL,
         baz hstore

internal/endtoend/testdata/hstore/stdlib/hstore.sql

@@ -1,3 +1,5 @@
+CREATE EXTENSION IF NOT EXISTS hstore;
+
 CREATE TABLE foo (
         bar hstore NOT NULL,
         baz hstore

internal/endtoend/testdata/identifier_dollar_sign/query.sql

@@ -1,4 +1,5 @@
-CREATE FUNCTION f$n() RETURNS integer AS 'SELECT 1';
+CREATE FUNCTION f$n() RETURNS integer 
+    AS $$ SELECT 1 $$ LANGUAGE SQL;
 
 -- name: Fn :one
 SELECT f$n();