hasura · rikinsk-zz · May 25, 2019 · May 25, 2019 · May 25, 2019 · May 25, 2019
@@ -24,9 +24,9 @@ export const typeDefaults = {
   boolean: 'false',
 };
 export const queryTypes = ['insert', 'select', 'update', 'delete'];
-export const getColName = i => `apic_test_column_${i}`;
+export const getColName = i => `Apic_test_column_${i}`;
 export const getTableName = (i, testName = '') =>
-  `apic_test_table_${testName}_${i}`;
+  `Apic_test_table_${testName}_${i}`;
 export const getElementFromAlias = alias => `[data-test=${alias}]`;
 export const getElementFromClassName = cn => `.${cn}`;
 export const tableColumnTypeSelector = alias => {

@@ -1,9 +1,9 @@
 export const baseUrl = Cypress.config('baseUrl');
 export const queryTypes = ['insert', 'update', 'delete'];
 export const getTriggerName = (i, testName = '') =>
-  `apic_test_trigger_${testName}_${i}`;
+  `Apic_test_trigger_${testName}_${i}`;
 export const getTableName = (i, testName = '') =>
-  `apic_test_table_${testName}_${i}`;
+  `Apic_test_table_${testName}_${i}`;
 export const getWebhookURL = () => 'http://httpbin.org/post';
 export const getNoOfRetries = () => '5';
 export const getIntervalSeconds = () => '10';

@@ -133,7 +133,7 @@ export const createView = (viewName, tableName) => {
   const reqBody = {
     type: 'run_sql',
     args: {
-      sql: `create view ${viewName} as select * from ${tableName}`,
+      sql: `create view "${viewName}" as select * from "${tableName}"`,
     },
   };
   cy.window().then(win => {

@@ -20,55 +20,55 @@ export const openRawSQL = () => {
 };
 
 export const passCreateTable = () => {
-  prevStr = 'CREATE TABLE apic_test_table_rsql (id serial PRIMARY KEY);';
+  prevStr = 'CREATE TABLE Apic_test_table_rsql (id serial PRIMARY KEY);';
   cy.get('textarea').type(prevStr, { force: true });
   cy.get(getElementFromAlias('run-sql')).click();
   cy.wait(5000);
-  // validateCT('apic_test_table_rsql', 'success');
+  // validateCT('Apic_test_table_rsql', 'success');
 };
 
 export const passInsertValues = () => {
   for (let i = 0; i < prevStr.length; i++) {
     cy.get('textarea').type('{backspace}', { force: true });
   }
-  prevStr = 'INSERT INTO apic_test_table_rsql VALUES (1);';
+  prevStr = 'INSERT INTO Apic_test_table_rsql VALUES (1);';
   cy.get('textarea').type(prevStr, { force: true });
   cy.get(getElementFromAlias('run-sql')).click();
   cy.wait(5000);
-  // validateCT('apic_test_table_rsql', 'success');
+  // validateCT('Apic_test_table_rsql', 'success');
 };
 
 export const passAlterTable = () => {
   for (let i = 0; i < prevStr.length; i++) {
     cy.get('textarea').type('{backspace}', { force: true });
   }
-  prevStr = 'ALTER TABLE apic_test_table_rsql ADD COLUMN name text;';
+  prevStr = 'ALTER TABLE Apic_test_table_rsql ADD COLUMN name text;';
   cy.get('textarea').type(prevStr, { force: true });
   // Untrack table
   cy.get(getElementFromAlias('raw-sql-track-check')).uncheck();
   cy.get(getElementFromAlias('run-sql')).click();
   cy.wait(5000);
-  // validateCT('apic_test_table_rsql', 'success');
+  // validateCT('Apic_test_table_rsql', 'success');
 };
 
 export const passCreateView = () => {
   for (let i = 0; i < prevStr.length; i++) {
     cy.get('textarea').type('{backspace}', { force: true });
   }
-  prevStr = 'CREATE VIEW abcd AS SELECT * FROM apic_test_table_rsql;';
+  prevStr = 'CREATE VIEW abcd AS SELECT * FROM Apic_test_table_rsql;';
   cy.get('textarea').type(prevStr, { force: true });
   // Track table
   cy.get(getElementFromAlias('raw-sql-track-check')).check();
   cy.get(getElementFromAlias('run-sql')).click();
   cy.wait(5000);
-  // validateCT('apic_test_table_rsql', 'success');
+  // validateCT('Apic_test_table_rsql', 'success');
 };
 
 export const delTestTables = () => {
   for (let i = 0; i < prevStr.length; i++) {
     cy.get('textarea').type('{backspace}', { force: true });
   }
-  prevStr = 'DROP TABLE apic_test_table_rsql CASCADE;';
+  prevStr = 'DROP TABLE Apic_test_table_rsql CASCADE;';
   cy.get('textarea').type(prevStr, { force: true });
   cy.get(getElementFromAlias('raw-sql-migration-check')).uncheck();
   cy.get(getElementFromAlias('run-sql')).click();
@@ -82,9 +82,9 @@ export const delTestTables = () => {
   cy.get(getElementFromAlias('run-sql')).click();
   cy.wait(5000);
   // cy.visit(`${baseUrl}/data/schema/public`);
-  // cy.get(getElementFromAlias('add-track-table-apic_test_table_rsql')).click();
+  // cy.get(getElementFromAlias('add-track-table-Apic_test_table_rsql')).click();
   // cy.get(getElementFromAlias('delete-table')).click();
   // cy.on('window:confirm', () => true);
   // cy.wait(5000);
-  // validateCT('apic_test_table_rsql', 'failure');
+  // validateCT('Apic_test_table_rsql', 'failure');
 };
@@ -379,7 +379,7 @@ export const validateCTrigger = (triggerName, result) => {
           parseInt(getTimeoutSeconds(), 10)
       ).to.be.true;
       expect(trigger.schema_name === 'public').to.be.true;
-      expect(trigger.table_name === 'apic_test_table_ctr_0').to.be.true;
+      expect(trigger.table_name === 'Apic_test_table_ctr_0').to.be.true;
     } else {
       expect(response.body.length === 0).to.be.true;
     }

@@ -37,7 +37,7 @@ const ColumnEditor = ({
 
   useEffect(() => {
     if (columnComment) {
-      dispatch(editColumn(colName, 'comment', columnComment[0] || ''));
+      dispatch(editColumn(colName, 'comment', columnComment || ''));
     }
   }, [columnComment]);
 

@@ -239,7 +239,7 @@ FROM
       ist.table_name, 
       obj_description(
         (
-          ist.table_schema || '.' || ist.table_name
+          quote_ident(ist.table_schema) || '.' || quote_ident(ist.table_name)
         ):: regclass, 
         'pg_class'
       ) as comment, 
@@ -261,11 +261,11 @@ FROM
                     SELECT 
                       (
                         (
-                          ist.table_schema || '.' || ist.table_name
+                          quote_ident(ist.table_schema) || '.' || quote_ident(ist.table_name)
                         ):: text
                       ):: regclass :: oid
                   ) 
-                  AND c.relname = isc.table_name
+                  AND c.relname = ist.table_name
               )
             )
           ),