try addFieldIfNotExists 4th

Author: dplewis

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -810,8 +810,8 @@ export class PostgresStorageAdapter implements StorageAdapter {
     this._client = client;
     this._onchange = () => {};
     this._pgp = pgp;
+    this._uuid = uuidv4();
     this.canSortOnJoinTables = false;
-    this.uuid = uuidv4();
   }
 
   watch(callback: () => void): void {
@@ -843,7 +843,7 @@ export class PostgresStorageAdapter implements StorageAdapter {
       this._stream = await this._client.connect({ direct: true });
       this._stream.client.on('notification', data => {
         const payload = JSON.parse(data.payload);
-        if (payload.senderId !== this.uuid) {
+        if (payload.senderId !== this._uuid) {
           this._onchange();
         }
       });
@@ -854,7 +854,7 @@ export class PostgresStorageAdapter implements StorageAdapter {
   _notifySchemaChange() {
     if (this._stream) {
       this._stream
-        .none('NOTIFY $1~, $2', ['schema.change', { senderId: this.uuid }])
+        .none('NOTIFY $1~, $2', ['schema.change', { senderId: this._uuid }])
         .catch(error => {
           console.log('Failed to Notify:', error); // unlikely to ever happen
         });

src/Controllers/SchemaController.js

@@ -1245,15 +1245,15 @@ export default class SchemaController {
     }
     const results = await Promise.all(promises);
     const enforceFields = results.filter(result => !!result);
-    this.ensureFields(enforceFields);
 
-    if (enforceFields.length !== 0) {
+    if (enforceFields.length !== 0 && !volatileClasses.includes(className)) {
       const cached = SchemaCache.get(className);
       enforceFields.forEach(({ fieldName, type }) => {
         cached.fields[fieldName] = type;
       });
       await this.reloadData();
     }
+    this.ensureFields(enforceFields);
 
     const promise = Promise.resolve(schema);
     return thenValidateRequiredColumns(promise, className, object, query);