issue 47 complete

Author: vadim-tropashko

dist/quick-sql.js

@@ -325,8 +325,8 @@ export const quicksql = (function () {
                     if( pkNode == null )
                         continue;
                     let pk = 'id';
-                    if( pkNode.getExplicitPkNode() != null )
-                        pk = pkNode.getExplicitPkNode().parseName();				
+                    if( pkNode.getExplicitPkName() != null )
+                        pk = pkNode.getExplicitPkName();				
 
                     output.links.push({source: this.objPrefix() +parent, source_id: pk,
                                        target: this.objPrefix() + descendants[i].parseName(''), target_id: fk

dist/quick-sql.umd.cjs

@@ -131,8 +131,8 @@ let tree = (function(){
 
         this.isOption = function( token, token2 ) {
             for( let i = 2; i < this.src.length; i++ ) {
-                if( token == this.src[i].value )
-                    if( token2 == null || i < this.src.length-1 && token2 ==this.src[i+1].value)
+                if( token == this.src[i].value.toLowerCase() )
+                    if( token2 == null || i < this.src.length-1 && token2 ==this.src[i+1].value.toLowerCase() )
                         return this.src[i-1].value == '/';
             }
             return false;
@@ -146,7 +146,7 @@ let tree = (function(){
                 return null;
 
             let ret = '';
-            for( let i = pos+1; i < this.src.length && this.src[i] != '/'; i++ )
+            for( let i = pos+1; i < this.src.length && this.src[i].value != '/'; i++ )
                 ret += this.src[i].value;
 
             return ret;
@@ -192,7 +192,7 @@ let tree = (function(){
             if( this.src[0].value == 'view' ) {
                 return this.src[1].value;
             }
-            if( 1 < this.src.length && this.src[0].value == '=' ) {
+            if( 1 < this.src.length && this.src[1].value == '=' ) {
                 return this.src[0].value;
             }
             rEt = replaceTrailing(rEt,' d');
@@ -655,9 +655,13 @@ let tree = (function(){
 
 
             if( !this.isMany2One() ) {
-                if( this.parent != null && this.parseType() == 'table' )
-                    //this.fks[singular(this.parent.parseName())+'_id']=this.parent.parseName();
-                    this.fks[singular(this.parent.getPkName())]=this.parent.parseName();
+                if( this.parent != null && this.parseType() == 'table' ) {
+                    const pkn = this.parent.getPkName();
+                    if( pkn.indexOf(',') < 0 )
+                        this.fks[singular(this.parent.parseName())+'_id']=this.parent.parseName();
+                    else
+                        this.fks[singular(this.parent.getPkName())]=this.parent.parseName();
+                }
                 for( let i = 0; i < this.children.length; i++ ) 
                     if( this.children[i].refId() != null ) {
                         this.fks[this.children[i].parseName()]=this.children[i].refId();
@@ -724,10 +728,11 @@ let tree = (function(){
                     type = attr.parseType('fk');		
                 let refNode = ddl.find(parent);
                 let _id = ''; 
-                const rname = refNode.getExplicitPkName();  
-                if( refNode != null && rname != null && rname.indexOf(',') < 0 )
-                    type = refNode.getPkType();  
-                else if( refNode == null ) {
+                if( refNode != null ) {
+                    const rname = refNode.getExplicitPkName();  
+                    if( rname != null && rname.indexOf(',') < 0 )
+                        type = refNode.getPkType();  
+                } else {
                     refNode = ddl.find(fk);
                     if( refNode.isMany2One() & !fk.endsWith('_id') ) {
                         parent = fk;

src/ddl.js

@@ -44,7 +44,7 @@ user_claims
   receipt_from_id                number /nn /fk user_sources
   receipt_date                   date  /nn
   receipt_amount                 number  /nn
-  claimant                       number  /FK users
+  claimant                       number  /fk users
   status                         vc80
   payment_txn_id                 number
   reimburse_percentage           number

src/tree.js

@@ -5,6 +5,8 @@ import fs from "fs";
 try {
     let file = '//bugs/Bug35669377.quicksql';
     //file = '//experimental/food_product.json';
+    //file = '//JSON/car_racing/1.qsql';
+    file = '//bugs/Bug35637603.quicksql';
 
     let args = process.argv.slice(2);
     if( 0 < args.length )

test/apex/medipay.quicksql

@@ -593,7 +593,7 @@ students
     first_name
     last_name `).getDDL();
 
-    assert( "0 < output.indexOf(\"alter table employee add constraint employee_uk unique (first_name, last_name);\")" );    
+    assert( "0 < output.indexOf(\"alter table employee add constraint employee_uk unique (first_name,last_name);\")" );    
 
     // https://github.com/oracle/quicksql/issues/47
     output = new quicksql( `employee /pk first_name, last_name
@@ -610,24 +610,14 @@ students
     assert( "0 < output.indexOf(\"constraint employee_job_history_fk foreign key (first_name,last_name) references employee;\")" );    
 }    
 
-    // https://github.com/oracle/quicksql/issues/31
-    output = new quicksql( `departments /audit cols
-   name 
-   employees /audit columns
-       name 
-    `).getDDL();
-                
-    console.log(output);
-    assert( "output.indexOf('audit all') < 0 " );  
-    assert( "output.indexOf('created       date not null') <  output.lastIndexOf('created          date not null,')" );  
 
 
-//small_tests();
+small_tests();
 
 console.log(assertionCnt);
 
 // metatest that watches tests
-const minimalTestCnt = 100;
+const minimalTestCnt = 110;
 if( assertionCnt < minimalTestCnt ) {
     console.error("assertionCnt < "+minimalTestCnt);
     throw new Error('Test failed');