hasura · rikinsk · Jan 10, 2020 · Jan 8, 2020 · Jan 8, 2020 · Jan 8, 2020
@@ -67,3 +67,10 @@ export const getCreatePkSql = ({
 export const getDropPkSql = ({ schemaName, tableName, constraintName }) => {
   return `alter table "${schemaName}"."${tableName}" drop constraint "${constraintName}";`;
 };
+
+export const terminateSql = sql => {
+  const sqlSanitised = sql.trim();
+  return sqlSanitised[sqlSanitised.length - 1] !== ';'
+    ? sqlSanitised + ';'
+    : sqlSanitised;
+};
@@ -1,8 +1,10 @@
+import { terminateSql } from './sqlUtils';
+
 export const getRunSqlQuery = (sql, shouldCascade, readOnly) => {
   return {
     type: 'run_sql',
     args: {
-      sql,
+      sql: terminateSql(sql),
       cascade: !!shouldCascade,
       read_only: !!readOnly,
     },
@@ -50,3 +52,29 @@ export const getSetCustomRootFieldsQuery = (
     },
   };
 };
+
+export const getSetTableEnumQuery = (tableDef, isEnum) => {
+  return {
+    type: 'set_table_is_enum',
+    args: {
+      table: tableDef,
+      is_enum: isEnum,
+    },
+  };
+};
+
+export const getTrackTableQuery = tableDef => {
+  return {
+    type: 'add_existing_table_or_view',
+    args: tableDef,
+  };
+};
+
+export const getUntrackTableQuery = tableDef => {
+  return {
+    type: 'untrack_table',
+    args: {
+      table: tableDef,
+    },
+  };
+};
@@ -11,6 +11,7 @@ import { setTable } from '../DataActions.js';
 
 import { isPostgresFunction } from '../utils';
 import { sqlEscapeText } from '../../../Common/utils/sqlUtils';
+import { getRunSqlQuery } from '../../../Common/utils/v1QueryUtils';
 import { getTableModifyRoute } from '../../../Common/utils/routesUtils';
 
 const SET_DEFAULTS = 'AddTable/SET_DEFAULTS';
@@ -315,16 +316,10 @@ const createTableSql = () => {
     if (hasUUIDDefault) {
       const sqlCreateExtension = 'CREATE EXTENSION IF NOT EXISTS pgcrypto;';
 
-      upQueryArgs.push({
-        type: 'run_sql',
-        args: { sql: sqlCreateExtension },
-      });
+      upQueryArgs.push(getRunSqlQuery(sqlCreateExtension));
     }
 
-    upQueryArgs.push({
-      type: 'run_sql',
-      args: { sql: sqlCreateTable },
-    });
+    upQueryArgs.push(getRunSqlQuery(sqlCreateTable));
 
     upQueryArgs.push({
       type: 'add_existing_table_or_view',
@@ -345,12 +340,7 @@ const createTableSql = () => {
 
     const downQuery = {
       type: 'bulk',
-      args: [
-        {
-          type: 'run_sql',
-          args: { sql: sqlDropTable },
-        },
-      ],
+      args: [getRunSqlQuery(sqlDropTable)],
     };
 
     // make request

@@ -1,6 +1,7 @@
 import sanitize from 'sanitize-filename';
 
 import { getSchemaBaseRoute } from '../../Common/utils/routesUtils';
+import { getRunSqlQuery } from '../../Common/utils/v1QueryUtils';
 import Endpoints, { globalCookiePolicy } from '../../../Endpoints';
 import requestAction from '../../../utils/requestAction';
 import defaultState from './DataState';
@@ -547,28 +548,17 @@ const makeMigrationCall = (
 };
 
 const getBulkColumnInfoFetchQuery = schema => {
-  const fetchColumnTypes = {
-    type: 'run_sql',
-    args: {
-      sql: fetchColumnTypesQuery,
-      read_only: true,
-    },
-  };
-  const fetchTypeDefaultValues = {
-    type: 'run_sql',
-    args: {
-      sql: fetchColumnDefaultFunctions(schema),
-      read_only: true,
-    },
-  };
-
-  const fetchValidTypeCasts = {
-    type: 'run_sql',
-    args: {
-      sql: fetchColumnCastsQuery,
-      read_only: true,
-    },
-  };
+  const fetchColumnTypes = getRunSqlQuery(fetchColumnTypesQuery, false, true);
+  const fetchTypeDefaultValues = getRunSqlQuery(
+    fetchColumnDefaultFunctions(schema),
+    false,
+    true
+  );
+  const fetchValidTypeCasts = getRunSqlQuery(
+    fetchColumnCastsQuery,
+    false,
+    true
+  );
 
   return {
     type: 'bulk',

@@ -20,6 +20,7 @@ import { fetchTrackedFunctions } from '../DataActions';
 
 import _push from '../push';
 import { getSchemaBaseRoute } from '../../../Common/utils/routesUtils';
+import { getRunSqlQuery } from '../../../Common/utils/v1QueryUtils';
 
 /* Constants */
 
@@ -193,19 +194,11 @@ const deleteFunctionSql = () => {
     const sqlDropFunction =
       'DROP FUNCTION ' + functionNameWithSchema + functionArgString;
 
-    const sqlUpQueries = [
-      {
-        type: 'run_sql',
-        args: { sql: sqlDropFunction },
-      },
-    ];
+    const sqlUpQueries = [getRunSqlQuery(sqlDropFunction)];
 
     const sqlDownQueries = [];
     if (functionDefinition && functionDefinition.length > 0) {
-      sqlDownQueries.push({
-        type: 'run_sql',
-        args: { sql: functionDefinition },
-      });
+      sqlDownQueries.push(getRunSqlQuery(functionDefinition));
     }
 
     // Apply migrations

@@ -16,6 +16,7 @@ import {
 import { parseCreateSQL } from './utils';
 import dataHeaders from '../Common/Headers';
 import returnMigrateUrl from '../Common/getMigrateUrl';
+import { getRunSqlQuery } from '../../../Common/utils/v1QueryUtils';
 
 const MAKING_REQUEST = 'RawSQL/MAKING_REQUEST';
 const SET_SQL = 'RawSQL/SET_SQL';
@@ -43,16 +44,7 @@ const executeSQL = (isMigration, migrationName) => (dispatch, getState) => {
   const isCascadeChecked = getState().rawSQL.isCascadeChecked;
 
   let url = Endpoints.rawSQL;
-  const schemaChangesUp = [
-    {
-      type: 'run_sql',
-      args: {
-        sql: sql,
-        cascade: isCascadeChecked,
-        read_only: readOnlyMode,
-      },
-    },
-  ];
+  const schemaChangesUp = [getRunSqlQuery(sql, isCascadeChecked, readOnlyMode)];
   // check if track view enabled
 
   if (getState().rawSQL.isTableTrackChecked) {

@@ -2,6 +2,7 @@ import gqlPattern, { gqlSchemaErrorNotif } from '../Common/GraphQLValidation';
 import { showErrorNotification } from '../../Common/Notification';
 import { makeMigrationCall, fetchSchemaList } from '../DataActions';
 import { getConfirmation } from '../../../Common/utils/jsUtils';
+import { getRunSqlQuery } from '../../../Common/utils/v1QueryUtils';
 
 const getDropSchemaSql = schemaName => `drop schema "${schemaName}" cascade;`;
 
@@ -19,23 +20,9 @@ export const createNewSchema = (schemaName, successCb, errorCb) => {
       );
     }
 
-    const migrationUp = [
-      {
-        type: 'run_sql',
-        args: {
-          sql: getCreateSchemaSql(schemaName),
-        },
-      },
-    ];
+    const migrationUp = [getRunSqlQuery(getCreateSchemaSql(schemaName))];
 
-    const migrationDown = [
-      {
-        type: 'run_sql',
-        args: {
-          sql: getDropSchemaSql(schemaName),
-        },
-      },
-    ];
+    const migrationDown = [getRunSqlQuery(getDropSchemaSql(schemaName))];
 
     const migrationName = `create_schema_${schemaName}`;
     const requestMsg = 'Creating schema';
@@ -86,14 +73,7 @@ export const deleteCurrentSchema = (successCb, errorCb) => {
       return;
     }
 
-    const migrationUp = [
-      {
-        type: 'run_sql',
-        args: {
-          sql: getDropSchemaSql(currentSchema),
-        },
-      },
-    ];
+    const migrationUp = [getRunSqlQuery(getDropSchemaSql(currentSchema))];
     const migrationName = `drop_schema_${currentSchema}`;
     const requestMsg = 'Dropping schema';
     const successMsg = 'Successfully dropped schema';