From: Arthur Axel 'fREW' Schmidt <frioux@gmail.com>
Date: Sat, 2 Apr 2011 14:30:54 +0000 (-0500)
Subject: auto transform datetime args to -dt_$foo
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5972c6a74e11198674d04b1ac3813fc99c1d013c;p=dbsrgits%2FDBIx-Class.git

auto transform datetime args to -dt_$foo
---

diff --git a/lib/DBIx/Class/SQLMaker/DateOps.pm b/lib/DBIx/Class/SQLMaker/DateOps.pm
index a165109..8029b17 100644
--- a/lib/DBIx/Class/SQLMaker/DateOps.pm
+++ b/lib/DBIx/Class/SQLMaker/DateOps.pm
@@ -8,6 +8,7 @@ use base qw/
 /;
 __PACKAGE__->mk_group_accessors (simple => qw/datetime_parser/);
 use Sub::Name 'subname';
+use Scalar::Util 'blessed';
 
 sub _where_op_CONVERT_DATETIME {
   my $self = shift;
@@ -74,23 +75,7 @@ sub _where_op_GET_DATETIME {
   my $part = $vals->[0];
   my $val  = $vals->[1];
 
-  my ($sql, @bind) = $self->_SWITCH_refkind($val, {
-     SCALAR => sub {
-       return ($self->_convert('?'), $self->_bindtype($k, $val) );
-     },
-     SCALARREF => sub {
-       return $$val;
-     },
-     ARRAYREFREF => sub {
-       my ($sql, @bind) = @$$val;
-       $self->_assert_bindval_matches_bindtype(@bind);
-       return ($sql, @bind);
-     },
-     HASHREF => sub {
-       my $method = $self->_METHOD_FOR_refkind("_where_hashpair", $val);
-       $self->$method('', $val);
-     }
-  });
+  my ($sql, @bind) = $self->_dt_arg_transform('', $val);
 
   if (!ref $part) {
     return $self->_datetime_sql($part, $sql), @bind;
@@ -156,7 +141,26 @@ sub _reorder_add_datetime_vars {
 }
 
 sub _dt_arg_transform {
+   my $self = shift;
+
+   my ($k, $val) = @_;
+
+   if (blessed $val && $val->isa('DateTime')) {
+     return (
+       $self->_convert('?'),
+       [
+         \'timestamp',
+         $self->datetime_parser->format_datetime($val)
+       ]
+     )
+   }
+
+   $self->_dt_arg_non_date_transform(@_);
+}
+
+sub _dt_arg_non_date_transform {
   my ($self, $k, $val) = @_;
+
   my ($sql, @bind) = $self->_SWITCH_refkind($val, {
      SCALAR => sub {
        return ($self->_convert('?'), $self->_bindtype($k, $val) );
@@ -177,7 +181,7 @@ sub _dt_arg_transform {
   return ($sql, @bind);
 }
 
-sub _where_op_ADD_DATETIME_transform_args { $_[0]->_dt_arg_transform($_[2], $_[3]) }
+sub _where_op_ADD_DATETIME_transform_args { $_[0]->_dt_arg_non_date_transform($_[2], $_[3]) }
 
 sub _where_op_ADD_DATETIME {
   my ($self) = @_;
@@ -243,7 +247,7 @@ sub _where_op_DIFF_DATETIME {
   @val = $self->_reorder_diff_datetime_vars(@val);
   my (@all_sql, @all_bind);
   foreach my $val (@val) {
-    my ($sql, @bind) = $self->_dt_arg_transform($k, $val);
+    my ($sql, @bind) = $self->_dt_arg_non_date_transform($k, $val);
     push @all_sql, $sql;
     push @all_bind, @bind;
   }
@@ -266,7 +270,7 @@ sub _where_op_CIRCA_DATETIME {
      $val = $_[3];
   }
 
-  my ($sql, @bind) = $self->_dt_arg_transform($k, $val);
+  my ($sql, @bind) = $self->_dt_arg_non_date_transform($k, $val);
 
   my ($equal, $before, $after) = $op =~ /dt_(on_or_)?(before)?(after)?/;
   my $sym = $before
diff --git a/t/sqlmaker/op_dt.t b/t/sqlmaker/op_dt.t
index 5b40621..fc3909d 100644
--- a/t/sqlmaker/op_dt.t
+++ b/t/sqlmaker/op_dt.t
@@ -226,6 +226,7 @@ my @tests = (
   },
 
   {
+    msg    => '-dt_year works',
     search => { 'me.id' => 1 },
     select => [ [ -dt_year => { -ident => 'me.created_on' } ] ],
     as     => [ 'year' ],
@@ -259,7 +260,43 @@ my @tests = (
       bind   => [[{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
       hri    => [{ year => 2010 }],
     },
-    msg    => '-dt_year works',
+  },
+
+  {
+    msg    => '-dt_year works with DateTime obj',
+    search => { 'me.id' => 1 },
+    select => [ [ -dt_year => $date ] ],
+    as     => [ 'year' ],
+    mssql => {
+      select => "DATEPART(year, ?)",
+      where => "me.id = ?",
+      bind   => [[{ sqlt_datatype => 'timestamp' } => '2010-12-14 12:12:12.000' ], [{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
+      hri    => [{ year => 2010 }],
+    },
+    mysql => {
+      select => "EXTRACT(YEAR FROM ?)",
+      where => "me.id = ?",
+      bind   => [[{ sqlt_datatype => 'timestamp' } => '2010-12-14 12:12:12' ], [{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
+      hri    => [{ year => 2010 }],
+    },
+    sqlite => {
+      select => "STRFTIME('%Y', ?)",
+      where => "me.id = ?",
+      bind   => [[{ sqlt_datatype => 'timestamp' } => '2010-12-14 12:12:12' ], [{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
+      hri    => [{ year => 2010 }],
+    },
+    postgres => {
+      select => "date_part('year', ?)",
+      where => "me.id = ?",
+      bind   => [[{ sqlt_datatype => 'timestamp' } => '2010-12-14 12:12:12' ], [{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
+      hri    => [{ year => 2010 }],
+    },
+    oracle => {
+      select => "EXTRACT(year FROM ?)",
+      where => "me.id = ?",
+      bind   => [[{ sqlt_datatype => 'timestamp' } => '2010-12-14 12:12:12' ], [{ dbic_colname => 'me.id', sqlt_datatype => 'integer' } => 1 ]],
+      hri    => [{ year => 2010 }],
+    },
   },
 
   {