Merge pull request #1184 from appwrite/fix-push-attributes

fix push columns in tablesdb cli

Author: loks0n

example.php

@@ -39,7 +39,7 @@ function getSSLPage($url) {
 
     // Leave the platform you want uncommented
     // $platform = 'client';
-    $platform = 'server';
+    $platform = 'console';
     // $platform = 'server';
 
     $version = '1.8.x';

templates/cli/lib/commands/generic.js.twig

@@ -6,8 +6,8 @@ const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } = require("../parser");
 const ID = require("../id");
 {% if sdk.test != "true" %}
-const { questionsLogin, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
-const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
+const { questionsLogin, questionsLogout, questionsListFactors, questionsMFAChallenge } = require("../questions");
+const { accountUpdateMFAChallenge, accountCreateMFAChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
 const DEFAULT_ENDPOINT = '{{ spec.endpoint }}';
 
@@ -72,15 +72,15 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
         if (error.response === 'user_more_factors_required') {
             const { factor } = mfa ? { factor: mfa } : await inquirer.prompt(questionsListFactors);
 
-            const challenge = await accountCreateMfaChallenge({
+            const challenge = await accountCreateMFAChallenge({
                 factor,
                 parseOutput: false,
                 sdk: client
             });
 
-            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMfaChallenge);
+            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMFAChallenge);
 
-            await accountUpdateMfaChallenge({
+            await accountUpdateMFAChallenge({
                 challengeId: challenge.$id,
                 otp,
                 parseOutput: false,

templates/cli/lib/commands/push.js.twig

@@ -918,6 +918,25 @@ const createAttributes = async (attributes, collection) => {
 
     success(`Created ${attributes.length} attributes`);
 }
+const createColumns = async (columns, table) => {
+    for (let column of columns) {
+        if (column.side !== 'child') {
+            await createAttribute(table['databaseId'], table['$id'], column);
+        }
+    }
+
+    const result = await awaitPools.expectAttributes(
+        table['databaseId'],
+        table['$id'],
+        table.columns.filter(column => column.side !== 'child').map(column => column.key)
+    );
+
+    if (!result) {
+        throw new Error(`Column creation timed out.`);
+    }
+
+    success(`Created ${columns.length} columns`);
+}
 
 const pushResources = async () => {
     const actions = {
@@ -1797,13 +1816,12 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             if ((Array.isArray(columns) && columns.length <= 0) && (Array.isArray(indexes) && indexes.length <= 0)) {
                 continue;
             }
-
         }
 
         log(`Pushing table ${table.name} ( ${table['databaseId']} - ${table['$id']} ) attributes`)
 
         try {
-            await createAttributes(columns, table)
+            await createColumns(columns, table)
         } catch (e) {
             throw e;
         }

templates/cli/lib/questions.js.twig

@@ -5,7 +5,7 @@ const { projectsList } = require('./commands/projects');
 const { organizationsList } = require('./commands/organizations');
 const { teamsList } = require('./commands/teams');
 const { functionsListRuntimes, functionsListSpecifications, functionsList } = require('./commands/functions');
-const { accountListMfaFactors } = require("./commands/account");
+const { accountListMFAFactors } = require("./commands/account");
 const { sdkForConsole } = require("./sdks");
 const { validateRequired } = require("./validations");
 const { paginate } = require('./paginate');
@@ -877,7 +877,7 @@ const questionsListFactors = [
         message: "Your account is protected by multi-factor authentication. Please choose one for verification.",
         choices: async () => {
             let client = await sdkForConsole(false);
-            const factors = await accountListMfaFactors({
+            const factors = await accountListMFAFactors({
                 sdk: client,
                 parseOutput: false
             });
@@ -906,7 +906,7 @@ const questionsListFactors = [
     }
 ];
 
-const questionsMfaChallenge = [
+const questionsMFAChallenge = [
     {
         type: "input",
         name: "otp",
@@ -1019,7 +1019,7 @@ module.exports = {
     questionsPushTeams,
     questionsGetEntrypoint,
     questionsListFactors,
-    questionsMfaChallenge,
+    questionsMFAChallenge,
     questionsRunFunctions,
     questionGetEndpoint,
     questionsInitResources,