pass string flag to subquery

Di Wu · Di Wu · commit bfa041bc3526 · 2013-06-15T20:24:18.000-07:00
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -77,14 +77,15 @@ Postgres.prototype.getQuery = function(queryNode) {
 
 Postgres.prototype.getString = function(queryNode) {
   // switch off parameter placeholders
+  var previousFlagStatus = this._disableParameterPlaceholders;
   this._disableParameterPlaceholders = true;
   var query;
   try {
     // use the same code path for query building
     query = this.getQuery(queryNode);
   } finally {
-    // always toggle parameter placeholders on afterwards
-    this._disableParameterPlaceholders = false;
+    // always restore the flag afterwards
+    this._disableParameterPlaceholders = previousFlagStatus;
   }
   return query.text;
 };
@@ -390,9 +391,22 @@ Postgres.prototype.visitQuery = function(queryNode) {
 };
 
 Postgres.prototype.visitSubquery = function(queryNode) {
+  // create another query builder of the current class to build the subquery
   var subQuery = new this._myClass();
+
+  // let the subquery modify this instance's params array
   subQuery.params = this.params;
-  subQuery.visitQuery(queryNode);
+
+  // pass on the disable parameter placeholder flag
+  var previousFlagStatus = subQuery._disableParameterPlaceholders;
+  subQuery._disableParameterPlaceholders = this._disableParameterPlaceholders;
+  try {
+    subQuery.visitQuery(queryNode);
+  } finally {
+    // restore the flag
+    subQuery._disableParameterPlaceholders = previousFlagStatus;
+  }
+
   var alias = queryNode.alias;
   return '(' + subQuery.output.join(' ') + ')' + (alias ? ' ' + alias : '');
 };
