This should fix #8726: Replication error is raised for CREATE TABLE ... EXTERNAL if the specified disk does not exist on the replica host

Author: dyemanov

src/dsql/DdlNodes.epp

@@ -7419,8 +7419,11 @@ void CreateRelationNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScrat
 			if (externalFile->length() >= sizeof(REL.RDB$EXTERNAL_FILE))
 				status_exception::raise(Arg::Gds(isc_dyn_name_longer));
 
-			if (ISC_check_if_remote(externalFile->c_str(), false))
+			if (!(tdbb->tdbb_flags & TDBB_replicator) &&
+				ISC_check_if_remote(externalFile->c_str(), false))
+			{
 				status_exception::raise(Arg::PrivateDyn(163));
+			}
 
 			REL.RDB$EXTERNAL_FILE.NULL = FALSE;
 			strcpy(REL.RDB$EXTERNAL_FILE, externalFile->c_str());

src/jrd/dfw.epp

@@ -498,7 +498,7 @@ static bool create_expression_index(thread_db* tdbb, SSHORT phase, DeferredWork*
 static void check_computed_dependencies(thread_db* tdbb, jrd_tra* transaction,
 	const MetaName& fieldName);
 static void check_dependencies(thread_db*, const TEXT*, const TEXT*, const TEXT*, int, jrd_tra*);
-static void check_filename(const Firebird::string&, bool);
+static void check_filename(thread_db*, const Firebird::string&, bool);
 static void cleanup_index_creation(thread_db*, DeferredWork*, jrd_tra*);
 static bool formatsAreEqual(const Format*, const Format*);
 static bool	find_depend_in_dfw(thread_db*, TEXT*, USHORT, USHORT, jrd_tra*);
@@ -1883,9 +1883,8 @@ static bool add_file(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tra*
 		// Check the file name for node name. This has already
 		// been done for shadows in add_shadow()
 
-		if (work->dfw_type != dfw_add_shadow) {
-			check_filename(work->dfw_name, true);
-		}
+		if (work->dfw_type != dfw_add_shadow)
+			check_filename(tdbb, work->dfw_name, true);
 
 		// User transaction may be safely used instead of system, cause
 		// we requested and got exclusive database access. AP-2008.
@@ -2003,7 +2002,7 @@ static bool add_shadow(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tr
 		return true;
 
 	case 4:
-		check_filename(work->dfw_name, false);
+		check_filename(tdbb, work->dfw_name, false);
 
 		/* could have two cases:
 		   1) this shadow has already been written to, so add this file using
@@ -2155,7 +2154,7 @@ static bool add_difference(thread_db* tdbb, SSHORT phase, DeferredWork* work, jr
 				ERR_post(Arg::Gds(isc_no_meta_update) <<
 						 Arg::Gds(isc_wrong_backup_state));
 			}
-			check_filename(work->dfw_name, true);
+			check_filename(tdbb, work->dfw_name, true);
 			dbb->dbb_backup_manager->setDifference(tdbb, work->dfw_name.c_str());
 		}
 		break;
@@ -3055,7 +3054,7 @@ static void check_dependencies(thread_db* tdbb,
 }
 
 
-static void check_filename(const Firebird::string& name, bool shareExpand)
+static void check_filename(thread_db* tdbb, const Firebird::string& name, bool shareExpand)
 {
 /**************************************
  *
@@ -3068,6 +3067,9 @@ static void check_filename(const Firebird::string& name, bool shareExpand)
  *	inet node name.
  *
  **************************************/
+	if (tdbb->tdbb_flags & TDBB_replicator)
+		return;
+
 	const Firebird::PathName file_name(name.ToPathName());
 	const bool valid = file_name.find("::") == Firebird::PathName::npos;