Merge pull request #24 from komali2/master

Change "refrence" to "reference" in all instances

Author: albin3

src/sqlParser.jison

@@ -10,7 +10,7 @@
 [-][-]\s.*\n                                                      /* skip sql comments */
 [#]\s.*\n                                                         /* skip sql comments */
 \s+                                                               /* skip whitespace */
-                                                                  
+
 [`][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[`]            return 'IDENTIFIER'
 [\w]+[\u4e00-\u9fa5]+[0-9a-zA-Z_\u4e00-\u9fa5]*                   return 'IDENTIFIER'
 [\u4e00-\u9fa5][0-9a-zA-Z_\u4e00-\u9fa5]*                         return 'IDENTIFIER'
@@ -117,7 +117,7 @@ UNION                                                             return 'UNION'
 "{"                                                               return '{'
 "}"                                                               return '}'
 ";"                                                               return ';'
-                                                                 
+
 ['](\\.|[^'])*[']                                                 return 'STRING'
 ["](\\.|[^"])*["]                                                 return 'STRING'
 [0][x][0-9a-fA-F]+                                                return 'HEX_NUMERIC'
@@ -127,7 +127,7 @@ UNION                                                             return 'UNION'
 [a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*                  return 'IDENTIFIER'
 \.                                                                return 'DOT'
 ['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["']          return 'QUOTED_IDENTIFIER'
-                                                                 
+
 <<EOF>>                                                           return 'EOF'
 .                                                                 return 'INVALID'
 
@@ -189,7 +189,7 @@ unionClauseNotParenthesized
   ;
 
 selectClause
-  : SELECT 
+  : SELECT
       distinctOpt
       highPriorityOpt
       maxStateMentTimeOpt
@@ -228,7 +228,7 @@ selectClause
   ;
 
 distinctOpt
-  : ALL { $$ = $1 } 
+  : ALL { $$ = $1 }
   | DISTINCT { $$ = $1 }
   | DISTINCTROW { $$ = $1 }
   | { $$ = null }
@@ -361,7 +361,7 @@ simple_expr
   ;
 bit_expr
   : simple_expr { $$ = $1 }
-  | bit_expr '|' bit_expr { $$ = { type: 'BitExpression', operator: '|', left: $1, right: $3 } } 
+  | bit_expr '|' bit_expr { $$ = { type: 'BitExpression', operator: '|', left: $1, right: $3 } }
   | bit_expr '&' bit_expr { $$ = { type: 'BitExpression', operator: '&', left: $1, right: $3 } }
   | bit_expr '<<' bit_expr { $$ = { type: 'BitExpression', operator: '<<', left: $1, right: $3 } }
   | bit_expr '>>' bit_expr { $$ = { type: 'BitExpression', operator: '>>', left: $1, right: $3 } }
@@ -494,12 +494,12 @@ selectDataSetOpt
     { $$ = { from: $2, partition: $3, where: $4, groupBy: $5, having: $6, orderBy: $7, limit: $8, procedure: $9, updateLockMode: $10 } }
   ;
 table_refrences
-  : escaped_table_reference { $$ = { type: 'TableRefrences', value: [ $1 ] } }
+  : escaped_table_reference { $$ = { type: 'TableReferences', value: [ $1 ] } }
   | table_refrences ',' escaped_table_reference %prec TABLE_REF_COMMA { $$ = $1; $1.value.push($3); }
   ;
 escaped_table_reference
-  : table_reference { $$ = { type: 'TableRefrence', value: $1 } }
-  | '{' OJ table_reference '}' { $$ = { type: 'TableRefrence', hasOj: true, value: $3 } }
+  : table_reference { $$ = { type: 'TableReference', value: $1 } }
+  | '{' OJ table_reference '}' { $$ = { type: 'TableReference', hasOj: true, value: $3 } }
   ;
 join_inner_cross
   : { $$ = null }

src/stringify.js

@@ -387,9 +387,9 @@ Sql.prototype.travelLimit = function (ast) {
     }
   }
 }
-Sql.prototype.travelTableRefrences = function (ast) {
+Sql.prototype.travelTableReferences = function (ast) {
   var list = ast.value;
-  if (ast.TableRefrences) {
+  if (ast.TableReferences) {
     this.append('(', false, true);
   }
   for (var i = 0; i < list.length; i++) {
@@ -398,11 +398,11 @@ Sql.prototype.travelTableRefrences = function (ast) {
       this.append(',', true);
     }
   }
-  if (ast.TableRefrences) {
+  if (ast.TableReferences) {
     this.append(')');
   }
 }
-Sql.prototype.travelTableRefrence = function (ast) {
+Sql.prototype.travelTableReference = function (ast) {
   if (ast.hasOj) {
     this.append('{');
     this.appendKeyword('oj');