DataList para outputEngine (#30)

codenautas · Dec 5, 2016 · e937864 · e937864
1 parent 926df22
commit e937864
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/lib/txt-to-sql.js b/lib/txt-to-sql.js
@@ -106,8 +106,6 @@ var formatFunctions = {
     },
 };
 
-txtToSql.formats = Object.keys(formatFunctions);
-
 function checkEncodingParam(encoding, inOrOut, errors) {
     if(encoding && ! encoding.match(/^(ASCII7|UTF8|ANSI)$/)) {
         errors.push("unsupported "+inOrOut+" encoding '"+encoding+"'");
@@ -753,6 +751,9 @@ txtToSql.stringizeStats = stringizeStats;
 
 txtToSql.engines = engines;
 
+txtToSql.validEngines = Object.keys(txtToSql.engines);
+txtToSql.validFormats = Object.keys(formatFunctions);
+
 txtToSql.defaultOpts = {
     columnNamesFormat: 'lowercased_names',
     separator: false,

diff --git a/src/txt-to-sql.jade b/src/txt-to-sql.jade
@@ -321,9 +321,9 @@ html(lang=lang)
                     html.th({colspan:2},[html.td(messages.headerOptions)]).create(),
                     createOption(messages.opts.commas, 'columnAlignedCommas', 'checkbox', prepared.opts.columnAlignedCommas, 1),
                     createOption(messages.opts.columnAlignedMaxWidth, 'columnAlignedMaxWidth', 'text', prepared.opts.columnAlignedMaxWidth, 1),
-                    createList(messages.opts.format, 'columnNamesFormat', prepared.opts.columnNamesFormat, txtToSql.formats, 15),
+                    createList(messages.opts.format, 'columnNamesFormat', prepared.opts.columnNamesFormat, txtToSql.validFormats, 15),
                     createOption(messages.opts.separator, 'separator', 'text', prepared.opts.separator, 1),
-                    createOption(messages.opts.outformat, 'outputEngine', 'text', prepared.opts.outputEngine, 10),
+                    createList(messages.opts.outformat, 'outputEngine', prepared.opts.outputEngine, txtToSql.validEngines, 10),
                     createOption(messages.opts.pk, 'includePrimaryKey', 'checkbox', includePrimaryKeyValue, 1),
                     createOption(messages.opts.verbose, 'verboseErrors', 'checkbox', prepared.opts.verboseErrors, 1),
                     createOption(messages.opts.inputEncoding, 'inputEncoding', 'text', prepared.opts.inputEncoding, 7),

diff --git a/web/txt-to-sql.html b/web/txt-to-sql.html
@@ -270,9 +270,9 @@
                 html.th({colspan:2},[html.td(messages.headerOptions)]).create(),
                 createOption(messages.opts.commas, 'columnAlignedCommas', 'checkbox', prepared.opts.columnAlignedCommas, 1),
                 createOption(messages.opts.columnAlignedMaxWidth, 'columnAlignedMaxWidth', 'text', prepared.opts.columnAlignedMaxWidth, 1),
-                createList(messages.opts.format, 'columnNamesFormat', prepared.opts.columnNamesFormat, txtToSql.formats, 15),
+                createList(messages.opts.format, 'columnNamesFormat', prepared.opts.columnNamesFormat, txtToSql.validFormats, 15),
                 createOption(messages.opts.separator, 'separator', 'text', prepared.opts.separator, 1),
-                createOption(messages.opts.outformat, 'outputEngine', 'text', prepared.opts.outputEngine, 10),
+                createList(messages.opts.outformat, 'outputEngine', prepared.opts.outputEngine, txtToSql.validEngines, 10),
                 createOption(messages.opts.pk, 'includePrimaryKey', 'checkbox', includePrimaryKeyValue, 1),
                 createOption(messages.opts.verbose, 'verboseErrors', 'checkbox', prepared.opts.verboseErrors, 1),
                 createOption(messages.opts.inputEncoding, 'inputEncoding', 'text', prepared.opts.inputEncoding, 7),

diff --git a/web/txt-to-sql.js b/web/txt-to-sql.js
@@ -106,8 +106,6 @@ var formatFunctions = {
     },
 };
 
-txtToSql.formats = Object.keys(formatFunctions);
-
 function checkEncodingParam(encoding, inOrOut, errors) {
     if(encoding && ! encoding.match(/^(ASCII7|UTF8|ANSI)$/)) {
         errors.push("unsupported "+inOrOut+" encoding '"+encoding+"'");
@@ -753,6 +751,9 @@ txtToSql.stringizeStats = stringizeStats;
 
 txtToSql.engines = engines;
 
+txtToSql.validEngines = Object.keys(txtToSql.engines);
+txtToSql.validFormats = Object.keys(formatFunctions);
+
 txtToSql.defaultOpts = {
     columnNamesFormat: 'lowercased_names',
     separator: false,