X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Fbind_transport.t;h=bafe8e99e5aed2096bcecfb9431c35a2fd5ad735;hb=556c4fe6aae477e7f9c9d910316dd2132787593f;hp=98baa4fd7542cbff31bef4da58d1317b9a40e4a9;hpb=0542ec57a03300b96f3680c02d4a3290c8922255;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/sqlmaker/bind_transport.t b/t/sqlmaker/bind_transport.t
index 98baa4f..bafe8e9 100644
--- a/t/sqlmaker/bind_transport.t
+++ b/t/sqlmaker/bind_transport.t
@@ -1,17 +1,25 @@
 use strict;
 use warnings;
+
 use Test::More;
+use Test::Exception;
+use Math::BigInt;
 
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
+use DBIx::Class::SQLMaker::LimitDialects;
+
+my ($ROWS, $OFFSET) = (
+   DBIx::Class::SQLMaker::LimitDialects->__rows_bindtype,
+   DBIx::Class::SQLMaker::LimitDialects->__offset_bindtype,
+);
 
 my $schema = DBICTest->init_schema();
 
-my $ne_bind = [ _ne => 'bar' ];
 my $rs = $schema->resultset('CD')->search({ -and => [
-  'me.artist' => { '!=', 'foo' },
-  'me.artist' => { '!=', \[ '?', $ne_bind ] },
+  'me.artist' => { '!=', '666' },
+  'me.artist' => { '!=', \[ '?', [ _ne => 'bar' ] ] },
 ]});
 
 # bogus sql query to make sure bind composition happens properly
@@ -37,17 +45,19 @@ for (1,2) {
       GROUP BY me.cdid, me.artist - ?
       HAVING me.artist < ?
       ORDER BY me.artist * ?
-      LIMIT 1 OFFSET 2
+      LIMIT ? OFFSET ?
     )',
     [
-      [ 'me.artist' => 'foo' ],
-      $ne_bind,
-      [ _add => 1 ],
-      [ 'me.artist' => 'foo' ],
-      $ne_bind,
-      [ _sub => 2 ],
-      [ _lt => 3 ],
-      [ _mu => 4 ],
+      [ { sqlt_datatype => 'integer', dbic_colname => 'me.artist' } => 666 ],
+      [ { dbic_colname => '_ne' } => 'bar' ],
+      [ { dbic_colname => '_add' } => 1 ],
+      [ { sqlt_datatype => 'integer', dbic_colname => 'me.artist' } => 666 ],
+      [ { dbic_colname => '_ne' } => 'bar' ],
+      [ { dbic_colname => '_sub' } => 2 ],
+      [ { dbic_colname => '_lt' } => 3 ],
+      [ { dbic_colname => '_mu' } => 4 ],
+      [ $ROWS => 1 ],
+      [ $OFFSET => 2 ],
     ],
     'Correct crazy sql',
   );
@@ -56,4 +66,105 @@ for (1,2) {
 # see if we get anything back at all
 isa_ok ($complex_rs->next, 'DBIx::Class::Row');
 
+# Make sure that the bind shorthand syntax translation is accurate (and doesn't error)
+shorthand_check(
+  [ _sub => 2 ],
+  [ { dbic_colname => '_sub' } => 2 ],
+  '[ $name => $val ] === [ { dbic_colname => $name }, $val ]',
+);
+shorthand_check(
+  [ artist => 2 ],
+  [ { dbic_colname => 'artist', sqlt_datatype => 'integer' } => 2 ],
+  'resolution of known column during [ $name => $val ] === [ { dbic_colname => $name }, $val ]',
+);
+shorthand_check(
+  [ \ 'number' => 2 ],
+  [ { sqlt_datatype => 'number' } => 2 ],
+  '[ \$dt => $val ] === [ { sqlt_datatype => $dt }, $val ]',
+);
+shorthand_check(
+  [ {} => 2 ],
+  [ {} => 2 ],
+  '[ {} => $val ] === [ {}, $val ]',
+);
+shorthand_check(
+  [ undef, 2 ],
+  [ {} => 2 ],
+  '[ undef, $val ] === [ {}, $val ]',
+);
+shorthand_check(
+  2,
+  [ {} => 2 ],
+  '$val === [ {}, $val ]',
+);
+
+shorthand_check(
+  Math::BigInt->new(42),
+  [ {} => Math::BigInt->new(42) ],
+  'stringifyable $object === [ {}, $object ]',
+);
+
+throws_ok {
+  shorthand_check(
+    [ 2 ],
+    [],
+  )
+} qr !You must supply a datatype/bindtype .+ for non-scalar value  \Q[ 2 ]!,
+  'exception on bare array bindvalue';
+
+throws_ok {
+  shorthand_check(
+    [ {} => [ 2 ] ],
+    [],
+  )
+} qr !You must supply a datatype/bindtype .+ for non-scalar value  \Q[ 2 ]!,
+  'exception on untyped array bindvalue';
+
+throws_ok {
+  shorthand_check(
+    [ {}, 2, 3 ],
+    [],
+  )
+} qr !You must supply a datatype/bindtype .+ for non-scalar value  \[ 'HASH\(\w+\)', 2, 3 \]!,
+  'exception on bare multielement array bindvalue';
+
+throws_ok {
+  shorthand_check(
+    bless( {}, 'Foo'),
+    [],
+  )
+} qr !You must supply a datatype/bindtype .+ for non-scalar value  \Qbless( {}, 'Foo' )!,
+  'exception on bare object';
+
+throws_ok {
+  shorthand_check(
+    [ {}, bless( {}, 'Foo') ],
+    [],
+  )
+} qr !You must supply a datatype/bindtype .+ for non-scalar value  \Qbless( {}, 'Foo' )!,
+  'exception on untyped object';
+
+
+sub shorthand_check {
+  my ($bind_shorthand, $bind_expected, $testname) = @_;
+
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+  is_same_sql_bind (
+    $schema->resultset('CD')->search({}, {
+      columns => [qw(cdid artist)],
+      group_by => ['cdid', \[ 'artist - ?', $bind_shorthand ] ],
+    })->as_query,
+    '(
+      SELECT me.cdid, me.artist
+        FROM cd me
+      GROUP BY cdid, artist - ?
+    )',
+    [ $bind_expected ],
+    $testname||(),
+  );
+}
+
+undef $schema;
+
 done_testing;