fix mssql

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / SQLMaker / MSSQL.pm

diff --git a/lib/DBIx/Class/SQLMaker/MSSQL.pm b/lib/DBIx/Class/SQLMaker/MSSQL.pm
index 96f0993..f3eda14 100644 (file)
--- a/lib/DBIx/Class/SQLMaker/MSSQL.pm
+++ b/lib/DBIx/Class/SQLMaker/MSSQL.pm
@@ -56,8 +56,9 @@ sub _datetime_now_sql { 'NOW()' }
     die $self->_unsupported_date_adding($part, 'Microsoft SQL Server')
       unless exists $diff_part_map{$part};
 
-    my $placeholder = $self->_convert('?');
-    return "(DATEADD($diff_part_map{$part}, $amount, $date))"
+    return "(DATEADD($diff_part_map{$part}, " .
+      ($self->using_freetds && $amount eq '?' ? "CAST($amount AS INTEGER)" : $amount )
+      . ", $date))"
   }
 }
 
@@ -91,4 +92,14 @@ The function used to diff dates is C<DATEDIFF>, which supports
 
 =cut
 
+sub _where_op_ADD_DATETIME_transform_args {
+   my ($self, $i, $k, $val) = @_;
+
+   if ($i == 0 && !ref $val) {
+      return $self->_convert('?'), [\'integer' => $val ]
+   } else {
+      return $self->next::method($i, $k, $val)
+   }
+}
+
 1;