Tables in any order with fk declarations postponed

vadim-tropashko · vadim-tropashko · commit 239d45440c99 · 2024-02-27T18:55:42.000-08:00
diff --git a/dist/quick-sql.js b/dist/quick-sql.js
diff --git a/dist/quick-sql.umd.cjs b/dist/quick-sql.umd.cjs
diff --git a/src/ddl.js b/src/ddl.js
@@ -36,7 +36,7 @@ export const quicksql = (function () {
         overridesettings: {label: 'Ignore toDDL() second parameter', value:'no',check:['yes','no']},    
         prefix: {label: 'Object Prefix', value:'' },
         //ondelete: {label: 'On Delete', value:'Cascade',check:['restrict','cascade','set null']},
-        pk: { label: 'Primary Key Maintenance', value: identityDataType, check: [identityDataType, guid,'SEQ', 'NONE']},
+        pk: { label: 'Primary Key Maintenance', value: guid, check: [identityDataType, guid,'SEQ', 'NONE']},
         prefixpkwithtname: {label:'Prefix primary keys with table name', value:'no',check:['yes','no']}, 
         rowkey: {label: 'Alphanumeric Row Identifier', value:'no',check:['yes','no']},
         rowversion: {label: 'Row Version Number', value:'no',check:['yes','no']},
@@ -74,6 +74,7 @@ export const quicksql = (function () {
         this.errors = null;
         this.options = JSON.parse(JSON.stringify(defaultOptions));
         this.input = fullInput;
+        this.postponedAlters = []; 
 
         this.getOptionValue = function( kEy ) {
             const key = kEy.toLowerCase(); 
@@ -369,6 +370,10 @@ export const quicksql = (function () {
                 output += this.forest[i].toDDL()+'\n';
             }
 
+            for ( let i = 0; i < this.postponedAlters.length; i++ ) {
+                output += this.postponedAlters[i]+'\n';
+            }
+
             let j = 0;
             for( let i = 0; i < descendants.length; i++ ) {
                 let trigger = descendants[i].generateTrigger();
diff --git a/src/json2qsql.js b/src/json2qsql.js
@@ -142,7 +142,7 @@ var json2qsql = (function () {
         let output = tc.output(name+signature(obj), obj, 0);
 
         //output += "\n\ndv "+name+"_dv "+name +"";
-        output += '\n\n#settings = { genpk: false, drop: true }';
+        output += '\n\n#settings = { genpk: false, drop: true, pk: identityDataType }';
 
         output += '\n\n#flattened = \n';
         const tableContent = {};
diff --git a/src/tree.js b/src/tree.js
@@ -741,27 +741,34 @@ let tree = (function(){
                     }
                 }
                 pad = tab+' '.repeat(this.maxChildNameLen() - fk.length);
-                ret += tab + fk + _id  + pad + type + '\n';  
-                ret += tab + tab+' '.repeat(this.maxChildNameLen()) + 'constraint '+objName+'_'+fk+'_fk\n';
-                let onDelete = '';
-                if( this.isOption('cascade')) 
-                    onDelete = ' on delete cascade';
-                else if( this.isOption('setnull')) 
-                    onDelete = ' on delete set null';
-                let	notNull = '';
-                for( let c in this.children ) {
-                    let child = this.children[c];
-                    if( fk == child.parseName() )  {
-                        if( child.isOption('nn') || child.isOption('notnull')  ) 
-                            notNull = ' NOT NULL'.toLowerCase();        
-                        if( child.isOption('cascade')  ) 
-                            onDelete = ' on delete cascade';  
-                        else if( this.isOption('setnull')) 
-                            onDelete = ' on delete set null';
-                        break;
+                ret += tab + fk + _id  + pad + type;  
+                if( refNode.line < this.line || refNode.isMany2One() ) {
+                    ret += tab + tab+' '.repeat(this.maxChildNameLen()) + 'constraint '+objName+'_'+fk+'_fk\n';
+                    let onDelete = '';
+                    if( this.isOption('cascade')) 
+                        onDelete = ' on delete cascade';
+                    else if( this.isOption('setnull')) 
+                        onDelete = ' on delete set null';
+                    let	notNull = '';
+                    for( let c in this.children ) {
+                        let child = this.children[c];
+                        if( fk == child.parseName() )  {
+                            if( child.isOption('nn') || child.isOption('notnull')  ) 
+                                notNull = ' NOT NULL'.toLowerCase();        
+                            if( child.isOption('cascade')  ) 
+                                onDelete = ' on delete cascade';  
+                            else if( this.isOption('setnull')) 
+                                onDelete = ' on delete set null';
+                            break;
+                        }
                     }
+                    ret += tab + tab+' '.repeat(this.maxChildNameLen()) + 'references '+ddl.objPrefix()+parent+onDelete+notNull+',\n';
+                } else {
+                    ret += ',\n';
+                    const alter = 'alter table '+objName+' add constraint '+objName+'_'+fk+'_fk foreign key ('+fk+') references '+ddl.objPrefix()+parent+';\n'
+                    if( !ddl.postponedAlters.includes(alter) )
+                        ddl.postponedAlters.push(alter);
                 }
-                ret += tab + tab+' '.repeat(this.maxChildNameLen()) + 'references '+ddl.objPrefix()+parent+onDelete+notNull+',\n';
             }
 
             if( ddl.optionEQvalue('rowkey',true) || this.isOption('rowkey') ) {
diff --git a/test/Bug35756025/2.sql b/test/Bug35756025/2.sql
@@ -1,5 +1,5 @@
 create table bug35756025 (
-    id                             number generated by default on null as identity 
+    id                             number default on null to_number(sys_guid(), 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX') 
                                    constraint bug35756025_id_pk primary key,
     deptno                         number,
     dname                          varchar2(14 char),
diff --git a/test/Bug35756025/3.sql b/test/Bug35756025/3.sql
@@ -1,5 +1,5 @@
 create table bug35756025 (
-    id                             number generated by default on null as identity 
+    id                             number default on null to_number(sys_guid(), 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX') 
                                    constraint bug35756025_id_pk primary key,
     deptno                         number not null,
     dname                          varchar2(14 char),
diff --git a/test/Bug35756025/4.qsql b/test/Bug35756025/4.qsql
@@ -1,4 +1,6 @@
 bug35756025
     deptno num /nn /pk
     dname vc14
-    loc   vc13
+    loc   vc13
+
+#pk: identityDataType    
diff --git a/test/JSON/car_racing/1.qsql b/test/JSON/car_racing/1.qsql
@@ -7,7 +7,7 @@ team  /insert 1
       name 
       points num
 
-#settings = { genpk: false, drop: true }
+#settings = { genpk: false, drop: true, pk: identityDataType  }
 
 #flattened = 
 {
diff --git a/test/JSON/car_racing/2.qsql b/test/JSON/car_racing/2.qsql
@@ -12,7 +12,7 @@ driver  /insert 2
          name 
       finalPosition num
 
-#settings = { genpk: false, drop: true }
+#settings = { genpk: false, drop: true, pk: identityDataType    }
 
 #flattened = 
 {
diff --git a/test/JSON/donuts.qsql b/test/JSON/donuts.qsql
@@ -12,7 +12,7 @@ donuts  /insert 3
          id vc32 /pk
          type 
 
-#settings = { genpk: false, drop: true }
+#settings = { genpk: false, drop: true, pk: identityDataType  }
 
 #flattened = 
 {
diff --git a/test/apex/department_employees.quicksql b/test/apex/department_employees.quicksql
@@ -11,4 +11,4 @@ departments /insert 2
 
 emp_v = departments employees
 
-# settings = { "prefix": null, "semantics": "CHAR", "DV": false }
+# settings = { "prefix": null, "semantics": "CHAR", "DV": false, pk: identityDataType    }
diff --git a/test/apex/departments_employees_skills.quicksql b/test/apex/departments_employees_skills.quicksql
@@ -12,5 +12,6 @@ departments /insert 2
           proficiency num /check 1, 2, 3, 4, 5 [with 1 being a novice and 5 being a guru]
           
 # "schema": null
-# "semantics": "char"     
+# "semantics": "char"    
+# pk: identityDataType    
 --# DV : no     
diff --git a/test/apex/empty_emp.quicksql b/test/apex/empty_emp.quicksql
@@ -1,4 +1,6 @@
 dept 
    name 
 
-emp   
+emp   
+
+#pk: identityDataType   
diff --git a/test/apex/forrestclinic.quicksql b/test/apex/forrestclinic.quicksql
@@ -38,4 +38,4 @@ doctor_procedures
     medical_procedure vc30
   
 # settings = { "prefix": "FRC", "ondelete": "RESTRICT", "semantics": "CHAR", 
-  "auditcols": true, "language": "EN", "APEX": true }
+  "auditcols": true, "language": "EN", "APEX": true, pk: identityDataType    }
diff --git a/test/apex/medipay.quicksql b/test/apex/medipay.quicksql
@@ -74,4 +74,4 @@ lead_meetings
   notes                          vc4000
   confirmed                      vc1 /default N
 
-# settings = { prefix: "MED", semantics: "CHAR", auditCols: true, rowVersion: true,  language: "EN", APEX: true }
+# settings = { prefix: "MED", semantics: "CHAR", auditCols: true, rowVersion: true,  language: "EN", APEX: true, pk: identityDataType    }
diff --git a/test/apex/project_management.quicksql b/test/apex/project_management.quicksql
@@ -1,4 +1,5 @@
 #apex: true, auditcols: true 
+#pk: identityDataType   
 projects /insert 5 
     name /nn 
     owner 
diff --git a/test/apex/timecard.quicksql b/test/apex/timecard.quicksql
@@ -19,4 +19,4 @@ employees /insert 50 /api
 
 view employee_timecards employees timecards
 
-# settings = { semantics: "CHAR", API: true, rowVersion: true, drop: true, language: "EN", APEX: true, dv: false }
+# settings = { semantics: "CHAR", API: true, rowVersion: true, drop: true, language: "EN", APEX: true, dv: false, pk: identityDataType    }
diff --git a/test/apex/to_dos.quicksql b/test/apex/to_dos.quicksql
@@ -1,4 +1,5 @@
 #apex: true, auditcols: true 
+#pk: identityDataType   
 assignees /insert 10
   full_name /nn
   email
diff --git a/test/bugs/35.qsql b/test/bugs/35.qsql
@@ -5,4 +5,5 @@ app_feature_items
    feature_master_id number /fk feature_masters
    name vc255 /nn
 
-#api:y
+#api:y
+#pk: identityDataType   
diff --git a/test/bugs/35923103.qsql b/test/bugs/35923103.qsql
@@ -1,4 +1,6 @@
 BOOKS  
     NAME
     AUTHOR
-    AVAILABLE /NN /default Y
+    AVAILABLE /NN /default Y
+
+#pk: identityDataType       
diff --git a/test/bugs/35950582.qsql b/test/bugs/35950582.qsql
@@ -2,4 +2,6 @@ team_members
    username
 projects /insert 2
    name
-   project_lead /nn /references team_members /cascade
+   project_lead /nn /references team_members /cascade
+
+#pk: identityDataType      
diff --git a/test/bugs/Bug35063257.quicksql b/test/bugs/Bug35063257.quicksql
@@ -18,4 +18,6 @@ order_lines
 
 line_fulfillments
     warehouse_id /fk warehouses
-    line_id /cascade /fk order_lines
+    line_id /cascade /fk order_lines
+
+#pk: identityDataType       
diff --git a/test/bugs/Bug35637603.quicksql b/test/bugs/Bug35637603.quicksql
@@ -4,4 +4,6 @@ dept  /unique name, email /insert 0
     state
     emp /unique name, email
         name
-        email 
+        email 
+
+#pk: identityDataType           
diff --git a/test/bugs/Bug35637611.quicksql b/test/bugs/Bug35637611.quicksql
@@ -5,4 +5,6 @@ departments /api
    employees /api
       name /nn vc50
       email /lower
-      cost center num
+      cost center num
+
+#pk: identityDataType         
diff --git a/test/bugs/Bug35637614.quicksql b/test/bugs/Bug35637614.quicksql
@@ -2,4 +2,6 @@ customers /colprefix cust
   name
   email
   phone1
-  phone2
+  phone2
+
+#pk: identityDataType     
diff --git a/test/bugs/Bug35637619.quicksql b/test/bugs/Bug35637619.quicksql
@@ -9,3 +9,5 @@ departments /insert 2
       cost center num
       date hired
       job vc255
+
+#pk: identityDataType   
diff --git a/test/bugs/Bug35637622.quicksql b/test/bugs/Bug35637622.quicksql
@@ -6,4 +6,6 @@ departments /rest
       name
       email
       job vc255
-      hiredate
+      hiredate
+
+#pk: identityDataType         
diff --git a/test/bugs/Bug35637632.quicksql b/test/bugs/Bug35637632.quicksql
@@ -6,4 +6,6 @@ departments /audit
       name
       email
       job vc255
-      hiredate
+      hiredate
+
+#pk: identityDataType         
diff --git a/test/bugs/Bug35649666.quicksql b/test/bugs/Bug35649666.quicksql
@@ -9,4 +9,5 @@ departments /insert 2
       date hired
       job vc255
 
-# settings = { semantics: "CHAR", language: "EN", prefixPKwithTname: true } 
+# settings = { semantics: "CHAR", language: "EN", prefixPKwithTname: true } 
+#pk: identityDataType   
diff --git a/test/bugs/Bug35650535.quicksql b/test/bugs/Bug35650535.quicksql
@@ -11,3 +11,4 @@ departments /insert 2
 view emp_v departments employees
 
 # settings = { semantics: "CHAR", DB: "23c", editionable: true, language: "EN", APEX: true }
+#pk: identityDataType   
diff --git a/test/bugs/Bug35659128.quicksql b/test/bugs/Bug35659128.quicksql
@@ -8,4 +8,5 @@ departments
       job vc255
       hiredate
 
-# settings = { semantics: "CHAR", auditCols: true, language: "EN", APEX: true, DB:"12c" }
+# settings = { semantics: "CHAR", auditCols: true, language: "EN", APEX: true, DB:"12c" }
+#pk: identityDataType   
diff --git a/test/bugs/Bug35665146.quicksql b/test/bugs/Bug35665146.quicksql
@@ -1,3 +1,5 @@
 dept
     name
-    created_on
+    created_on
+
+#pk: identityDataType       
diff --git a/test/bugs/Bug35669377.quicksql b/test/bugs/Bug35669377.quicksql
@@ -10,4 +10,6 @@ sales
    product_id
    customer_id
    promotion id
-   channel id
+   channel id
+
+#pk: identityDataType      
diff --git a/test/bugs/Bug35714343.quicksql b/test/bugs/Bug35714343.quicksql
@@ -2,4 +2,6 @@ departments
     dname
     emp  /cascade
         department_id /fk departments 
-        ename
+        ename
+
+#pk: identityDataType           
diff --git a/test/bugs/Bug35775070.qsql b/test/bugs/Bug35775070.qsql
@@ -9,3 +9,5 @@ session_speakers
   speaker_id                     num  /fk speakers /nn /lower
   speaker_role_id                num  /fk speaker_role /nn
   sort_sequence                  num 
+
+#pk: identityDataType   
diff --git a/test/bugs/Bug35901476.qsql b/test/bugs/Bug35901476.qsql
@@ -2,4 +2,6 @@ dept
     name
     emp
         name
-        other_table_id
+        other_table_id
+
+#pk: identityDataType           
diff --git a/test/constraints.qsql b/test/constraints.qsql
@@ -2,4 +2,6 @@ issues36_37 /check not (c1 = 'B' and c2 is null)
    c1  /check (c1 in ('A','B','C'))
    c2  /check 'A','B','C'
    c3  /check A,B,C
-   c4  /check (c4='A1' or c4 = 'A2')
+   c4  /check (c4='A1' or c4 = 'A2')
+
+#pk: identityDataType      
diff --git a/test/experimental/competition.qsql b/test/experimental/competition.qsql
diff --git a/test/order.qsql b/test/order.qsql
diff --git a/test/order.sql b/test/order.sql
diff --git a/test/single_test.js b/test/single_test.js
diff --git a/test/small_tests.js b/test/small_tests.js
diff --git a/test/star/sales_product_customers.qsql b/test/star/sales_product_customers.qsql

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ team /insert 1`
`7`	`7`	`name`
`8`	`8`	`points num`
`9`	`9`
`10`		`-#settings = { genpk: false, drop: true }`
	`10`	`+#settings = { genpk: false, drop: true, pk: identityDataType }`
`11`	`11`
`12`	`12`	`#flattened =`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ driver /insert 2`
`12`	`12`	`name`
`13`	`13`	`finalPosition num`
`14`	`14`
`15`		`-#settings = { genpk: false, drop: true }`
	`15`	`+#settings = { genpk: false, drop: true, pk: identityDataType }`
`16`	`16`
`17`	`17`	`#flattened =`
`18`	`18`	`{`