diff options
| -rw-r--r-- | javascripts/libs/ddl_builder/ddl_builder.js | 39 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/qunit/columnTypes.js | 2 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/qunit/guessValueSeparators.js | 2 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/qunit/headerNames.js | 2 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/qunit/main.js | 8 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/qunit/recordCount.js | 2 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/templates/generic.sql | 10 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/templates/oracle.sql | 9 | ||||
| -rw-r--r-- | javascripts/libs/ddl_builder/templates/sqlite.sql | 12 | ||||
| -rw-r--r-- | javascripts/main.js | 6 | ||||
| -rw-r--r-- | javascripts/qunit_main.js | 2 | ||||
| -rw-r--r-- | views/QUnit/index.cfm | 2 | ||||
| -rw-r--r-- | views/QUnit/layout.cfm | 74 |
13 files changed, 53 insertions, 117 deletions
diff --git a/javascripts/libs/ddl_builder/ddl_builder.js b/javascripts/libs/ddl_builder/ddl_builder.js index 43b363d..3a33230 100644 --- a/javascripts/libs/ddl_builder/ddl_builder.js +++ b/javascripts/libs/ddl_builder/ddl_builder.js @@ -3,9 +3,12 @@ define( "jQuery", "Handlebars", "DateFormat", + 'text!./templates/generic.sql', + 'text!./templates/oracle.sql', + 'text!./templates/sqlite.sql', 'HandlebarsHelpers/each_with_index' ], - function ($, Handlebars, dateFormat) { + function ($, Handlebars, dateFormat, generic_template, oracle_template, sqlite_template) { ddl_builder = function (args) { if (!args) args = {}; @@ -56,14 +59,7 @@ define( }; - this.ddlTemplate = "\ -CREATE TABLE {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}}\n\ - ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}})\n{{separator}}\n\n\ -INSERT INTO {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}}\n\ - ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}}{{/each_with_index}})\n\ -VALUES\n\ - {{#each_with_index data}}{{#if index}},\n\ - {{/if}}({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}}){{/each_with_index}}\n{{separator}}"; + this.ddlTemplate = generic_template; this.compiledTemplate = Handlebars.compile(this.ddlTemplate); this.setup(args); @@ -117,18 +113,7 @@ VALUES\n\ break; case 'Oracle': - var template = -"CREATE TABLE {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}}\n\ - ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}})\n{{separator}}\n\ -INSERT ALL\ -{{#each_with_index data}}\n\ - INTO \ -{{{../tablePrefix}}}{{../tableName}}{{{../tableSuffix}}} \ -({{#each_with_index r}}{{#if index}}, {{/if}}{{{../../fieldPrefix}}}{{column_name_for_index ../..}}{{{../../fieldSuffix}}}{{/each_with_index}})\n\ - VALUES \ -({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}})\ -{{/each_with_index}}\n\ -SELECT * FROM dual\n{{separator}}"; + var template = oracle_template; this.setup({ @@ -144,17 +129,7 @@ SELECT * FROM dual\n{{separator}}"; case 'SQLite': - var template = -"CREATE TABLE {{tablePrefix}}{{tableName}}{{tableSuffix}}\n\ - ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}})\n{{separator}}\n\n\ -{{#each_with_index data}}\ -INSERT INTO {{tablePrefix}}{{../tableName}}{{tableSuffix}}\n\ - ({{#each_with_index ../columns}}{{#if index}}, {{/if}}{{{../../fieldPrefix}}}{{name}}{{{../../fieldSuffix}}}{{/each_with_index}})\n\ -VALUES\n\ - ({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}})\n{{../separator}}\ -\n\ -{{/each_with_index}}\ -"; + var template = sqlite_template; this.setup({ diff --git a/javascripts/libs/ddl_builder/qunit/columnTypes.js b/javascripts/libs/ddl_builder/qunit/columnTypes.js index 31ab713..a182e7d 100644 --- a/javascripts/libs/ddl_builder/qunit/columnTypes.js +++ b/javascripts/libs/ddl_builder/qunit/columnTypes.js @@ -1,4 +1,4 @@ -require(["jQuery","QUnit", "DDLBuilder"], function ($,test,DDLBuilder) { +require(["jQuery","QUnit", "DDLBuilder/ddl_builder"], function ($,test,DDLBuilder) { test("ddl_builder.columnTypes", function () { var typeTest = function (id,types) { diff --git a/javascripts/libs/ddl_builder/qunit/guessValueSeparators.js b/javascripts/libs/ddl_builder/qunit/guessValueSeparators.js index 3da871c..f58aa0c 100644 --- a/javascripts/libs/ddl_builder/qunit/guessValueSeparators.js +++ b/javascripts/libs/ddl_builder/qunit/guessValueSeparators.js @@ -1,4 +1,4 @@ -require(["jQuery","QUnit", "DDLBuilder"], function ($,test,DDLBuilder) { +require(["jQuery","QUnit", "DDLBuilder/ddl_builder"], function ($,test,DDLBuilder) { test("ddl_builder.guessValueSeparators", function () { var ddl_builder = new DDLBuilder(); diff --git a/javascripts/libs/ddl_builder/qunit/headerNames.js b/javascripts/libs/ddl_builder/qunit/headerNames.js index 7df7ce2..8d71227 100644 --- a/javascripts/libs/ddl_builder/qunit/headerNames.js +++ b/javascripts/libs/ddl_builder/qunit/headerNames.js @@ -1,4 +1,4 @@ -require(["jQuery","QUnit", "DDLBuilder"], function ($,test,DDLBuilder) { +require(["jQuery","QUnit", "DDLBuilder/ddl_builder"], function ($,test,DDLBuilder) { test("ddl_builder.headerNames", function () { // template is just a csv list of names diff --git a/javascripts/libs/ddl_builder/qunit/main.js b/javascripts/libs/ddl_builder/qunit/main.js index b2bdb47..29ef77f 100644 --- a/javascripts/libs/ddl_builder/qunit/main.js +++ b/javascripts/libs/ddl_builder/qunit/main.js @@ -8,10 +8,10 @@ define([ $("#qunit-fixture").append(fixtureContent); require([ - "libs/ddl_builder/qunit/columnTypes", - "libs/ddl_builder/qunit/headerNames", - "libs/ddl_builder/qunit/guessValueSeparators", - "libs/ddl_builder/qunit/recordCount" + "DDLBuilder/qunit/columnTypes", + "DDLBuilder/qunit/headerNames", + "DDLBuilder/qunit/guessValueSeparators", + "DDLBuilder/qunit/recordCount" ]); } diff --git a/javascripts/libs/ddl_builder/qunit/recordCount.js b/javascripts/libs/ddl_builder/qunit/recordCount.js index 2925e0f..bcb71c5 100644 --- a/javascripts/libs/ddl_builder/qunit/recordCount.js +++ b/javascripts/libs/ddl_builder/qunit/recordCount.js @@ -1,4 +1,4 @@ -require(["jQuery","QUnit", "DDLBuilder"], function ($,test,DDLBuilder) { +require(["jQuery","QUnit", "DDLBuilder/ddl_builder"], function ($,test,DDLBuilder) { test("ddl_builder.recordCount", function () { var countTest = function (id,count) { diff --git a/javascripts/libs/ddl_builder/templates/generic.sql b/javascripts/libs/ddl_builder/templates/generic.sql new file mode 100644 index 0000000..f7a4f5f --- /dev/null +++ b/javascripts/libs/ddl_builder/templates/generic.sql @@ -0,0 +1,10 @@ +CREATE TABLE {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}} + ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}}) +{{separator}} + +INSERT INTO {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}} + ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}}{{/each_with_index}}) +VALUES + {{#each_with_index data}}{{#if index}}, + {{/if}}({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}}){{/each_with_index}} +{{separator}} diff --git a/javascripts/libs/ddl_builder/templates/oracle.sql b/javascripts/libs/ddl_builder/templates/oracle.sql new file mode 100644 index 0000000..8180cf0 --- /dev/null +++ b/javascripts/libs/ddl_builder/templates/oracle.sql @@ -0,0 +1,9 @@ +CREATE TABLE {{{tablePrefix}}}{{tableName}}{{{tableSuffix}}} + ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}}) +{{separator}} + +INSERT ALL {{#each_with_index data}} + INTO {{{../tablePrefix}}}{{../tableName}}{{{../tableSuffix}}} ({{#each_with_index r}}{{#if index}}, {{/if}}{{{../../fieldPrefix}}}{{column_name_for_index ../..}}{{{../../fieldSuffix}}}{{/each_with_index}}) + VALUES ({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}}){{/each_with_index}} +SELECT * FROM dual +{{separator}}
\ No newline at end of file diff --git a/javascripts/libs/ddl_builder/templates/sqlite.sql b/javascripts/libs/ddl_builder/templates/sqlite.sql new file mode 100644 index 0000000..2e2b66d --- /dev/null +++ b/javascripts/libs/ddl_builder/templates/sqlite.sql @@ -0,0 +1,12 @@ +"CREATE TABLE {{tablePrefix}}{{tableName}}{{tableSuffix}} + ({{#each_with_index columns}}{{#if index}}, {{/if}}{{{../fieldPrefix}}}{{name}}{{{../fieldSuffix}}} {{db_type}}{{/each_with_index}}) +{{separator}} + +{{#each_with_index data}} +INSERT INTO {{tablePrefix}}{{../tableName}}{{tableSuffix}} + ({{#each_with_index ../columns}}{{#if index}}, {{/if}}{{{../../fieldPrefix}}}{{name}}{{{../../fieldSuffix}}}{{/each_with_index}}) +VALUES + ({{#each_with_index r}}{{#if index}}, {{/if}}{{formatted_field ../..}}{{/each_with_index}}) +{{../separator}} + +{{/each_with_index}}
\ No newline at end of file diff --git a/javascripts/main.js b/javascripts/main.js index 9538273..8942c52 100644 --- a/javascripts/main.js +++ b/javascripts/main.js @@ -12,8 +12,8 @@ requirejs.config({ FiddleEditor: 'libs/fiddleEditor', CodeMirror: 'libs/codemirror/codemirror', MySQLCodeMirror: 'libs/codemirror/mode/mysql/mysql', - XPlans: 'libs/xplans' - DDLBuilder: 'libs/ddl_builder/ddl_builder' + XPlans: 'libs/xplans', + DDLBuilder: 'libs/ddl_builder' }, shim: { @@ -62,7 +62,7 @@ require([ 'Underscore', 'dbTypes_cached', 'fiddle_backbone/app', - 'DDLBuilder', + 'DDLBuilder/ddl_builder', 'libs/idselector' ], function($, _, dbTypesData, App, ddl_builder) { diff --git a/javascripts/qunit_main.js b/javascripts/qunit_main.js index ee64a0c..6746639 100644 --- a/javascripts/qunit_main.js +++ b/javascripts/qunit_main.js @@ -13,7 +13,7 @@ requirejs.config({ CodeMirror: 'libs/codemirror/codemirror', MySQLCodeMirror: 'libs/codemirror/mode/mysql/mysql', XPlans: 'libs/xplans', - DDLBuilder: 'libs/ddl_builder/ddl_builder', + DDLBuilder: 'libs/ddl_builder', QUnit: 'libs/qunit-1.10.0' }, diff --git a/views/QUnit/index.cfm b/views/QUnit/index.cfm index 7558408..e74ffbf 100644 --- a/views/QUnit/index.cfm +++ b/views/QUnit/index.cfm @@ -1,4 +1,4 @@ - +<div id="qunit"></div> <div id="qunit-fixture"></div> <cfoutput>#requireJSTag(main="qunit_main")#</cfoutput> diff --git a/views/QUnit/layout.cfm b/views/QUnit/layout.cfm index 9798138..b0d3a0d 100644 --- a/views/QUnit/layout.cfm +++ b/views/QUnit/layout.cfm @@ -1,82 +1,12 @@ -<html> <cfoutput> +<html> <head> <title>QUnit Tests</title> <base href="#application.wheels.webPath#"> #stylesheetLinkTag("qunit-1.10.0.css")# -<!--- - <script type="text/javascript" src="plugins/RequireJS/require.js"></script> - <script type="text/javascript"> - - /* requirejs config copied and slightly modified from /javascripts/main.js */ - requirejs.config({ - paths: { - jQuery: 'javascripts/libs/jquery/jquery', - Underscore: 'javascripts/libs/underscore', - Backbone: 'javascripts/libs/backbone', - Bootstrap: 'javascripts/libs/bootstrap', - Handlebars: 'javascripts/libs/handlebars-1.0.0.beta.6', - HandlebarsHelpers: 'javascripts/libs/handlebarsHelpers', - DateFormat: 'javascripts/libs/date.format', - BrowserEngines: 'javascripts/libs/browserEngines', - FiddleEditor: 'javascripts/libs/fiddleEditor', - CodeMirror: 'javascripts/libs/codemirror/codemirror', - MySQLCodeMirror: 'javascripts/libs/codemirror/mode/mysql/mysql', - XPlans: 'javascripts/libs/xplans', - QUnit: 'javascripts/libs/qunit-1.10.0' - }, - - shim: { - Backbone: { - deps: ['Underscore', 'jQuery', 'libs/json2'], - exports: 'Backbone' - }, - jQuery: { - exports: '$' - }, - Underscore: { - exports: '_' - }, - CodeMirror: { - exports: 'CodeMirror' - }, - Handlebars: { - exports: 'Handlebars' - }, - DateFormat: { - exports: 'dateFormat' - }, - 'XPlans/oracle/loadswf': { - deps: ['XPlans/oracle/flashver'], - exports: "loadswf" - }, - 'XPlans/mssql': { - exports: "QP" - }, - - 'QUnit': { - exports: "test" - }, - MySQLCodeMirror : ['CodeMirror'], - 'javascripts/libs/jquery/jquery.blockUI': ['jQuery'], - 'javascripts/libs/jquery/jquery.cookie': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-collapse': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-tab': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-dropdown': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-modal': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-tooltip': ['jQuery'], - 'javascripts/Bootstrap/bootstrap-popover': ['jQuery','Bootstrap/bootstrap-tooltip'] - } - - }); - </script> - </head> - ---> <body> - <div id="qunit"></div> #includeContent()# </body> -</cfoutput> - </html> +</cfoutput> |