summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorKevin Grittner2011-09-24 16:15:45 +0000
committerKevin Grittner2011-09-24 16:15:45 +0000
commitaf8d5448f8be9c3f5fb030ac94509629cccab09b (patch)
tree57533e96b2317c49aaa418632ec49046ce0c93a5 /src/test
parentbb08357723c3188d73f3eca170987d4d7af58635 (diff)
parent337c0b03614c45516f2c3ec956405713bb264d54 (diff)
Merge branch 'master' into serializableserializable
Diffstat (limited to 'src/test')
-rw-r--r--src/test/regress/expected/create_table.out19
-rw-r--r--src/test/regress/sql/create_table.sql14
2 files changed, 19 insertions, 14 deletions
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index b1dedd469d..d20790f909 100644
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -204,14 +204,19 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
t text
);
NOTICE: relation "test_tsvector" already exists, skipping
-CREATE UNLOGGED TABLE unlogged1 (a int); -- OK
+CREATE UNLOGGED TABLE unlogged1 (a int primary key); -- OK
+NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "unlogged1_pkey" for table "unlogged1"
INSERT INTO unlogged1 VALUES (42);
-CREATE UNLOGGED TABLE public.unlogged2 (a int); -- also OK
-CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int); -- not OK
+CREATE UNLOGGED TABLE public.unlogged2 (a int primary key); -- also OK
+NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "unlogged2_pkey" for table "unlogged2"
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int primary key); -- not OK
ERROR: only temporary relations may be created in temporary schemas
-CREATE TABLE pg_temp.implicity_temp (a int); -- OK
-CREATE TEMP TABLE explicitly_temp (a int); -- also OK
-CREATE TEMP TABLE pg_temp.doubly_temp (a int); -- also OK
-CREATE TEMP TABLE public.temp_to_perm (a int); -- not OK
+CREATE TABLE pg_temp.implicitly_temp (a int primary key); -- OK
+NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "implicitly_temp_pkey" for table "implicitly_temp"
+CREATE TEMP TABLE explicitly_temp (a int primary key); -- also OK
+NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "explicitly_temp_pkey" for table "explicitly_temp"
+CREATE TEMP TABLE pg_temp.doubly_temp (a int primary key); -- also OK
+NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "doubly_temp_pkey" for table "doubly_temp"
+CREATE TEMP TABLE public.temp_to_perm (a int primary key); -- not OK
ERROR: cannot create temporary relation in non-temporary schema
DROP TABLE unlogged1, public.unlogged2;
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index c1b2acf94d..a050e8b6d1 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -241,12 +241,12 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
t text
);
-CREATE UNLOGGED TABLE unlogged1 (a int); -- OK
+CREATE UNLOGGED TABLE unlogged1 (a int primary key); -- OK
INSERT INTO unlogged1 VALUES (42);
-CREATE UNLOGGED TABLE public.unlogged2 (a int); -- also OK
-CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int); -- not OK
-CREATE TABLE pg_temp.implicity_temp (a int); -- OK
-CREATE TEMP TABLE explicitly_temp (a int); -- also OK
-CREATE TEMP TABLE pg_temp.doubly_temp (a int); -- also OK
-CREATE TEMP TABLE public.temp_to_perm (a int); -- not OK
+CREATE UNLOGGED TABLE public.unlogged2 (a int primary key); -- also OK
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int primary key); -- not OK
+CREATE TABLE pg_temp.implicitly_temp (a int primary key); -- OK
+CREATE TEMP TABLE explicitly_temp (a int primary key); -- also OK
+CREATE TEMP TABLE pg_temp.doubly_temp (a int primary key); -- also OK
+CREATE TEMP TABLE public.temp_to_perm (a int primary key); -- not OK
DROP TABLE unlogged1, public.unlogged2;