replace all constrainName with constraintName

Co-authored-by: Michael Costello <[email protected]>
Co-authored-by: Steven Geiger <[email protected]>
Co-authored-by: Yufa Li <[email protected]>
Co-authored-by: Alexander Tu <[email protected]>

Author: 5 people

server/controllers/mysqlData.controller.js

@@ -83,7 +83,7 @@ export const objSchema = (req, res, next) => {
     this.ReferencesPropertyName = null; //key name at current table
     this.ReferencesTableName = null; //current table name
     this.IsDestination = false;
-    this.constrainName = null; //constraint from SQL query
+    this.constraintName = null; //constraint from SQL query
   }
 
   //append tables and table properties to results
@@ -132,7 +132,7 @@ export const objSchema = (req, res, next) => {
         foreignKeyReferences[fKey].ReferencesTableName = table.name;
         foreignKeyReferences[fKey].PrimaryKeyName = primaryKey;
         foreignKeyReferences[fKey].PrimaryKeyTableName = primaryTable;
-        foreignKeyReferences[fKey].constrainName = constraint;
+        foreignKeyReferences[fKey].constraintName = constraint;
 
         //find additional foreign keys and references
         return foreignKeys(string);

src/components/ReactFlow/Flow.tsx

@@ -21,6 +21,10 @@ export default function Flow() {
   // re-render every time schemaStore updates
   // useSchemaStore.subscribe((state) => state.schemaStore, reRender);
 
+  useEffect(() => {
+    reRender(schemaStore);
+  }, [schemaStore]);
+
   function reRender(schemaStore: SchemaStore) {
     console.log('rerendering reactflow-------------------------------------------------');
     if (!schemaStore || !Object.keys(schemaStore).length) return;
@@ -35,9 +39,9 @@ export default function Flow() {
     console.log('nodes set');
   }
 
-  useEffect(() => {
-    reRender(schemaStore);
-  }, [schemaStore]);
+  // useEffect(() => {
+  //   reRender(schemaStore);
+  // }, [schemaStore]);
 
   // renders React Flow canvas
   return (

src/components/ReactFlow/TableNode.jsx

@@ -7,8 +7,6 @@ import useSettingsStore from '../../store/settingsStore';
 
 export default function TableNode({ data }) {
   const tableName = data.table[0];
-  console.log('tableName', tableName)
-
   // columnData is an array of objects with each column in the table as an element
   const columnData = Object.values(data.table[1]);
   const [tableColumns, setTableColumns] = useState(columnData);
@@ -19,13 +17,10 @@ export default function TableNode({ data }) {
   const tableHandles = [];
   for (let i = 0; i < data.edges.length; i++) {
     if (data.edges[i].source === tableName) {
-      console.log('Source.tableName', data.edges[i].source)
       //make handle placement dynamic, we need to know the column of our source
       let columnNumberSource =
         columnData.findIndex((obj) => obj.Name === data.edges[i].sourceHandle) + 1;
       if (columnNumberSource === 0) columnNumberSource = 1;
-      // console.log('columnNumberSource', columnNumberSource);
-      // console.log('data.edges[i].sourceHandle', data.edges[i].sourceHandle);
       tableHandles.push(
         <Handle
           key={`${data.edges[i]}-source-${[i]}`}
@@ -41,13 +36,10 @@ export default function TableNode({ data }) {
       );
     }
     if (data.edges[i].target === tableName) {
-      console.log('target.tableName', data.edges[i].target)
       //make handle placement dynamic, we need to know the column of our target
       let columnNumberTarget =
         columnData.findIndex((obj) => obj.Name === data.edges[i].targetHandle) + 1;
       if (columnNumberTarget === 0) columnNumberTarget = 1;
-      // console.log('columnNumberTarget', columnNumberTarget);
-      // console.log('data.edges[i].targetHandle', data.edges[i].targetHandle);
       tableHandles.push(
         <Handle
           key={`${data.edges[i]}-target-${[i]}`}

src/components/ReactFlow/createEdges.ts

@@ -25,9 +25,6 @@ export default function createEdges(schemaObject: SchemaStore) {
     const table = schemaObject[tableKey];
     for (const rowKey in table) {
       const row = table[rowKey];
-      if (row.IsForeignKey) {
-        console.log('row', row)
-      };
       if (row.IsForeignKey) {
         edges.push({
           id: `${row.References[0].ReferencesTableName}-to-${row.References[0].PrimaryKeyTableName}`,

src/components/ReactFlow/reactFlowTypes.tsx

@@ -23,7 +23,7 @@ export interface StoreProps {
           PrimaryKeyTableName: string;
           ReferencesTableName: string;
           IsDestination: boolean;
-          constrainName: string;
+          constraintName: string;
         }
 ,
       IsPrimaryKey: boolean;

src/parse.js

@@ -194,7 +194,7 @@ function parseSQLServerForeignKey(name, currentTableModel, propertyType) {
   currentTableModel.Properties.push(propertyModel);
 }
 
-function parseMySQLForeignKey(name, currentTableModel, constrainName = null) {
+function parseMySQLForeignKey(name, currentTableModel, constraintName = null) {
   name = name.replace(/\"/g, '');
 
   let foreignKeyName = name
@@ -255,7 +255,7 @@ function parseMySQLForeignKey(name, currentTableModel, constrainName = null) {
     false
   );
 
-  foreignKeyDestinationModel.constrainName = constrainName;
+  foreignKeyDestinationModel.constraintName = constraintName;
   // Add ForeignKey Destination
   foreignKeyList.push(foreignKeyDestinationModel);
 }
@@ -298,7 +298,7 @@ function processForeignKey() {
               PrimaryKeyTableName: foreignKeyModel.PrimaryKeyTableName,
               ReferencesTableName: foreignKeyModel.ReferencesTableName,
               IsDestination: true,
-              constrainName: foreignKeyModel.constrainName,
+              constraintName: foreignKeyModel.constraintName,
             });
           }
         });
@@ -344,7 +344,7 @@ function parseTableName(name) {
 
 function parseAlterTable(tableName, constraint) {
   const regexConstraint = /(?<=CONSTRAINT\s)([a-zA-Z_]+)/;
-  const constrainName = constraint.match(regexConstraint);
+  const constraintName = constraint.match(regexConstraint);
 
   tableName = tableName.trim();
   let currentTableModel;
@@ -362,7 +362,7 @@ function parseAlterTable(tableName, constraint) {
     parseMySQLForeignKey(
       name,
       currentTableModel,
-      constrainName !== null ? constrainName[0] : null
+      constraintName !== null ? constraintName[0] : null
     );
   } else if (constraint.indexOf('PRIMARY KEY') !== -1) {
     const name = constraint.substring(

src/queryGen.ts

@@ -12,7 +12,7 @@
 //                PrimaryKeyTableName: string,
 //                ReferencesTableName: string,
 //                IsDestination: boolean,
-//                constrainName: string
+//                constraintName: string
 //              }
 //            ],
 //            IsPrimaryKey: boolean,
@@ -56,7 +56,7 @@ export default function queryGen(schemaObj: SchemaObject) {
       // if constraint pertains to a foreign key reference, build alterTableQ
       // access stuff on Reference to tell us what's up
       const ref = References[0]
-      // `ALTER TABLE ${TableName} ADD CONSTRAINT fk${References{constrainName}} FOREIGN KEY (${field_name}) REFERENCES ${References{ReferencesTableName}}(${References{ReferencesPropertyName}})`
+      // `ALTER TABLE ${TableName} ADD CONSTRAINT fk${References{constraintName}} FOREIGN KEY (${field_name}) REFERENCES ${References{ReferencesTableName}}(${References{ReferencesPropertyName}})`
       if (IsForeignKey === true){
         const alterTableString: string = `ALTER TABLE ${TableName} ADD CONSTRAINT ${ref['constraintName']} FOREIGN KEY (${field_name}) REFERENCES ${ref['ReferencesTableName']}(${ref['ReferencesPropertyName']}) ON UPDATE SET NULL ON DELETE SET NULL `
         alterTableQs.push(alterTableString);

src/store/displayStore.ts

@@ -37,7 +37,7 @@ export default useDisplayStore;
 //                PrimaryKeyTableName: string,
 //                ReferencesTableName: string,
 //                IsDestination: boolean,
-//                constrainName: string
+//                constraintName: string
 //              }
 //            ],
 //            IsPrimaryKey: boolean,

tests/components/queryExport.spec.tsx

@@ -11,7 +11,7 @@ interface Reference {
   PrimaryKeyTableName: string;
   ReferencesTableName: string;
   IsDestination: boolean;
-  constrainName: string;
+  constraintName: string;
 }
 
 interface Column {
@@ -47,7 +47,7 @@ const schema: SchemaObject = {
           PrimaryKeyTableName: '',
           ReferencesTableName: '',
           IsDestination: false,
-          constrainName: '',
+          constraintName: '',
         },
       ],
       IsPrimaryKey: false,
@@ -127,7 +127,7 @@ describe('Query Exports', () => {
             PrimaryKeyTableName,
             ReferencesTableName,
             IsDestination,
-            constrainName,
+            constraintName,
           } = References;
           expect(columnQuery).toBeInTheDocument;
         }

tests/queryGen.spec.ts

@@ -5,7 +5,7 @@ interface Reference {
   PrimaryKeyTableName: string,
   ReferencesTableName: string,
   IsDestination: boolean,
-  constrainName: string
+  constraintName: string
 }
 
 interface Column {
@@ -40,7 +40,7 @@ const schema: SchemaObject = {
         PrimaryKeyTableName: "",
         ReferencesTableName: "",
         IsDestination: false,
-        constrainName: ""
+        constraintName: ""
       }],
       IsPrimaryKey: 'true',
       IsForeignKey: 'false',
@@ -58,7 +58,7 @@ const schema: SchemaObject = {
         PrimaryKeyTableName: "",
         ReferencesTableName: "",
         IsDestination: false,
-        constrainName: ""
+        constraintName: ""
       }],
       IsPrimaryKey: 'false',
       IsForeignKey: 'true',