Subo caso para boolean (falla)

codenautas · Dec 6, 2016 · e0a0376 · e0a0376
1 parent 371abf7
commit e0a0376
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -30,7 +30,7 @@ var types = [
     {adapt:adaptPlain, pad:padRight, dataPattern:/^-?[0-9]+\.?[0-9]*$/,                 useLength:true}, // numeric
     {adapt:adaptPlain, pad:padRight, dataPattern:/^-?[0-9]+\.?[0-9]*([eE]-?[0-9]+)?$/},                  // double precision
     {adapt:adaptText , pad:padLeft , dataPattern:/.?/,                                  useLength:true, isTextColumn:true},  // character varying
-    {adapt:adaptPlain, pad:padRight, dataPattern:/^[yntf01]?/i}                                          // boolean
+    {adapt:adaptPlain, pad:padRight, dataPattern:/^([yntf01])?/i},                                       // boolean
 ];
 
 function mapTypes(typeNames) {

diff --git a/test/fixtures/booleans.result.yaml b/test/fixtures/booleans.result.yaml
@@ -0,0 +1,22 @@
+columns:
+  - name: b1
+    type: boolean
+    inPrimaryKey: false
+    maxLength: 1
+    maxScale: 0
+    hasNullValues: false
+    hasCientificNotation: null
+  - name: b2
+    type: boolean
+    inPrimaryKey: false
+    maxLength: 1
+    maxScale: 0
+    hasNullValues: false
+    hasCientificNotation: null
+  - name: b3
+    type: boolean
+    inPrimaryKey: false
+    maxLength: 1
+    maxScale: 0
+    hasNullValues: false
+    hasCientificNotation: null
diff --git a/test/fixtures/booleans.sql b/test/fixtures/booleans.sql
@@ -0,0 +1,11 @@
+create table "booleans" (
+ "text-field" character varying(5),
+ "int-field" integer,
+ "num-field" numeric(8,6),
+ "big" bigint,
+ "double" double precision
+);
+
+insert into "booleans" ("text-field", "int-field", "num-field", "big", "double") values
+ ('hello', 1, 3.141592, 1234567890, 1.12e-101),
+ (null, null, null, 0, 0.0);
diff --git a/test/fixtures/booleans.txt b/test/fixtures/booleans.txt
@@ -0,0 +1,3 @@
+b1;b2;b3
+t;1;y
+f;0;n
diff --git a/test/test.js b/test/test.js
@@ -69,6 +69,7 @@ describe("fixtures", function(){
         {name:'insert-limit'},
         {name:'mssql-insert-limit'}, // compactInsertLimit should be ignored (#24)
         {name:'insert-limit2'},
+        {skip:true, name:'booleans'},
     ].forEach(function(fixture){
         if(fixture.skip) {
             it.skip("fixture: "+fixture.name);

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -30,7 +30,7 @@ var types = [
     {adapt:adaptPlain, pad:padRight, dataPattern:/^-?[0-9]+\.?[0-9]*$/,                 useLength:true}, // numeric
     {adapt:adaptPlain, pad:padRight, dataPattern:/^-?[0-9]+\.?[0-9]*([eE]-?[0-9]+)?$/},                  // double precision
     {adapt:adaptText , pad:padLeft , dataPattern:/.?/,                                  useLength:true, isTextColumn:true},  // character varying
-    {adapt:adaptPlain, pad:padRight, dataPattern:/^[yntf01]?/i}                                          // boolean
+    {adapt:adaptPlain, pad:padRight, dataPattern:/^([yntf01])?/i},                                       // boolean
 ];
 
 function mapTypes(typeNames) {