@aws-amplify/datastore-storage-adapter 1.3.9-next.13 → 1.3.9-next.32

package/src/common/SQLiteUtils.ts

@@ -148,7 +148,7 @@ export function modelCreateTableStatement(
 	let fields = Object.values(model.fields).reduce((acc, field: ModelField) => {
 		if (isGraphQLScalarType(field.type)) {
 			if (field.name === 'id') {
-				return acc + '"id" PRIMARY KEY NOT NULL';
+				return [...acc, '"id" PRIMARY KEY NOT NULL'];
 			}
 
 			let columnParam = `"${field.name}" ${getSQLiteType(field.type)}`;
@@ -157,7 +157,7 @@ export function modelCreateTableStatement(
 				columnParam += ' NOT NULL';
 			}
 
-			return acc + `, ${columnParam}`;
+			return [...acc, `${columnParam}`];
 		}
 
 		if (isModelFieldType(field.type)) {
@@ -167,7 +167,7 @@ export function modelCreateTableStatement(
 			if (isTargetNameAssociation(field.association)) {
 				// check if this field has been explicitly defined in the model
 				const fkDefinedInModel = Object.values(model.fields).find(
-					(f: ModelField) => f.name === field.association.targetName
+					(f: ModelField) => f.name === field?.association?.targetName
 				);
 
 				// if the FK is not explicitly defined in the model, we have to add it here
@@ -179,7 +179,7 @@ export function modelCreateTableStatement(
 
 			// ignore isRequired param for model fields, since they will not contain
 			// the related data locally
-			return acc + `, ${columnParam}`;
+			return [...acc, `${columnParam}`];
 		}
 
 		// default to TEXT
@@ -189,19 +189,25 @@ export function modelCreateTableStatement(
 			columnParam += ' NOT NULL';
 		}
 
-		return acc + `, ${columnParam}`;
-	}, '');
+		return [...acc, `${columnParam}`];
+	}, [] as string[]);
 
 	implicitAuthFields.forEach((authField: string) => {
-		fields += `, ${authField} TEXT`;
+		fields.push(`${authField} TEXT`);
 	});
 
 	if (userModel) {
-		fields +=
-			', "_version" INTEGER, "_lastChangedAt" INTEGER, "_deleted" INTEGER';
+		fields = [
+			...fields,
+			`"_version" INTEGER`,
+			`"_lastChangedAt" INTEGER`,
+			`"_deleted" INTEGER`,
+		];
 	}
 
-	const createTableStatement = `CREATE TABLE IF NOT EXISTS "${model.name}" (${fields});`;
+	const createTableStatement = `CREATE TABLE IF NOT EXISTS "${
+		model.name
+	}" (${fields.join(', ')});`;
 	return createTableStatement;
 }
 

package/src/common/types.ts

@@ -1,4 +1,4 @@
-import { PersistentModel } from '@aws-amplify/datastore';
+import { PersistentModel, ModelInstanceMetadata } from '@aws-amplify/datastore';
 
 export interface CommonSQLiteDatabase {
 	init(): Promise<void>;
@@ -27,3 +27,8 @@ export interface CommonSQLiteDatabase {
 }
 
 export type ParameterizedStatement = [string, any[]];
+
+// TODO: remove once we implement CPK for this adapter
+export type ModelInstanceMetadataWithId = ModelInstanceMetadata & {
+	id: string;
+};

package/build.js

@@ -1,5 +0,0 @@
-'use strict';
-
-const build = require('../../scripts/build');
-
-build(process.argv[2], process.argv[3]);