boolean, one more time

Author: vadim-tropashko

dist/quick-sql.js

@@ -7722,7 +7722,7 @@ let me = function() {
           break;
         }
       const k = h.getOptionValue("db");
-      M != "" && (h.getOptionValue("boolean") == "native" || 1 < k.length && k.charAt(0) == "2" && k.charAt(1) == "3") && (M = "", b = "boolean"), this.indexOf("phone_number") == 0 && (b = "number");
+      M != "" && (h.getOptionValue("boolean") == "native" || h.getOptionValue("boolean") != "yn" && 0 < k.length && k.charAt(0) == "2" && k.charAt(1) == "3") && (M = "", b = "boolean"), this.indexOf("phone_number") == 0 && (b = "number");
       let O = this.indexOf("num", !0);
       0 < O && (b = "number");
       let N = this.indexOf(")");
@@ -8984,7 +8984,7 @@ const j = {
     createdbycol: { label: "Created By Column Name", value: "created_by" },
     updatedcol: { label: "Updated Column Name", value: "updated" },
     updatedbycol: { label: "Updated By Column Name", value: "updated_by" },
-    boolean: { label: "Boolean Datatype", value: "yn", check: ["yn", "native"] },
+    boolean: { label: "Boolean Datatype", value: "not set", check: ["yn", "native"] },
     genpk: { label: "Auto Primary Key", value: "yes", check: ["yes", "no"] },
     semantics: { label: "Character Strings", value: "CHAR", check: ["BYTE", "CHAR", "Default"] },
     language: { label: "Data Language", value: "EN", check: ["EN", "JP", "KO"] },

dist/quick-sql.umd.cjs

@@ -232,11 +232,10 @@ table created.
 ### boolean
 
 **Possible Values**: `yn`, `native`  
-**Default Value**: `yn`
-
-Adds an additional created, created_by, updated and updated_by columns to every
-table created.
+**Default Value**: inferred from #db
 
+Set boolean to legacy char(1) or new 23c native boolean value. This setting has priority
+over db:23c, so that the user can override db seting (which influences other functionality)
 
 ### compress
 

doc/user/quick-sql-grammar.md

@@ -20,7 +20,7 @@ export const quicksql = (function () {
             createdbycol: {label: 'Created By Column Name', value: 'created_by'},
             updatedcol: {label: 'Updated Column Name', value: 'updated'},
             updatedbycol: {label: 'Updated By Column Name', value: 'updated_by'},
-        boolean: {label: 'Boolean Datatype', value:'yn',check:['yn','native']},
+        boolean: {label: 'Boolean Datatype', value:'not set',check:['yn','native']},
         genpk: {label:'Auto Primary Key', value:'yes',check:['yes','no']},
         semantics: {label: 'Character Strings',value:'CHAR',check:['BYTE','CHAR','Default']},
         language: {label: 'Data Language', value:'EN',check:['EN','JP','KO']},

src/ddl.js

@@ -336,7 +336,7 @@ let tree = (function(){
             } 
             const dbVer = ddl.getOptionValue('db');
             if( booleanCheck != '' && ( ddl.getOptionValue('boolean')=='native' 
-                                      || 1 < dbVer.length && dbVer.charAt(0) == '2' && dbVer.charAt(1) == '3' )
+                                      || ddl.getOptionValue('boolean') != 'yn' && 0 < dbVer.length && dbVer.charAt(0) == '2' && dbVer.charAt(1) == '3' )
             ) {
                 booleanCheck = '';
                 ret = 'boolean';

src/tree.js

@@ -649,8 +649,16 @@ students
     output = new quicksql(`boolvalues
         ok   bool
         #boolean:native`).getDDL();
+    console.log(output);
     assert( "0 < output.indexOf('ok    boolean')" );
 
+    output = new quicksql(`boolvalues
+    ok   bool
+    #boolean:yn
+    #db:"23c"`).getDDL();
+    console.log(output);
+    assert( "output.indexOf('ok    boolean') < 0" );
+
     // https://github.com/oracle/quicksql/issues/55
     output = new quicksql(`escape /insert 1
     financial_year /check '23/24', \`'24/25'\`