Support associated_schema and associated_table_prefix in CREATE TABLE ... WITH ()

svenklemm · svenklemm · commit 8003205979bd · 2025-04-15T22:10:24.000+02:00
diff --git a/src/process_utility.c b/src/process_utility.c
@@ -3724,8 +3724,12 @@ process_create_table_end(Node *parsetree)
 		char *time_column =
 			TextDatumGetCString(create_table_info.with_clauses[CreateTableFlagTimeColumn].parsed);
 		NameData time_column_name;
+		NameData associated_schema_name;
+		NameData associated_table_prefix;
 		namestrcpy(&time_column_name, time_column);
 		uint32 flags = 0;
+		bool has_associated_schema = false;
+		bool has_associated_table_prefix = false;
 
 		if (get_attnum(table_relid, time_column) == InvalidAttrNumber)
 			ereport(ERROR,
@@ -3752,6 +3756,23 @@ process_create_table_end(Node *parsetree)
 				flags |= HYPERTABLE_CREATE_DISABLE_DEFAULT_INDEXES;
 		}
 
+		if (!create_table_info.with_clauses[CreateTableFlagAssociatedSchema].is_default)
+		{
+			has_associated_schema = true;
+			namestrcpy(&associated_schema_name,
+					   TextDatumGetCString(
+						   create_table_info.with_clauses[CreateTableFlagAssociatedSchema].parsed));
+		}
+
+		if (!create_table_info.with_clauses[CreateTableFlagAssociatedTablePrefix].is_default)
+		{
+			has_associated_table_prefix = true;
+			namestrcpy(&associated_table_prefix,
+					   TextDatumGetCString(
+						   create_table_info.with_clauses[CreateTableFlagAssociatedTablePrefix]
+							   .parsed));
+		}
+
 		DimensionInfo *open_dim_info =
 			ts_dimension_info_create_open(table_relid,
 										  &time_column_name, /* column name */
@@ -3768,8 +3789,11 @@ process_create_table_end(Node *parsetree)
 									   flags,		  /* flags */
 									   open_dim_info, /* open_dim_info */
 									   NULL,		  /* closed_dim_info */
-									   NULL,		  /* associated_schema_name */
-									   NULL,		  /* associated_table_prefix */
+									   has_associated_schema ? &associated_schema_name :
+															   NULL, /* associated_schema_name */
+									   has_associated_table_prefix ?
+										   &associated_table_prefix :
+										   NULL, /* associated_table_prefix */
 									   csi);
 	}
 }
diff --git a/src/with_clause/create_table_with_clause.c b/src/with_clause/create_table_with_clause.c
@@ -17,6 +17,8 @@ static const WithClauseDefinition create_table_with_clauses_def[] = {
 	[CreateTableFlagTimeColumn] = {.arg_names = {"time_column", NULL}, .type_id = TEXTOID,},
 	[CreateTableFlagChunkTimeInterval] = {.arg_names = {"chunk_time_interval", NULL}, .type_id = TEXTOID,},
 	[CreateTableFlagCreateDefaultIndexes] = {.arg_names = {"create_default_indexes", NULL}, .type_id = BOOLOID, .default_val = (Datum) true,},
+	[CreateTableFlagAssociatedSchema] = {.arg_names = {"associated_schema", NULL}, .type_id = TEXTOID,},
+	[CreateTableFlagAssociatedTablePrefix] = {.arg_names = {"associated_table_prefix", NULL}, .type_id = TEXTOID,},
 };
 
 WithClauseResult *
diff --git a/src/with_clause/create_table_with_clause.h b/src/with_clause/create_table_with_clause.h
@@ -15,6 +15,8 @@ typedef enum CreateTableFlags
 	CreateTableFlagTimeColumn,
 	CreateTableFlagChunkTimeInterval,
 	CreateTableFlagCreateDefaultIndexes,
+	CreateTableFlagAssociatedSchema,
+	CreateTableFlagAssociatedTablePrefix,
 } CreateTableFlags;
 
 WithClauseResult *ts_create_table_with_clause_parse(const List *defelems);
diff --git a/test/expected/create_table_with.out b/test/expected/create_table_with.out
@@ -1,6 +1,10 @@
 -- This file and its contents are licensed under the Apache License 2.0.
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-APACHE for a copy of the license.
+-- our user needs permission to create schema for the schema tests
+\c :TEST_DBNAME :ROLE_SUPERUSER
+GRANT CREATE ON DATABASE :TEST_DBNAME TO :ROLE_DEFAULT_PERM_USER;
+\c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
 -- create table with non-tsdb option should not be affected
 CREATE TABLE t1(time timestamptz, device text, value float) WITH (autovacuum_enabled);
 DROP TABLE t1;
@@ -177,3 +181,75 @@ SELECT indexrelid::regclass from pg_index where indrelid='t10'::regclass ORDER B
 (0 rows)
 
 ROLLBACK;
+-- associated_schema
+BEGIN;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+ associated_schema_name 
+------------------------
+ _timescaledb_internal
+(1 row)
+
+ROLLBACK;
+BEGIN;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+ associated_schema_name 
+------------------------
+ abc
+(1 row)
+
+INSERT INTO t11 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc'::regnamespace ORDER BY 1;
+            relname             
+--------------------------------
+ _hyper_18_1_chunk
+ _hyper_18_1_chunk_t11_time_idx
+(2 rows)
+
+ROLLBACK;
+BEGIN;
+CREATE SCHEMA abc2;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc2');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+ associated_schema_name 
+------------------------
+ abc2
+(1 row)
+
+INSERT INTO t11 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc2'::regnamespace ORDER BY 1;
+            relname             
+--------------------------------
+ _hyper_19_2_chunk
+ _hyper_19_2_chunk_t11_time_idx
+(2 rows)
+
+ROLLBACK;
+-- associated_table_prefix
+BEGIN;
+CREATE TABLE t12(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time');
+SELECT associated_table_prefix FROM _timescaledb_catalog.hypertable WHERE table_name = 't12';
+ associated_table_prefix 
+-------------------------
+ _hyper_20
+(1 row)
+
+ROLLBACK;
+BEGIN;
+CREATE TABLE t12(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc', tsdb.associated_table_prefix='tbl_prefix');
+SELECT associated_table_prefix FROM _timescaledb_catalog.hypertable WHERE table_name = 't12';
+ associated_table_prefix 
+-------------------------
+ tbl_prefix
+(1 row)
+
+INSERT INTO t12 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc'::regnamespace ORDER BY 1;
+             relname             
+---------------------------------
+ tbl_prefix_3_chunk
+ tbl_prefix_3_chunk_t12_time_idx
+(2 rows)
+
+ROLLBACK;
diff --git a/test/sql/create_table_with.sql b/test/sql/create_table_with.sql
@@ -2,6 +2,11 @@
 -- Please see the included NOTICE for copyright information and
 -- LICENSE-APACHE for a copy of the license.
 
+-- our user needs permission to create schema for the schema tests
+\c :TEST_DBNAME :ROLE_SUPERUSER
+GRANT CREATE ON DATABASE :TEST_DBNAME TO :ROLE_DEFAULT_PERM_USER;
+\c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER
+
 -- create table with non-tsdb option should not be affected
 CREATE TABLE t1(time timestamptz, device text, value float) WITH (autovacuum_enabled);
 DROP TABLE t1;
@@ -107,3 +112,38 @@ CREATE TABLE t10(time timestamptz NOT NULL, device text, value float) WITH (tsdb
 SELECT indexrelid::regclass from pg_index where indrelid='t10'::regclass ORDER BY indexrelid::regclass::text;
 ROLLBACK;
 
+-- associated_schema
+BEGIN;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+ROLLBACK;
+
+BEGIN;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+INSERT INTO t11 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc'::regnamespace ORDER BY 1;
+ROLLBACK;
+
+BEGIN;
+CREATE SCHEMA abc2;
+CREATE TABLE t11(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc2');
+SELECT associated_schema_name FROM _timescaledb_catalog.hypertable WHERE table_name = 't11';
+INSERT INTO t11 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc2'::regnamespace ORDER BY 1;
+ROLLBACK;
+
+-- associated_table_prefix
+BEGIN;
+CREATE TABLE t12(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time');
+SELECT associated_table_prefix FROM _timescaledb_catalog.hypertable WHERE table_name = 't12';
+ROLLBACK;
+
+BEGIN;
+CREATE TABLE t12(time timestamptz NOT NULL, device text, value float) WITH (tsdb.hypertable,tsdb.time_column='time', tsdb.associated_schema='abc', tsdb.associated_table_prefix='tbl_prefix');
+SELECT associated_table_prefix FROM _timescaledb_catalog.hypertable WHERE table_name = 't12';
+INSERT INTO t12 SELECT '2025-01-01', 'd1', 0.1;
+SELECT relname from pg_class where relnamespace = 'abc'::regnamespace ORDER BY 1;
+ROLLBACK;
+
+
