Now custom value handler receives as a second argument hash of options a...

squel-basic.js

@@ -275,11 +275,14 @@ OTHER DEALINGS IN THE SOFTWARE.
       return value.replace(/\'/g, this.options.singleQuoteReplacement);
     };
 
-    BaseBuilder.prototype._formatCustomValue = function(value) {
+    BaseBuilder.prototype._formatCustomValue = function(value, formattingOptions) {
       var customHandler;
+      if (formattingOptions == null) {
+        formattingOptions = {};
+      }
       customHandler = getValueHandler(value, this.options.valueHandlers, cls.globalValueHandlers);
       if (customHandler) {
-        value = customHandler(value);
+        value = customHandler(value, formattingOptions);
       }
       return value;
     };
@@ -310,7 +313,7 @@ OTHER DEALINGS IN THE SOFTWARE.
       if (formattingOptions == null) {
         formattingOptions = {};
       }
-      value = this._formatCustomValue(value);
+      value = this._formatCustomValue(value, formattingOptions);
       if (Array.isArray(value)) {
         value = value.map(function(v) {
           return _this._formatValue(v);

squel.js

@@ -276,11 +276,14 @@ OTHER DEALINGS IN THE SOFTWARE.
       return value.replace(/\'/g, this.options.singleQuoteReplacement);
     };
 
-    BaseBuilder.prototype._formatCustomValue = function(value) {
+    BaseBuilder.prototype._formatCustomValue = function(value, formattingOptions) {
       var customHandler;
+      if (formattingOptions == null) {
+        formattingOptions = {};
+      }
       customHandler = getValueHandler(value, this.options.valueHandlers, cls.globalValueHandlers);
       if (customHandler) {
-        value = customHandler(value);
+        value = customHandler(value, formattingOptions);
       }
       return value;
     };
@@ -311,7 +314,7 @@ OTHER DEALINGS IN THE SOFTWARE.
       if (formattingOptions == null) {
         formattingOptions = {};
       }
-      value = this._formatCustomValue(value);
+      value = this._formatCustomValue(value, formattingOptions);
       if (Array.isArray(value)) {
         value = value.map(function(v) {
           return _this._formatValue(v);

src/squel.coffee

@@ -251,12 +251,12 @@ class cls.BaseBuilder extends cls.Cloneable
     value.replace /\'/g, @options.singleQuoteReplacement
 
   # Format the given custom value
-  _formatCustomValue: (value) ->
+  _formatCustomValue: (value, formattingOptions = {}) ->
     # user defined custom handlers takes precedence
     customHandler = getValueHandler(value, @options.valueHandlers, cls.globalValueHandlers)
     if customHandler
       # use the custom handler if available
-      value = customHandler(value)
+      value = customHandler(value, formattingOptions)
 
     value
 
@@ -275,7 +275,7 @@ class cls.BaseBuilder extends cls.Cloneable
 
   # Format the given field value for inclusion into the query string
   _formatValue: (value, formattingOptions = {}) ->
-    value = @_formatCustomValue(value)
+    value = @_formatCustomValue(value, formattingOptions)
 
     # if it's an array then format each element separately
     if Array.isArray(value)
@@ -1569,5 +1569,3 @@ squel.useFlavour = (flavour) ->
   else
     throw new Error "Flavour not available: #{flavour}"
   squel
-
-

test/baseclasses.test.coffee

@@ -643,6 +643,13 @@ test['Builder base class'] =
       test.mocker.stub @inst, '_formatCustomValue', -> 'abc'
       assert.same "'abc'", @inst._formatValue(123)
 
+    'Custom value - dont quote option': ->
+      class SqlDefault
+      @inst.registerValueHandler SqlDefault, (v, formattingOptions) ->
+        formattingOptions.dontQuote = true
+        'DEFAULT'
+      assert.same "DEFAULT", @inst._formatValue(new SqlDefault())
+
 
 
 test['QueryBuilder base class'] =