validate schema changes before application.

powersync-ja · Jan 30, 2024 · eba6e87 · eba6e87
1 parent b8f7cf6
commit eba6e87
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/apps/supabase-todolist b/apps/supabase-todolist
diff --git a/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts b/packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts
@@ -158,6 +158,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
     await this.bucketStorageAdapter.init();
     const version = await this.options.database.execute('SELECT powersync_rs_version()');
     this.sdkVersion = version.rows?.item(0)['powersync_rs_version()'] ?? '';
+    await this.updateSchema(this.options.schema);
     this.ready = true;
     this.iterateListeners((cb) => cb.initialized?.());
   }

diff --git a/packages/powersync-sdk-common/src/db/schema/Schema.ts b/packages/powersync-sdk-common/src/db/schema/Schema.ts
@@ -10,6 +10,7 @@ export class Schema {
   }
 
   toJSON() {
+    this.validate();
     return {
       tables: this.tables.map((t) => t.toJSON())
     };

diff --git a/packages/powersync-sdk-common/src/db/schema/Table.ts b/packages/powersync-sdk-common/src/db/schema/Table.ts
@@ -90,15 +90,16 @@ export class Table {
 
     const columnNames = new Set<string>();
     columnNames.add('id');
-    for (const column in this.columns) {
-      if (column == 'id') {
+    for (const column of this.columns) {
+      const { name: columnName } = column;
+      if (column.name == 'id') {
         throw new Error(`${this.name}: id column is automatically added, custom id columns are not supported`);
-      } else if (columnNames.has(column)) {
-        throw new Error(`Duplicate column ${column}`);
-      } else if (InvalidSQLCharacters.test(column)) {
+      } else if (columnNames.has(columnName)) {
+        throw new Error(`Duplicate column ${columnName}`);
+      } else if (InvalidSQLCharacters.test(columnName)) {
         throw new Error(`Invalid characters in column name: $name.${column}`);
       }
-      columnNames.add(column);
+      columnNames.add(columnName);
     }
 
     const indexNames = new Set<string>();
@@ -112,7 +113,7 @@ export class Table {
 
       for (const column of index.columns) {
         if (!columnNames.has(column.name)) {
-          throw new Error(`Column $name.${column.name} not found for index ${index.name}`);
+          throw new Error(`Column ${column.name} not found for index ${index.name}`);
         }
       }
 

diff --git a/yarn.lock b/yarn.lock
@@ -2228,14 +2228,6 @@
     lodash "^4.17.21"
     uuid "3.4.0"
 
-"@journeyapps/react-native-quick-sqlite@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@journeyapps/react-native-quick-sqlite/-/react-native-quick-sqlite-1.1.0.tgz#cf4aa6694b7232d0f86e565fdba4e41ef15d80cc"
-  integrity sha512-Pg6VA6ABC7N5FrNB5eqTgNsKdzzmDSp5aBtnQh1BlcZu7ISPZdCcKo+ZJtKyzTAWpc17LIttvJwxez6zBxUdOw==
-  dependencies:
-    lodash "^4.17.21"
-    uuid "3.4.0"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
@@ -3611,7 +3603,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^8.0.0, ajv@^8.9.0:
+ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -5374,6 +5366,14 @@ expo-asset@~8.10.1:
     path-browserify "^1.0.0"
     url-parse "^1.5.9"
 
+expo-build-properties@~0.8.3:
+  version "0.8.3"
+  resolved "https://registry.npmjs.org/expo-build-properties/-/expo-build-properties-0.8.3.tgz#fbfa156e9619bebda71c66af9a26ebc3490b2365"
+  integrity sha512-kEDDuAadHqJTkvCGK4fXYHVrePiJO1DjyW95AicmwuGwQvGJydYFbuoauf9ybAU+4UH4arhbce8gHI3ZpIj3Jw==
+  dependencies:
+    ajv "^8.11.0"
+    semver "^7.5.3"
+
 expo-camera@~13.4.4:
   version "13.4.4"
   resolved "https://registry.npmjs.org/expo-camera/-/expo-camera-13.4.4.tgz#e01ead31a3150398d37e94c307f6937480680690"
+14 −3		app.json
+5 −5		ios/Podfile.lock
+2 −1		package.json
+36 −28		yarn.lock