chore: init stringify.js

Author: albin3

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 node_modules
 *.log
+*.swp

Makefile

@@ -2,6 +2,7 @@ TEST = $(shell ls -S `find test -type f -name "*.test.js"`)
 
 test:
 	node --harmony ./node_modules/.bin/jison -m js ./src/sqlParser.jison  -o ./dist/parser/sqlParser.js
+	cat src/stringify.js >> ./dist/parser/sqlParser.js
 	cat src/suffix.js >> ./dist/parser/sqlParser.js
 	mocha $(TEST)
 

dist/parser/sqlParser.js

@@ -168,12 +168,11 @@ selectClause
       sqlBigResultOpt
       sqlBufferResultOpt
       sqlCacheOpt
-      sqlNoCacheOpt
       sqlCalcFoundRowsOpt
       selectExprList
       selectDataSetOpt
       {
-        return {
+        $$ = {
           type: 'Select',
           distinctOpt: $2,
           highPriorityOpt: $3,
@@ -183,18 +182,17 @@ selectClause
           sqlBigResultOpt: $7,
           sqlBufferResultOpt: $8,
           sqlCacheOpt: $9,
-          sqlNoCacheOpt: $10,
-          sqlCalcFoundRowsOpt: $11,
-          selectExprList: $12,
-          from: $13.from,
-          partition: $13.partition,
-          where: $13.where,
-          groupBy: $13.groupBy,
-          having: $13.having,
-          orderBy: $13.orderBy,
-          limit: $13.limit,
-          procedure: $13.procedure,
-          updateLockMode: $13.updateLockMode
+          sqlCalcFoundRowsOpt: $10,
+          selectItems: $11,
+          from: $12.from,
+          partition: $12.partition,
+          where: $12.where,
+          groupBy: $12.groupBy,
+          having: $12.having,
+          orderBy: $12.orderBy,
+          limit: $12.limit,
+          procedure: $12.procedure,
+          updateLockMode: $12.updateLockMode
         }
       }
   ;
@@ -206,44 +204,41 @@ distinctOpt
   | { $$ = null }
   ;
 highPriorityOpt
-  : HIGH_PRIORITY { $$ = true }
+  : HIGH_PRIORITY { $$ = $1 }
   | { $$ = null }
   ;
 maxStateMentTimeOpt
   : MAX_STATEMENT_TIME '=' NUMERIC { $$ = $3 }
   | { $$ = null }
   ;
 straightJoinOpt
-  : STRAIGHT_JOIN { $$ = true }
+  : STRAIGHT_JOIN { $$ = $1 }
   | { $$ = null }
   ;
 sqlSmallResultOpt
-  : SQL_SMALL_RESULT { $$ = true }
+  : SQL_SMALL_RESULT { $$ = $1 }
   | { $$ = null }
   ;
 sqlBigResultOpt
-  : SQL_BIG_RESULT { $$ = true }
+  : SQL_BIG_RESULT { $$ = $1 }
   | { $$ = null }
   ;
 sqlBufferResultOpt
-  : SQL_BUFFER_RESULT { $$ = true }
+  : SQL_BUFFER_RESULT { $$ = $1 }
   | { $$ = null }
   ;
 sqlCacheOpt
-  : SQL_CACHE { $$ = true }
-  | { $$ = null }
-  ;
-sqlNoCacheOpt
-  : SQL_NO_CACHE { $$ = true }
-  | { $$ = null }
+  : { $$ = null }
+  | SQL_CACHE { $$ = $1 }
+  | SQL_NO_CACHE { $$ = $1 }
   ;
 sqlCalcFoundRowsOpt
-  : SQL_CALC_FOUND_ROWS { $$ = true }
+  : SQL_CALC_FOUND_ROWS { $$ = $1 }
   | { $$ = null }
   ;
 selectExprList
-  : selectExprList ',' selectExpr { $3.type = 'SelectExpr'; $$.push($3); }
-  | selectExpr { $1.type = 'SelectExpr'; $$ = [ $1 ]; }
+  : selectExprList ',' selectExpr { $1.value.push($3); }
+  | selectExpr { $$ = { type: 'SelectExpr', value: [ $1 ] } }
   ;
 selectExpr
   : '*' { $$ = { value: $1 } }
@@ -393,10 +388,10 @@ expr
   : boolean_primary { $$ = $1 }
   | boolean_primary IS not_opt boolean_extra { $$ = { type: 'IsExpression', hasNot: $3, left: $1, right: $4 } }
   | NOT expr { $$ = { type: 'NotExpression', value: $2 } }
-  | expr '&&' expr { $$ = { type: 'AndOpExpression', left: $1, right: $3 } }
-  | expr '||' expr { $$ = { type: 'OrOpExpression', left: $1, right: $3 } }
-  | expr OR expr { $$ = { type: 'OrExpression', left: $1, right: $3 } }
-  | expr AND expr { $$ = { type: 'AndExpression', left: $1, right: $3 } }
+  | expr '&&' expr { $$ = { type: 'AndExpression', operator: $2, left: $1, right: $3 } }
+  | expr '||' expr { $$ = { type: 'OrExpression', operator: $2, left: $1, right: $3 } }
+  | expr OR expr { $$ = { type: 'OrExpression', operator: $2, left: $1, right: $3 } }
+  | expr AND expr { $$ = { type: 'AndExpression', operator: $2, left: $1, right: $3 } }
   | expr XOR expr { $$ = { type: 'XORExpression', left: $1, right: $3 } }
   ;
 expr_list

src/sqlParser.jison

@@ -0,0 +1,107 @@
+if (!sqlParser) {
+  sqlParser = {};
+}
+
+function Sql() {
+  this.buffer = '';
+}
+
+sqlParser.stringify = function (ast) {
+  var sql = new Sql();
+  sql.strigifyMain(ast);
+  return sql.buffer;
+}
+
+Sql.prototype.appendKeyword = function(keyword) {
+  this.buffer += keyword.toUpperCase() + ' ';
+}
+Sql.prototype.append = function(word) {
+  this.buffer += word + ' ';
+}
+Sql.prototype.strigifyMain = function(ast) {
+  this.stringifySelectClause(ast.value);
+}
+Sql.prototype.stringifySelectClause = function(ast) {
+  this.appendKeyword('select');
+  if (ast.distinctOpt) {
+    this.appendKeyword(ast.distinctOpt);
+  }
+  if (ast.highPriorityOpt) {
+    this.appendKeyword(ast.highPriorityOpt);
+  }
+  if (ast.maxStateMentTimeOpt) {
+    this.append('MAX_STATEMENT_TIME = ' + ast.maxStateMentTimeOpt);
+  }
+  if (ast.straightJoinOpt) {
+    this.appendKeyword(ast.straightJoinOpt);
+  }
+  if (ast.sqlSmallResultOpt) {
+    this.appendKeyword(ast.sqlSmallResultOpt);
+  }
+  if (ast.sqlBigResultOpt) {
+    this.appendKeyword(ast.sqlBigResultOpt);
+  }
+  if (ast.sqlBufferResultOpt) {
+    this.appendKeyword(ast.sqlBufferResultOpt);
+  }
+  if (ast.sqlCacheOpt) {
+    this.appendKeyword(ast.sqlCacheOpt);
+  }
+  if (ast.sqlCalcFoundRowsOpt) {
+    this.appendKeyword(ast.sqlCalcFoundRowsOpt);
+  }
+  if (ast.selectItems) {
+    this.stringifySelectItems(ast.selectItems);
+  }
+}
+Sql.prototype.stringifySelectItems = function (ast) {
+  var exprList = ast.value;
+  for (var i = 0; i < exprList.length; i++) {
+    this.stringifySelectExpr(exprList[i]);
+    if (i > 0) {
+      this.append(',');
+    }
+  }
+}
+Sql.prototype.stringifySelectExpr = function (ast) {
+  if (typeof ast === 'string') {
+    return this.append(ast);
+  }
+  this.stringifyExpr(ast);
+  if (ast.alias) {
+    if (ast.hasAs) {
+      this.appendKeyword('as');
+    }
+    this.append(ast.alias);
+  }
+}
+Sql.prototype.stringifyExpr = function (ast) {
+  switch (ast.type) {
+    case 'IsExpression':
+      this.stringifyBooleanPrimary(ast);
+      this.appendKeyword('in');
+      if (ast.hasNot) {
+        this.appendKeyword('not');
+      }
+      this.append(ast.right.value);
+      break;
+    case 'NotExpression':
+      this.appendKeyword('not');
+      this.stringifyExpr(ast.value);
+      break;
+    case 'OrExpression':
+    case 'AndExpression':
+    case 'XORExpression':
+      this.stringifyExpr(ast.left);
+      this.appendKeyword(ast.operator);
+      this.stringifyExpr(ast.right);
+      break;
+    default:
+      this.stringifyBooleanPrimary(ast);
+      break;
+  }
+}
+Sql.prototype.stringifyBooleanPrimary = function () {
+  ;
+}
+

src/stringify.js

@@ -1,4 +1,3 @@
-
 var root = this
 // AMD / RequireJS
 if (typeof define !== 'undefined' && define.amd) {

src/suffix.js

@@ -10,6 +10,9 @@ const testParser = function (sql) {
     console.log(
       JSON.stringify(ast, null, 2)
     );
+    console.log(
+      parser.stringify(ast)
+    );
   }
 
   return ast;
@@ -54,15 +57,17 @@ describe('simple sql support', function () {
 
   it ('test6', function () {
     testParser(`
-      SELECT fm_customer.lname AS 名字1,
-          fm_customer.fname AS 名字2,
-              fm_customer.address1 AS 地址1,fm_customer.phone1 AS 电话1,fm_customer.yearly_income AS 年收入,fm_customer.num_cars_owned AS 拥有车辆数 FROM fm_customer inner join fm_sales_link on fm_customer.customer_id = fm_sales_link.fm_customer.customer_id AND fm_sales_link.store_sales IS NOT NULL\nAND fm_sales_link.store_cost IS NOT NULL\nAND fm_sales_link.unit_sales IS NOT NULL inner join fm_store on fm_sales_link.fm_store.store_id = fm_store.store_id AND fm_store.store_name IS NOT NULL
+      select in中文 from tags
     `);
   });
 
   it ('test7', function () {
     testParser(`
-      select in中文 from tags
+      SELECT distinct high_priority MAX_STATEMENT_TIME=1 STRAIGHT_JOIN SQL_SMALL_RESULT
+      SQL_BIG_RESULT SQL_BUFFER_RESULT SQL_CACHE SQL_CALC_FOUND_ROWS
+      fm_customer.lname AS 名字1,
+          fm_customer.fname AS 名字2,
+              fm_customer.address1 AS 地址1,fm_customer.phone1 AS 电话1,fm_customer.yearly_income AS 年收入,fm_customer.num_cars_owned AS 拥有车辆数 FROM fm_customer inner join fm_sales_link on fm_customer.customer_id = fm_sales_link.fm_customer.customer_id AND fm_sales_link.store_sales IS NOT NULL\nAND fm_sales_link.store_cost IS NOT NULL\nAND fm_sales_link.unit_sales IS NOT NULL inner join fm_store on fm_sales_link.fm_store.store_id = fm_store.store_id AND fm_store.store_name IS NOT NULL
     `);
   });
 });