fix conflicts

Author: dplewis

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -1096,43 +1096,26 @@ export class PostgresStorageAdapter implements StorageAdapter {
         }
       } else {
         await t.none(
-          'ALTER TABLE $<className:name> ADD COLUMN IF NOT EXISTS $<fieldName:name> $<postgresType:raw>',
-          {
-            className,
-            fieldName,
-            postgresType: parseTypeToPostgresType(type),
-          }
+          'CREATE TABLE IF NOT EXISTS $<joinTable:name> ("relatedId" varChar(120), "owningId" varChar(120), PRIMARY KEY("relatedId", "owningId") )',
+          { joinTable: `_Join:${fieldName}:${className}` }
         );
-      } catch (error) {
-        if (error.code === PostgresRelationDoesNotExistError) {
-          return self.createClass(className, { fields: { [fieldName]: type } }, t);
-        }
-        if (error.code !== PostgresDuplicateColumnError) {
-          throw error;
-        }
-        // Column already exists, created by other request. Carry on to see if it's the right type.
       }
-    } else {
-      await t.none(
-        'CREATE TABLE IF NOT EXISTS $<joinTable:name> ("relatedId" varChar(120), "owningId" varChar(120), PRIMARY KEY("relatedId", "owningId") )',
-        { joinTable: `_Join:${fieldName}:${className}` }
-      );
-    }
 
-    const result = await t.any(
-      'SELECT "schema" FROM "_SCHEMA" WHERE "className" = $<className> and ("schema"::json->\'fields\'->$<fieldName>) is not null',
-      { className, fieldName }
-    );
-
-    if (result[0]) {
-      throw 'Attempted to add a field that already exists';
-    } else {
-      const path = `{fields,${fieldName}}`;
-      await t.none(
-        'UPDATE "_SCHEMA" SET "schema"=jsonb_set("schema", $<path>, $<type>)  WHERE "className"=$<className>',
-        { path, type, className }
+      const result = await t.any(
+        'SELECT "schema" FROM "_SCHEMA" WHERE "className" = $<className> and ("schema"::json->\'fields\'->$<fieldName>) is not null',
+        { className, fieldName }
       );
-    }
+
+      if (result[0]) {
+        throw 'Attempted to add a field that already exists';
+      } else {
+        const path = `{fields,${fieldName}}`;
+        await t.none(
+          'UPDATE "_SCHEMA" SET "schema"=jsonb_set("schema", $<path>, $<type>)  WHERE "className"=$<className>',
+          { path, type, className }
+        );
+      }
+    });
     this._notifySchemaChange();
   }
 

src/Controllers/DatabaseController.js

@@ -484,7 +484,7 @@ class DatabaseController {
         return this.canAddField(schema, className, object, aclGroup, runOptions);
       })
       .then(() => {
-        return schema.validateObject(className, object, query, this._transactionalSession);
+        return schema.validateObject(className, object, query);
       });
   }
 

src/Controllers/SchemaController.js

@@ -807,9 +807,8 @@ export default class SchemaController {
           className,
         })
       );
-      // TODO: Remove by updating schema cache directly
-      await this.reloadData({ clearCache: true });
       const parseSchema = convertAdapterSchemaToParseSchema(adapterSchema);
+      SchemaCache.set(className, parseSchema);
       return parseSchema;
     } catch (error) {
       if (error && error.code === Parse.Error.DUPLICATE_VALUE) {
@@ -935,6 +934,7 @@ export default class SchemaController {
     return (
       // The schema update succeeded. Reload the schema
       this.addClassIfNotExists(className)
+        .then(() => this.reloadData())
         .catch(() => {
           // The schema update failed. This can be okay - it might
           // have failed because there's a race condition and a different
@@ -1060,12 +1060,7 @@ export default class SchemaController {
   // object if the provided className-fieldName-type tuple is valid.
   // The className must already be validated.
   // If 'freeze' is true, refuse to update the schema for this field.
-  enforceFieldExists(
-    className: string,
-    fieldName: string,
-    type: string | SchemaField,
-    transactionalSession: ?any
-  ) {
+  enforceFieldExists(className: string, fieldName: string, type: string | SchemaField) {
     if (fieldName.indexOf('.') > 0) {
       // subdocument key (x.y) => ok if x is of type 'object'
       fieldName = fieldName.split('.')[0];
@@ -1113,7 +1108,7 @@ export default class SchemaController {
     }
 
     return this._dbAdapter
-      .addFieldIfNotExists(className, fieldName, type, transactionalSession)
+      .addFieldIfNotExists(className, fieldName, type)
       .catch(error => {
         if (error.code == Parse.Error.INCORRECT_TYPE) {
           // Make sure that we throw errors when it is appropriate to do so.
@@ -1125,6 +1120,13 @@ export default class SchemaController {
         return Promise.resolve();
       })
       .then(() => {
+        const cached = SchemaCache.get(className);
+        if (cached) {
+          if (cached && !cached.fields[fieldName]) {
+            cached.fields[fieldName] = type;
+            SchemaCache.set(className, cached);
+          }
+        }
         return {
           className,
           fieldName,
@@ -1214,7 +1216,7 @@ export default class SchemaController {
   // Validates an object provided in REST format.
   // Returns a promise that resolves to the new schema if this object is
   // valid.
-  async validateObject(className: string, object: any, query: any, transactionalSession: ?any) {
+  async validateObject(className: string, object: any, query: any) {
     let geocount = 0;
     const schema = await this.enforceClassExists(className);
     const results = [];
@@ -1244,15 +1246,12 @@ export default class SchemaController {
         // Every object has ACL implicitly.
         continue;
       }
-      results.push(
-        await schema.enforceFieldExists(className, fieldName, expected, transactionalSession)
-      );
+      results.push(await schema.enforceFieldExists(className, fieldName, expected));
     }
     const enforceFields = results.filter(result => !!result);
 
     if (enforceFields.length !== 0) {
-      // TODO: Remove by updating schema cache directly
-      await this.reloadData({ clearCache: true });
+      await this.reloadData();
     }
     this.ensureFields(enforceFields);