Added CREATE IF NOT EXISTS for tablespaces

Author: Alexander Zhdanov

src/dsql/TablespaceNodes.epp

@@ -126,9 +126,14 @@ void CreateAlterTablespaceNode::executeCreate(thread_db* tdbb, DsqlCompilerScrat
 
 	const MetaName& userName = attachment->att_user->getUserName();
 
+	if (createIfNotExistsOnly && !DYN_UTIL_check_unique_name_nothrow(tdbb, transaction, name, obj_tablespace))
+		return;
+
 	executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_BEFORE,
 		DDL_TRIGGER_CREATE_TABLESPACE, name, NULL);
 
+	DYN_UTIL_check_unique_name(tdbb, transaction, name, obj_tablespace);
+
 	AutoCacheRequest requestHandle(tdbb, drq_s_tablespace, DYN_REQUESTS);
 
 	int faults = 0;

src/dsql/TablespaceNodes.h

@@ -69,6 +69,7 @@ class CreateAlterTablespaceNode : public DdlNode
 	bool alter;
 	bool offline;
 	bool readonly;
+	bool createIfNotExistsOnly = false;
 };
 
 

src/dsql/parse.y

@@ -1677,7 +1677,12 @@ create_clause
 			node->createIfNotExistsOnly = $3;
 			$$ = node;
 		}
-	| TABLESPACE tablespace_clause				{ $$ = $2; }
+	| TABLESPACE if_not_exists_opt tablespace_clause
+		{
+			const auto node = $3;
+			node->createIfNotExistsOnly = $2;
+			$$ = node;
+		}
 	;
 
 

src/include/firebird/impl/msg/dyn.h

@@ -306,3 +306,4 @@ FB_IMPL_MSG_SYMBOL(DYN, 313, dyn_dup_package, "Package @1 already exists")
 FB_IMPL_MSG(DYN, 314, dyn_ts_not_found, -901, "42", "000", "Tablespace @1 not found")
 FB_IMPL_MSG(DYN, 315, dyn_cant_set_ts_table, -901, "42", "000", "Cannot set tablespace for temporary table @1")
 FB_IMPL_MSG(DYN, 316, dyn_cant_set_ts_index, -901, "42", "000", "Cannot set tablespace for temporary index @1")
+FB_IMPL_MSG(DYN, 317, dyn_ts_already_exists, -901, "42", "000", "Tablespace @1 already exists")

src/include/gen/Firebird.pas

@@ -5892,6 +5892,7 @@ 	IProfilerStatsImpl = class(IProfilerStats)
 	 isc_dyn_ts_not_found = 336068922;
 	 isc_dyn_cant_set_ts_table = 336068923;
 	 isc_dyn_cant_set_ts_index = 336068924;
+	 isc_dyn_ts_already_exists = 336068925;
 	 isc_gbak_unknown_switch = 336330753;
 	 isc_gbak_page_size_missing = 336330754;
 	 isc_gbak_page_size_toobig = 336330755;

src/jrd/drq.h

@@ -260,6 +260,7 @@ enum drq_type_t
 	drq_l_pkg_name,			// lookup package name
 	drq_l_rel_con,			// lookup relation constraint
 	drq_l_rel_fld_name,		// lookup relation field name
+	drq_l_ts_name,			// lookup tablespace name
 	drq_ts_drop_idx_dfw,	// find index of tablespace in dfw for drop
 	drq_ts_drop_rel_dfw,	// find relation of tablespace in dfw for drop
 

src/jrd/dyn_util.epp

@@ -220,6 +220,19 @@ bool DYN_UTIL_check_unique_name_nothrow(thread_db* tdbb, jrd_tra* transaction,
 
 			break;
 
+		case obj_tablespace:
+			request.reset(tdbb, drq_l_ts_name, DYN_REQUESTS);
+
+			FOR(REQUEST_HANDLE request TRANSACTION_HANDLE transaction)
+				TS IN RDB$TABLESPACES
+				WITH TS.RDB$TABLESPACE_NAME EQ object_name.c_str()
+			{
+				*errorCode = 317;
+			}
+			END_FOR
+
+			break;
+
 		default:
 			fb_assert(false);
 	}