From 905ae8ab18c0422229246b39c6318775477cf6ae Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 15 Apr 2020 08:49:48 -0400 Subject: [PATCH] test/sql: set default_with_oids=false everywhere. PostgreSQL 12.x no longer supports OIDs, and attempting to create tables that support them is throwing an error: 1) Error: TestRm#test_rm_domain: PG::FeatureNotSupported: ERROR: tables declared WITH OIDS are not supported This commit disables the OIDs-by-default, and should allow the test suite to run under newer versions of PostgreSQL. --- test/sql/postfixadmin.sql | 6 +++--- test/sql/roundcube.sql | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/sql/postfixadmin.sql b/test/sql/postfixadmin.sql index f139a4f..9b62501 100644 --- a/test/sql/postfixadmin.sql +++ b/test/sql/postfixadmin.sql @@ -89,7 +89,7 @@ ALTER FUNCTION public.merge_quota2() OWNER TO postgres; SET default_tablespace = ''; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: admin; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -160,7 +160,7 @@ ALTER TABLE public.alias_domain OWNER TO postgres; COMMENT ON TABLE alias_domain IS 'Postfix Admin - Domain Aliases'; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: config; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -371,7 +371,7 @@ CREATE TABLE quota2 ( ALTER TABLE public.quota2 OWNER TO postgres; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: vacation; Type: TABLE; Schema: public; Owner: postgres; Tablespace: diff --git a/test/sql/roundcube.sql b/test/sql/roundcube.sql index 36e0a6c..2004ffa 100644 --- a/test/sql/roundcube.sql +++ b/test/sql/roundcube.sql @@ -26,7 +26,7 @@ SET search_path = public, pg_catalog; SET default_tablespace = ''; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: cache; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -145,7 +145,7 @@ CREATE SEQUENCE contactgroups_ids ALTER TABLE public.contactgroups_ids OWNER TO postgres; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: contacts; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -182,7 +182,7 @@ CREATE TABLE dictionary ( ALTER TABLE public.dictionary OWNER TO postgres; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: identities; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -251,7 +251,7 @@ CREATE TABLE searches ( ALTER TABLE public.searches OWNER TO postgres; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: session; Type: TABLE; Schema: public; Owner: postgres; Tablespace: @@ -296,7 +296,7 @@ CREATE SEQUENCE user_ids ALTER TABLE public.user_ids OWNER TO postgres; -SET default_with_oids = true; +SET default_with_oids = false; -- -- Name: users; Type: TABLE; Schema: public; Owner: postgres; Tablespace: -- 2.43.2