Traslado todo el quote()'ing a quoteNames()

codenautas · Oct 11, 2016 · 89fc3b6 · 89fc3b6
1 parent 154bf9c
commit 89fc3b6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -308,7 +308,7 @@ function verifyColumnNames(info) {
             errors.push("missing name for column #"+(columnIndex+1));
         } else {
             if(columnInfo.name in namesHash) {
-                errors.push("duplicated column name '"+info.quote(columnInfo.name)+"'");
+                errors.push("duplicated column name '"+columnInfo.name+"'");
             } else {
                 namesHash[columnInfo.name] = true;
             }
@@ -415,7 +415,7 @@ function determinePrimaryKey(info) {
                 })){
                     return false;
                 }else{
-                    info.primaryKey = info.columnsInfo.slice(columnsInKey[0],columnsInKey[columnIndex]+1).map(function(col) { return info.quote(col.name); });
+                    info.primaryKey = info.columnsInfo.slice(columnsInKey[0],columnsInKey[columnIndex]+1).map(function(col) { return col.name; });
                     return true; 
                 }
             });
@@ -431,14 +431,15 @@ function determinePrimaryKey(info) {
     }
     var primaryKey = info.primaryKey || [];
     info.columnsInfo.forEach(function(columnInfo) {
-        columnInfo.inPrimaryKey = primaryKey.indexOf(info.quote(columnInfo.name)) !== -1;
+        columnInfo.inPrimaryKey = primaryKey.indexOf(columnInfo.name) !== -1;
     });
     return info;
 }
 
 function quoteNames(info) {
     info.formatedTableName = info.quote(info.formatedTableName);
     info.columnsInfo.forEach(function(column){ column.name=info.quote(column.name); });
+    if(info.primaryKey) { info.primaryKey = info.primaryKey.map(function(pk) { return info.quote(pk); }); }
     return info;
 }
 

diff --git a/test/errors/duplicated-column-names.errors.yaml b/test/errors/duplicated-column-names.errors.yaml
@@ -1,3 +1,3 @@
 errors:
-  - duplicated column name '"one"'
-  - duplicated column name '"three"'
+  - duplicated column name 'one'
+  - duplicated column name 'three'
diff --git a/test/errors/fields-lcalpha-dups.errors.yaml b/test/errors/fields-lcalpha-dups.errors.yaml
@@ -1,2 +1,2 @@
 errors:
-  - duplicated column name '"esdrújulo"'
+  - duplicated column name 'esdrújulo'
diff --git a/test/errors/fields-lcnames-dups.errors.yaml b/test/errors/fields-lcnames-dups.errors.yaml
@@ -1,3 +1,3 @@
 errors:
-  - duplicated column name '"campo1"'
-  - duplicated column name '"campo4"'
+  - duplicated column name 'campo1'
+  - duplicated column name 'campo4'
diff --git a/test/errors/fields-unmod-dups.errors.yaml b/test/errors/fields-unmod-dups.errors.yaml
@@ -1,3 +1,3 @@
 errors:
-  - duplicated column name '"FIELD2"'
-  - duplicated column name '"FiElD5"'
+  - duplicated column name 'FIELD2'
+  - duplicated column name 'FiElD5'
diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -308,7 +308,7 @@ function verifyColumnNames(info) {
             errors.push("missing name for column #"+(columnIndex+1));
         } else {
             if(columnInfo.name in namesHash) {
-                errors.push("duplicated column name '"+info.quote(columnInfo.name)+"'");
+                errors.push("duplicated column name '"+columnInfo.name+"'");
             } else {
                 namesHash[columnInfo.name] = true;
             }
@@ -415,7 +415,7 @@ function determinePrimaryKey(info) {
                 })){
                     return false;
                 }else{
-                    info.primaryKey = info.columnsInfo.slice(columnsInKey[0],columnsInKey[columnIndex]+1).map(function(col) { return info.quote(col.name); });
+                    info.primaryKey = info.columnsInfo.slice(columnsInKey[0],columnsInKey[columnIndex]+1).map(function(col) { return col.name; });
                     return true; 
                 }
             });
@@ -431,14 +431,15 @@ function determinePrimaryKey(info) {
     }
     var primaryKey = info.primaryKey || [];
     info.columnsInfo.forEach(function(columnInfo) {
-        columnInfo.inPrimaryKey = primaryKey.indexOf(info.quote(columnInfo.name)) !== -1;
+        columnInfo.inPrimaryKey = primaryKey.indexOf(columnInfo.name) !== -1;
     });
     return info;
 }
 
 function quoteNames(info) {
     info.formatedTableName = info.quote(info.formatedTableName);
     info.columnsInfo.forEach(function(column){ column.name=info.quote(column.name); });
+    if(info.primaryKey) { info.primaryKey = info.primaryKey.map(function(pk) { return info.quote(pk); }); }
     return info;
 }