v.1.1.0 contd,

* parse and cache GrammarTemplate clauses once and re-use in subsequent calls

Author: foo123

src/js/Dialect.js

@@ -1745,6 +1745,11 @@ function Dialect( type )
     self.q  = Dialect.dialects[ self.type ][ 'quotes' ][ 0 ];
     self.qn = Dialect.dialects[ self.type ][ 'quotes' ][ 1 ];
     self.e  = Dialect.dialects[ self.type ][ 'quotes' ][ 2 ] || ['','','',''];
+    if ( !(self.clauses instanceof Dialect.GrammarTemplate) )
+    {
+        self.clauses = new Dialect.GrammarTemplate( self.clauses );
+        Dialect.dialects[ self.type ][ 'clauses' ] = self.clauses;
+    }
 }
 Dialect.VERSION = "1.1.0";
 //Dialect.TPL_RE = /\$\(([^\)]+)\)/g;
@@ -1852,8 +1857,8 @@ Dialect[PROTO] = {
         self.tbls = { };
         self.cols = { };
         self.clau = clause;
-        if ( !(self.clauses/*[ self.clau ]*/ instanceof Dialect.GrammarTemplate) )
-            self.clauses/*[ self.clau ]*/ = new Dialect.GrammarTemplate( self.clauses/*[ self.clau ]*/ );
+        //if ( !(self.clauses/*[ self.clau ]*/ instanceof Dialect.GrammarTemplate) )
+        //    self.clauses/*[ self.clau ]*/ = new Dialect.GrammarTemplate( self.clauses/*[ self.clau ]*/ );
         return self;
     }
 

src/js/Dialect.min.js

@@ -1686,6 +1686,11 @@ public function __construct( $type='mysql' )
         $this->q = self::$dialects[ $this->type ][ 'quotes' ][ 0 ];
         $this->qn = self::$dialects[ $this->type ][ 'quotes' ][ 1 ];
         $this->e = isset(self::$dialects[ $this->type ][ 'quotes' ][ 2 ]) ? self::$dialects[ $this->type ][ 'quotes' ][ 2 ] : array('','','','');
+        if ( !($this->clauses instanceof GrammarTemplate) )
+        {
+            $this->clauses = new GrammarTemplate($this->clauses);
+            self::$dialects[ $this->type ][ 'clauses' ] = $this->clauses;
+        }
     }
 
     public function dispose( )
@@ -1773,8 +1778,8 @@ public function reset( $clause )
         $this->cols = array( );
         $this->clau = $clause;
 
-        if ( !($this->clauses/*[ $this->clau ]*/ instanceof GrammarTemplate) )
-            $this->clauses/*[ $this->clau ]*/ = new GrammarTemplate( $this->clauses/*[ $this->clau ]*/ );
+        //if ( !($this->clauses/*[ $this->clau ]*/ instanceof GrammarTemplate) )
+        //    $this->clauses/*[ $this->clau ]*/ = new GrammarTemplate( $this->clauses/*[ $this->clau ]*/ );
         return $this;
     }
 

src/php/Dialect.php

@@ -1514,6 +1514,10 @@ def __init__( self, type='mysql' ):
         self.q = Dialect.dialects[ self.type ][ 'quotes' ][ 0 ]
         self.qn = Dialect.dialects[ self.type ][ 'quotes' ][ 1 ]
         self.e = Dialect.dialects[ self.type ][ 'quotes' ][ 2 ] if 1 < len(Dialect.dialects[ self.type ][ 'quotes' ]) else ['','','','']
+        if not isinstance(self.clauses, Dialect.GrammarTemplate):
+            self.clauses = Dialect.GrammarTemplate(self.clauses)
+            Dialect.dialects[ self.type ][ 'clauses' ] = self.clauses
+
 
     def __del__( self ):
         self.dispose()
@@ -1581,8 +1585,8 @@ def reset( self, clause ):
         self.clau = clause
         #if not isinstance(self.clauses[ self.clau ], Dialect.GrammarTemplate):
         #    self.clauses[ self.clau ] = Dialect.GrammarTemplate( self.clauses[ self.clau ] )
-        if not isinstance(self.clauses, Dialect.GrammarTemplate):
-            self.clauses = Dialect.GrammarTemplate( self.clauses )
+        #if not isinstance(self.clauses, Dialect.GrammarTemplate):
+        #    self.clauses = Dialect.GrammarTemplate( self.clauses )
         return self
 
     def clear( self ):