Fixed all tests

Author: vadim-tropashko

dist/quick-sql.js

@@ -1,4 +1,5 @@
 import Chance from 'chance';
+//import lexer from './lexer.js';
 
 
 export function generateSample( lTable, lColumn, lType, values ) {
@@ -12,20 +13,16 @@ export function generateSample( lTable, lColumn, lType, values ) {
         let min = 0;
         let max = values.length;
         let value = values[Math.floor(seededRandom() * (max - min)) + min];
-        var optQuote = '\'';
-        if(  type.startsWith('INTEGER') || type.startsWith('NUMBER') || type.startsWith('DATE')  ) 
-            optQuote = '';
-        else {
-            if( value.toLowerCase && value.toLowerCase() == 'null' )
-                optQuote = '';
-            if( value.charAt && value.charAt(0) == '\'' )
-                optQuote = '';
-            if( value.charAt && value.charAt(0) == 'q' && value.charAt(1) == '\'' )
-                optQuote = '';
+        if(  !type.startsWith('INTEGER') && !type.startsWith('NUMBER') && !type.startsWith('DATE') 
+          && (!value.toLowerCase || value.toLowerCase() != 'null') 
+          && ( !value.charAt || (value.charAt(0) != 'q' && value.charAt(1) != '\'') )
+        ) { 
+            if( value.charAt && value.charAt(0) == '\'' ) 
+                value = value.substring(1,value.length-1);
+            value = value.replaceAll('\'','\'\''); 
+            value = "'"+value+"'"; 
         }
-        if( value.replaceAll && 0 < value.indexOf('\'') && value.indexOf('\'') < value.length-1 )  
-            value = value.replaceAll('\'','\'\'');  
-        return optQuote+value+optQuote;    		
+        return value;    		
     }
 
     if( column == 'NAME' && 0 <= table.indexOf('DEPARTMENT') ) {

dist/quick-sql.umd.cjs

@@ -447,19 +447,23 @@ let tree = (function(){
                     parentPref = parent.parseName()+'_';
                 const parent_child = concatNames(parentPref,this.parseName());
 
-                let values = this.getValues('check');
-                values = '(' + values + ')';
                 let offset = tab;
                 if( parent != null )
                     offset = ' '.repeat(parent.maxChildNameLen());
-                if( this.children != null && 0 < this.children.length  ) {  // table level
-                    ret += tab + 'constraint '+concatNames(ddl.objPrefix(),parent_child,'_ck');
-                    ret += '  check '+values+',\n';    
-                } else {
-                    ret +=' constraint '+concatNames(ddl.objPrefix(),parent_child,'_ck')+'\n';
-                    ret += tab +  tab+offset +'check ('+this.parseName()+' in '+values+')';    
+                let constr = this.getGeneralConstraint();
+                if( constr != null ) {
+                    if( this.children != null && 0 < this.children.length ) {  // (general) table level constraint
+                        ret += tab + 'constraint '+concatNames(ddl.objPrefix(),parent_child,'_ck');
+                        ret += '  check '+ constr +',\n';    
+                    } else {                     // general column level constraint
+                        ret +=' constraint '+concatNames(ddl.objPrefix(),parent_child,'_ck')+'\n';
+                        ret += tab +  tab+offset +'check '+ constr +'';    
+                    } 
+                    return ret;
                 }
-    		
+                const values = this.getValues('check');
+                ret +=' constraint '+concatNames(ddl.objPrefix(),parent_child,'_ck')+'\n';
+                ret += tab +  tab+offset +'check ('+this.parseName()+' in ('+values+'))';                    
             }
             return ret;
         }
@@ -564,9 +568,27 @@ let tree = (function(){
             return null;
         };
 
+        this.getGeneralConstraint = function() { // parenthesized constraint to return verbatim, e.g. c1 /check (c1 in ('A','B','C'))
+            let from = this.indexOf('check');
+            if(   0 < from && this.src[from-1].value == '/' &&
+                ( this.src[from+1].value == '(' || this.src[from+1].value.toLowerCase() == 'not' ) 
+            ) {    
+                let i = from+2
+                for( ; i < this.src.length && this.src[i].value != '/' && this.src[i].value != '[' ; ) 
+                    i++;
+                let ret = this.content.substring(this.src[from+1].begin, this.src[i-1].end);
+                if( ret.charAt(0) != '(' )
+                    ret = '('+ret+')';
+                return ret;
+            }
+
+            return null;
+        }
+
         this.listValues = function( check_or_values ) {
             let ret = [];
             let from = this.indexOf(check_or_values);
+ 
             let separator = ' ';   // e.g. status /check open completed closed /values open, open, open, open, closed, completed 
             for( let i = from+1; i < this.src.length && this.src[i].value != '/' && this.src[i].value != '[' ; i++ ) 
                 if( this.src[i].value == ',' ) { 

src/sample.js

@@ -5,7 +5,7 @@ import fs from "fs";
 try {
     let file = '//bugs/Bug35637614.quicksql';
     //file = '//experimental/food_product.json';
-    //file = '//JSON/car_racing/2.qsql';
+    file = '//constraints.qsql';
     //file = '//apex/timecard.quicksql';
 
     let args = process.argv.slice(2);

src/tree.js

@@ -660,16 +660,18 @@ students
     assert( "0 < output.indexOf(\"check (financial_year in ('23/24','24/25')),\")" );
     assert( "0 < output.indexOf(\"check (surname in ('O''Hara',q'{O'Tool}')),\")" );
     assert( "0 < output.indexOf(\"check (start_date in (to_date('01-APR-2025','DD-MON-YYYY')))\")" );
+    assert( "output.indexOf(\"''24/25''\") < 0" );
+    assert( "output.indexOf(\"q''{O''Tool}''\") < 0" );
+    assert( "output.indexOf(\"to_date(''01-APR-2025'',''DD-MON-YYYY'')\") < 0" );
 
 } 
 
-
 small_tests();
 
 console.log(assertionCnt);
 
 // metatest that watches tests
-const minimalTestCnt = 125;
+const minimalTestCnt = 130;
 if( assertionCnt < minimalTestCnt ) {
     console.error("assertionCnt < "+minimalTestCnt);
     throw new Error('Test failed');