meadow-integration 1.0.11 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "meadow-integration",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "description": "Meadow Data Integration",
     "bin": {
         "mdwint": "source/cli/Meadow-Integration-CLI-Run.js"

package/source/services/clone/Meadow-Service-Sync-Entity-Initial.js

@@ -74,33 +74,7 @@ class MeadowSyncEntityInitial extends libFableServiceProviderBase
 
 			return tmpProvider.createTable(this.EntitySchema, (pCreateError) =>
 			{
-				let fValidateAndCallback = (pPriorError) =>
-				{
-					// Validate local table schema with a lightweight read
-					const tmpValidationQuery = this.Meadow.query;
-					tmpValidationQuery.setCap(1);
-					tmpValidationQuery.setDisableDeleteTracking(true);
-					this.Meadow.doRead(tmpValidationQuery,
-						(pReadError) =>
-						{
-							if (pReadError)
-							{
-								let tmpErrorStr = (typeof(pReadError) === 'string') ? pReadError : JSON.stringify(pReadError);
-								// Only skip sync for schema-specific errors (invalid column/object name)
-								// Generic provider errors (e.g. prepared statement failures) should not block sync
-								if (tmpErrorStr.indexOf('Invalid column') > -1 || tmpErrorStr.indexOf('Invalid object') > -1 || tmpErrorStr.indexOf('no such column') > -1 || tmpErrorStr.indexOf('no such table') > -1)
-								{
-									this.log.warn(`${this.EntitySchema.TableName}: local table schema validation failed (${pReadError}); this entity will be skipped during sync.`);
-									this.skipSync = true;
-								}
-								else
-								{
-									this.log.warn(`${this.EntitySchema.TableName}: validation read returned error (${pReadError}); sync will proceed.`);
-								}
-							}
-							return fCallback(pPriorError);
-						});
-				};
+
 				if (pCreateError)
 				{
 					this.log.warn(`${this.EntitySchema.TableName}: createTable returned error: ${pCreateError}`);
@@ -112,13 +86,13 @@ class MeadowSyncEntityInitial extends libFableServiceProviderBase
 				if (!tmpGUIDColumn && !tmpDeletedColumn)
 				{
 					this.log.info(`No GUID or Deleted columns for ${this.EntitySchema.TableName}; skipping index creation`);
-					return fValidateAndCallback(pCreateError);
+					return fCallback(pCreateError);
 				}
 
 				if (!this.fable.MeadowConnectionManager || !this.fable.MeadowConnectionManager.ConnectionPool)
 				{
 					this.log.info(`No connection manager available; skipping index creation for ${this.EntitySchema.TableName}`);
-					return fValidateAndCallback(pCreateError);
+					return fCallback(pCreateError);
 				}
 
 				let tmpAnticipate = this.fable.newAnticipate();
@@ -336,6 +310,29 @@ class MeadowSyncEntityInitial extends libFableServiceProviderBase
 			return fCallback();
 		}
 
+		// Validate local table schema with a lightweight read before syncing
+		const tmpValidationQuery = this.Meadow.query;
+		tmpValidationQuery.setSort({ Column: this.DefaultIdentifier, Direction: 'Descending' });
+		tmpValidationQuery.setCap(1);
+		tmpValidationQuery.setDisableDeleteTracking(true);
+		this.Meadow.doRead(tmpValidationQuery,
+			(pReadError) =>
+			{
+				if (pReadError)
+				{
+					let tmpErrorStr = (typeof(pReadError) === 'string') ? pReadError : JSON.stringify(pReadError);
+					if (tmpErrorStr.indexOf('Invalid column') > -1 || tmpErrorStr.indexOf('Invalid object') > -1 || tmpErrorStr.indexOf('no such column') > -1 || tmpErrorStr.indexOf('no such table') > -1)
+					{
+						this.log.warn(`${this.EntitySchema.TableName}: local table schema mismatch (${pReadError}); skipping sync.`);
+						return fCallback();
+					}
+				}
+				return this._syncInternal(fCallback);
+			});
+	}
+
+	_syncInternal(fCallback)
+	{
 		this.operation.createTimeStamp('EntityInitialSync');
 
 		this.log.info(`Syncing ${this.EntitySchema.TableName} (PageSize: ${this.PageSize}, SyncDeletedRecords: ${this.SyncDeletedRecords})`);

package/source/services/clone/Meadow-Service-Sync-Entity-Ongoing.js

@@ -62,46 +62,20 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 		{
 			return this.Meadow.provider.getProvider().createTable(this.EntitySchema, (pCreateError) =>
 			{
-				let fValidateAndCallback = (pPriorError) =>
-				{
-					// Validate local table schema with a lightweight read
-					const tmpValidationQuery = this.Meadow.query;
-					tmpValidationQuery.setCap(1);
-					tmpValidationQuery.setDisableDeleteTracking(true);
-					this.Meadow.doRead(tmpValidationQuery,
-						(pReadError) =>
-						{
-							if (pReadError)
-							{
-								let tmpErrorStr = (typeof(pReadError) === 'string') ? pReadError : JSON.stringify(pReadError);
-								// Only skip sync for schema-specific errors (invalid column/object name)
-								// Generic provider errors (e.g. prepared statement failures) should not block sync
-								if (tmpErrorStr.indexOf('Invalid column') > -1 || tmpErrorStr.indexOf('Invalid object') > -1 || tmpErrorStr.indexOf('no such column') > -1 || tmpErrorStr.indexOf('no such table') > -1)
-								{
-									this.log.warn(`${this.EntitySchema.TableName}: local table schema validation failed (${pReadError}); this entity will be skipped during sync.`);
-									this.skipSync = true;
-								}
-								else
-								{
-									this.log.warn(`${this.EntitySchema.TableName}: validation read returned error (${pReadError}); sync will proceed.`);
-								}
-							}
-							return fCallback(pPriorError);
-						});
-				};
+
 				const tmpGUIDColumn = this.EntitySchema.Columns.find((c) => c.DataType == 'GUID');
 				const tmpDeletedColumn = this.EntitySchema.Columns.find((c) => c.Column == 'Deleted');
 
 				if (!tmpGUIDColumn && !tmpDeletedColumn)
 				{
 					this.log.info(`No GUID or Deleted columns for ${this.EntitySchema.TableName}; skipping index creation`);
-					return fValidateAndCallback(pCreateError);
+					return fCallback(pCreateError);
 				}
 
 				if (!this.fable.MeadowConnectionManager || !this.fable.MeadowConnectionManager.ConnectionPool)
 				{
 					this.log.info(`No connection manager available; skipping index creation for ${this.EntitySchema.TableName}`);
-					return fValidateAndCallback(pCreateError);
+					return fCallback(pCreateError);
 				}
 
 				let tmpAnticipate = this.fable.newAnticipate();
@@ -121,7 +95,7 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 							return this.fable.MeadowConnectionManager.createIndex(this.EntitySchema, tmpDeletedColumn, false, fNext);
 						});
 				}
-				tmpAnticipate.wait((pIndexError) => { return fValidateAndCallback(pCreateError); });
+				tmpAnticipate.wait((pIndexError) => { return fCallback(pCreateError); });
 			});
 		}
 		return fCallback();
@@ -455,6 +429,29 @@ class MeadowSyncEntityOngoing extends libFableServiceProviderBase
 			return fCallback();
 		}
 
+		// Validate local table schema with a lightweight read before syncing
+		const tmpValidationQuery = this.Meadow.query;
+		tmpValidationQuery.setSort({ Column: this.DefaultIdentifier, Direction: 'Descending' });
+		tmpValidationQuery.setCap(1);
+		tmpValidationQuery.setDisableDeleteTracking(true);
+		this.Meadow.doRead(tmpValidationQuery,
+			(pReadError) =>
+			{
+				if (pReadError)
+				{
+					let tmpErrorStr = (typeof(pReadError) === 'string') ? pReadError : JSON.stringify(pReadError);
+					if (tmpErrorStr.indexOf('Invalid column') > -1 || tmpErrorStr.indexOf('Invalid object') > -1 || tmpErrorStr.indexOf('no such column') > -1 || tmpErrorStr.indexOf('no such table') > -1)
+					{
+						this.log.warn(`${this.EntitySchema.TableName}: local table schema mismatch (${pReadError}); skipping sync.`);
+						return fCallback();
+					}
+				}
+				return this._syncInternal(fCallback);
+			});
+	}
+
+	_syncInternal(fCallback)
+	{
 		this.operation.createTimeStamp('EntityOngoingSync');
 
 		let tmpAnticipate = this.fable.newAnticipate();

package/source/services/clone/Meadow-Service-Sync.js

@@ -87,7 +87,7 @@ class MeadowSync extends libFableServiceProviderBase
 		let tmpErrorCount = 0;
 		let tmpSuccessCount = 0;
 
-		this.fable.Utility.eachLimit(this.MeadowSchemaTableList, 1,
+		this.fable.Utility.eachLimit(this.MeadowSchemaTableList, 5,
 			(pEntitySchemaName, fSyncInitializationComplete) =>
 			{
 				tmpEntityIndex++;