X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Fdbihacks_internals.t;fp=t%2Fsqlmaker%2Fdbihacks_internals.t;h=0000000000000000000000000000000000000000;hb=497d0451bd98892c7bc2228c5ca82ca8592a5558;hp=4e34f13e662e6c0ae3ef3a6f19a13d4341494b31;hpb=50841788d03e2342a00470eb2f458e717922615b;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/sqlmaker/dbihacks_internals.t b/t/sqlmaker/dbihacks_internals.t
deleted file mode 100644
index 4e34f13..0000000
--- a/t/sqlmaker/dbihacks_internals.t
+++ /dev/null
@@ -1,686 +0,0 @@
-BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
-
-use strict;
-use warnings;
-use Test::More;
-use Test::Warn;
-use Test::Exception;
-
-
-use DBICTest ':DiffSQL';
-use DBIx::Class::_Util qw( UNRESOLVABLE_CONDITION dump_value );
-
-BEGIN {
-  if ( eval { require Test::Differences } ) {
-    no warnings 'redefine';
-    *is_deeply = \&Test::Differences::eq_or_diff;
-  }
-}
-
-my $schema = DBICTest->init_schema( no_deploy => 1);
-my $sm = $schema->storage->sql_maker;
-
-{
-  package # hideee
-    DBICTest::SillyInt;
-
-  use overload
-    fallback => 1,
-    '0+' => sub { ${$_[0]} },
-  ;
-}
-my $num = bless( \do { my $foo = 69 }, 'DBICTest::SillyInt' );
-
-is($num, 69, 'test overloaded object is "sane"');
-is("$num", 69, 'test overloaded object is "sane"');
-
-my @tests = (
-  {
-    where => { artistid => 1, charfield => undef },
-    cc_result => { artistid => 1, charfield => undef },
-    sql => 'WHERE artistid = ? AND charfield IS NULL',
-    efcc_result => { artistid => 1 },
-    efcc_n_result => { artistid => 1, charfield => undef },
-  },
-  {
-    where => { -and => [ artistid => 1, charfield => undef, { rank => 13 } ] },
-    cc_result => { artistid => 1, charfield => undef, rank => 13 },
-    sql => 'WHERE artistid = ?  AND charfield IS NULL AND rank = ?',
-    efcc_result => { artistid => 1, rank => 13 },
-    efcc_n_result => { artistid => 1, charfield => undef, rank => 13 },
-  },
-  {
-    where => { -and => [ { artistid => 1, charfield => undef}, { rank => 13 } ] },
-    cc_result => { artistid => 1, charfield => undef, rank => 13 },
-    sql => 'WHERE artistid = ?  AND charfield IS NULL AND rank = ?',
-    efcc_result => { artistid => 1, rank => 13 },
-    efcc_n_result => { artistid => 1, charfield => undef, rank => 13 },
-  },
-  {
-    where => { -and => [ -or => { name => 'Caterwauler McCrae' }, 'rank' ] },
-    cc_result => { name => 'Caterwauler McCrae', rank => undef },
-    sql => 'WHERE name = ? AND rank IS NULL',
-    efcc_result => { name => 'Caterwauler McCrae' },
-    efcc_n_result => { name => 'Caterwauler McCrae', rank => undef },
-  },
-  {
-    where => { -and => [ [ [ artist => {'=' => \'foo' } ] ], { name => \[ '= ?', 'bar' ] } ] },
-    cc_result => { artist => {'=' => \'foo' }, name => \[ '= ?', 'bar' ] },
-    sql => 'WHERE artist = foo AND name = ?',
-    efcc_result => { artist => \'foo' },
-  },
-  {
-    where => { -and => [ -or => { name => 'Caterwauler McCrae', artistid => 2 } ] },
-    cc_result => { -or => [ artistid => 2, name => 'Caterwauler McCrae' ] },
-    sql => 'WHERE artistid = ? OR name = ?',
-    efcc_result => {},
-  },
-  {
-    where => { -or => { name => 'Caterwauler McCrae', artistid => 2 } },
-    cc_result => { -or => [ artistid => 2, name => 'Caterwauler McCrae' ] },
-    sql => 'WHERE artistid = ? OR name = ?',
-    efcc_result => {},
-  },
-  {
-    where => { -and => [ \'foo=bar',  [ { artistid => { '=', $num } } ], { name => 'Caterwauler McCrae'} ] },
-    cc_result => { -and => [ \'foo=bar' ], name => 'Caterwauler McCrae', artistid => $num },
-    sql => 'WHERE foo=bar AND artistid = ? AND name = ?',
-    efcc_result => { name => 'Caterwauler McCrae', artistid => $num },
-  },
-  {
-    where => { -and => [ \'foo=bar',  [ { artistid => { '=', $num } } ], { name => 'Caterwauler McCrae'}, \'buzz=bozz' ] },
-    cc_result => { -and => [ \'foo=bar', \'buzz=bozz' ], name => 'Caterwauler McCrae', artistid => $num },
-    sql => 'WHERE foo=bar AND artistid = ? AND name = ? AND buzz=bozz',
-    collapsed_sql => 'WHERE foo=bar AND buzz=bozz AND artistid = ? AND name = ?',
-    efcc_result => { name => 'Caterwauler McCrae', artistid => $num },
-  },
-  {
-    where => { artistid => [ $num ], rank => [ 13, 2, 3 ], charfield => [ undef ] },
-    cc_result => { artistid => $num, charfield => undef, rank => [13, 2, 3] },
-    sql => 'WHERE artistid = ? AND charfield IS NULL AND ( rank = ? OR rank = ? OR rank = ? )',
-    efcc_result => { artistid => $num },
-    efcc_n_result => { artistid => $num, charfield => undef },
-  },
-  {
-    where => { artistid => { '=' => 1 }, rank => { '>' => 12 }, charfield => { '=' => undef } },
-    cc_result => { artistid => 1, charfield => undef, rank => { '>' => 12 } },
-    sql => 'WHERE artistid = ? AND charfield IS NULL AND rank > ?',
-    efcc_result => { artistid => 1 },
-    efcc_n_result => { artistid => 1, charfield => undef },
-  },
-  {
-    where => { artistid => { '=' => [ 1 ], }, charfield => { '=' => [ -AND => \'1', \['?',2] ] }, rank => { '=' => [ -OR => $num, $num ] } },
-    cc_result => { artistid => 1, charfield => [-and => { '=' => \['?',2] }, { '=' => \'1' } ], rank => { '=' => [$num, $num] } },
-    sql => 'WHERE artistid = ? AND charfield = 1 AND charfield = ? AND ( rank = ? OR rank = ? )',
-    collapsed_sql => 'WHERE artistid = ? AND charfield = ? AND charfield = 1 AND ( rank = ? OR rank = ? )',
-    efcc_result => { artistid => 1, charfield => UNRESOLVABLE_CONDITION },
-  },
-  {
-    where => { -and => [ artistid => 1, artistid => 2 ], name => [ -and => { '!=', 1 }, 2 ], charfield => [ -or => { '=', 2 } ], rank => [-and => undef, { '=', undef }, { '!=', 2 } ] },
-    cc_result => { artistid => [ -and => 1, 2 ], name => [ -and => { '!=', 1 }, 2 ], charfield => 2, rank => [ -and => { '!=', 2 }, undef ] },
-    sql => 'WHERE artistid = ? AND artistid = ? AND charfield = ? AND name != ? AND name = ? AND rank IS NULL AND rank IS NULL AND rank != ?',
-    collapsed_sql => 'WHERE artistid = ? AND artistid = ? AND charfield = ? AND name != ? AND name = ? AND rank != ? AND rank IS NULL',
-    efcc_result => {
-      artistid => UNRESOLVABLE_CONDITION,
-      name => 2,
-      charfield => 2,
-    },
-    efcc_n_result => {
-      artistid => UNRESOLVABLE_CONDITION,
-      name => 2,
-      charfield => 2,
-      rank => undef,
-    },
-  },
-  (map { {
-    where => $_,
-    sql => 'WHERE (rank = 13 OR charfield IS NULL OR artistid = ?) AND (artistid = ? OR charfield IS NULL OR rank != 42)',
-    collapsed_sql => 'WHERE (artistid = ? OR charfield IS NULL OR rank = 13) AND (artistid = ? OR charfield IS NULL OR rank != 42)',
-    cc_result => { -and => [
-      { -or => [ artistid => 1, charfield => undef, rank => { '=' => \13 } ] },
-      { -or => [ artistid => 1, charfield => undef, rank => { '!=' => \42 } ] },
-    ] },
-    efcc_result => {},
-    efcc_n_result => {},
-  } } (
-
-    { -and => [
-      -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ],
-      -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '!=' => \42 } },
-    ] },
-
-    {
-      -OR => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ],
-      -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '!=' => \42 } },
-    },
-
-  ) ),
-  {
-    where => { -or => [
-      -and => [ foo => { '!=', { -value => undef } }, bar => { -in => [ 69, 42 ] } ],
-      foo => { '=', { -value => undef } },
-      baz => { '!=' => { -ident => 'bozz' } },
-      baz => { -ident => 'buzz' },
-    ] },
-    sql => 'WHERE ( foo IS NOT NULL AND bar IN ( ?, ? ) ) OR foo IS NULL OR baz != bozz OR baz = buzz',
-    collapsed_sql => 'WHERE baz != bozz OR baz = buzz OR foo IS NULL OR ( bar IN ( ?, ? ) AND foo IS NOT NULL )',
-    cc_result => { -or => [
-      baz => { '!=' => { -ident => 'bozz' } },
-      baz => { '=' => { -ident => 'buzz' } },
-      foo => undef,
-      { bar => { -in => [ 69, 42 ] }, foo => { '!=', undef } }
-    ] },
-    efcc_result => {},
-  },
-  {
-    where => { -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => { '=' => 1 }, genreid => { '=' => \['?', 2] } ] },
-    sql => 'WHERE rank = 13 OR charfield IS NULL OR artistid = ? OR genreid = ?',
-    collapsed_sql => 'WHERE artistid = ? OR charfield IS NULL OR genreid = ? OR rank = 13',
-    cc_result => { -or => [ artistid => 1, charfield => undef, genreid => { '=' => \['?', 2] }, rank => { '=' => \13 } ] },
-    efcc_result => {},
-    efcc_n_result => {},
-  },
-  {
-    where => { -and => [
-      -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ],
-      -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '=' => \13 } },
-    ] },
-    cc_result => { -and => [
-      { -or => [ artistid => 1, charfield => undef, rank => { '=' => \13 } ] },
-      { -or => [ artistid => 1, charfield => undef, rank => { '=' => \13 } ] },
-    ] },
-    sql => 'WHERE (rank = 13 OR charfield IS NULL OR artistid = ?) AND (artistid = ? OR charfield IS NULL OR rank = 13)',
-    collapsed_sql => 'WHERE (artistid = ? OR charfield IS NULL OR rank = 13) AND (artistid = ? OR charfield IS NULL OR rank = 13)',
-    efcc_result => {},
-    efcc_n_result => {},
-  },
-  {
-    where => { -and => [
-      -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ],
-      -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '!=' => \42 } },
-      -and => [ foo => { '=' => \1 }, bar => 2 ],
-      -and => [ foo => 3, bar => { '=' => \4 } ],
-      -exists => \'(SELECT 1)',
-      -exists => \'(SELECT 2)',
-      -not => { foo => 69 },
-      -not => { foo => 42 },
-    ]},
-    sql => 'WHERE
-          ( rank = 13 OR charfield IS NULL OR artistid = ? )
-      AND ( artistid = ? OR charfield IS NULL OR rank != 42 )
-      AND foo = 1
-      AND bar = ?
-      AND foo = ?
-      AND bar = 4
-      AND (EXISTS (SELECT 1))
-      AND (EXISTS (SELECT 2))
-      AND NOT foo = ?
-      AND NOT foo = ?
-    ',
-    collapsed_sql => 'WHERE
-          ( artistid = ? OR charfield IS NULL OR rank = 13 )
-      AND ( artistid = ? OR charfield IS NULL OR rank != 42 )
-      AND (EXISTS (SELECT 1))
-      AND (EXISTS (SELECT 2))
-      AND NOT foo = ?
-      AND NOT foo = ?
-      AND bar = 4
-      AND bar = ?
-      AND foo = 1
-      AND foo = ?
-    ',
-    cc_result => {
-      -and => [
-        { -or => [ artistid => 1, charfield => undef, rank => { '=' => \13 } ] },
-        { -or => [ artistid => 1, charfield => undef, rank => { '!=' => \42 } ] },
-        { -exists => \'(SELECT 1)' },
-        { -exists => \'(SELECT 2)' },
-        { -not => { foo => 69 } },
-        { -not => { foo => 42 } },
-      ],
-      foo => [ -and => { '=' => \1 }, 3 ],
-      bar => [ -and => { '=' => \4 }, 2 ],
-    },
-    efcc_result => {
-      foo => UNRESOLVABLE_CONDITION,
-      bar => UNRESOLVABLE_CONDITION,
-    },
-    efcc_n_result => {
-      foo => UNRESOLVABLE_CONDITION,
-      bar => UNRESOLVABLE_CONDITION,
-    },
-  },
-  {
-    where => { -and => [
-      [ '_macro.to' => { -like => '%correct%' }, '_wc_macros.to' => { -like => '%correct%' } ],
-      { -and => [ { 'group.is_active' => 1 }, { 'me.is_active' => 1 } ] }
-    ] },
-    cc_result => {
-      'group.is_active' => 1,
-      'me.is_active' => 1,
-      -or => [
-        '_macro.to' => { -like => '%correct%' },
-        '_wc_macros.to' => { -like => '%correct%' },
-      ],
-    },
-    sql => 'WHERE ( _macro.to LIKE ? OR _wc_macros.to LIKE ? ) AND group.is_active = ? AND me.is_active = ?',
-    efcc_result => { 'group.is_active' => 1, 'me.is_active' => 1 },
-  },
-
-  {
-    where => { -and => [
-      artistid => { -value => [1] },
-      charfield => { -ident => 'foo' },
-      name => { '=' => { -value => undef } },
-      rank => { '=' => { -ident => 'bar' } },
-    ] },
-    sql => 'WHERE artistid = ? AND charfield = foo AND name IS NULL AND rank = bar',
-    cc_result => {
-      artistid => { -value => [1] },
-      name => undef,
-      charfield => { '=', { -ident => 'foo' } },
-      rank => { '=' => { -ident => 'bar' } },
-    },
-    efcc_result => {
-      artistid => [1],
-      charfield => { -ident => 'foo' },
-      rank => { -ident => 'bar' },
-    },
-    efcc_n_result => {
-      artistid => [1],
-      name => undef,
-      charfield => { -ident => 'foo' },
-      rank => { -ident => 'bar' },
-    },
-  },
-
-  {
-    where => { artistid => [] },
-    cc_result => { artistid => [] },
-    efcc_result => {},
-  },
-  (map {
-    {
-      where => { -and => $_ },
-      cc_result => undef,
-      efcc_result => {},
-      sql => '',
-    },
-    {
-      where => { -or => $_ },
-      cc_result => undef,
-      efcc_result => {},
-      sql => '',
-    },
-    {
-      where => { -or => [ foo => 1, $_ ] },
-      cc_result => { foo => 1 },
-      efcc_result => { foo => 1 },
-      sql => 'WHERE foo = ?',
-    },
-    {
-      where => { -or => [ $_, foo => 1 ] },
-      cc_result => { foo => 1 },
-      efcc_result => { foo => 1 },
-      sql => 'WHERE foo = ?',
-    },
-    {
-      where => { -and => [ fuu => 2, $_, foo => 1 ] },
-      sql => 'WHERE fuu = ? AND foo = ?',
-      collapsed_sql => 'WHERE foo = ? AND fuu = ?',
-      cc_result => { foo => 1, fuu => 2 },
-      efcc_result => { foo => 1, fuu => 2 },
-    },
-  } (
-    # bare
-    [], {},
-    # singles
-    [ {} ], [ [] ],
-    # doubles
-    [ [], [] ], [ {}, {} ], [ [], {} ], [ {}, [] ],
-    # tripples
-    [ {}, [], {} ], [ [], {}, [] ]
-  )),
-
-  # FIXME legacy compat crap, possibly worth undef/dieing in SQLMaker
-  { where => { artistid => {} }, sql => '', cc_result => undef, efcc_result => {}, efcc_n_result => {} },
-
-  # batshit insanity, just to be thorough
-  {
-    where => { -and => [ [ 'artistid' ], [ -and => [ artistid => { '!=', 69 }, artistid => undef, artistid => { '=' => 200 } ]], artistid => [], { -or => [] }, { -and => [] }, [ 'charfield' ], { name => [] }, 'rank' ] },
-    cc_result => { artistid => [ -and => [], { '!=', 69 }, undef, 200  ], charfield => undef, name => [], rank => undef },
-    sql => 'WHERE artistid IS NULL AND artistid != ? AND artistid IS NULL AND artistid = ? AND 0=1 AND charfield IS NULL AND 0=1 AND rank IS NULL',
-    collapsed_sql => 'WHERE 0=1 AND artistid != ? AND artistid IS NULL AND artistid = ? AND charfield IS NULL AND 0=1 AND rank IS NULL',
-    efcc_result => { artistid => UNRESOLVABLE_CONDITION },
-    efcc_n_result => { artistid => UNRESOLVABLE_CONDITION, charfield => undef, rank => undef },
-  },
-
-  # original test from RT#93244
-  {
-    where => {
-      -and => [
-        \[
-          "LOWER(me.title) LIKE ?",
-          '%spoon%',
-        ],
-        [ { 'me.title' => 'Spoonful of bees' } ],
-    ]},
-    cc_result => {
-      -and => [ \[
-        "LOWER(me.title) LIKE ?",
-        '%spoon%',
-      ]],
-      'me.title' => 'Spoonful of bees',
-    },
-    sql => 'WHERE LOWER(me.title) LIKE ? AND me.title = ?',
-    efcc_result => { 'me.title' => 'Spoonful of bees' },
-  },
-
-  # crazy literals
-  {
-    where => {
-      -or => [
-        \'foo = bar',
-      ],
-    },
-    sql => 'WHERE foo = bar',
-    cc_result => {
-      -and => [
-        \'foo = bar',
-      ],
-    },
-    efcc_result => {},
-  },
-  {
-    where => {
-      -or => [
-        \'foo = bar',
-        \'baz = ber',
-      ],
-    },
-    sql => 'WHERE foo = bar OR baz = ber',
-    collapsed_sql => 'WHERE baz = ber OR foo = bar',
-    cc_result => {
-      -or => [
-        \'baz = ber',
-        \'foo = bar',
-      ],
-    },
-    efcc_result => {},
-  },
-  {
-    where => {
-      -and => [
-        \'foo = bar',
-        \'baz = ber',
-      ],
-    },
-    sql => 'WHERE foo = bar AND baz = ber',
-    cc_result => {
-      -and => [
-        \'foo = bar',
-        \'baz = ber',
-      ],
-    },
-    efcc_result => {},
-  },
-  {
-    where => {
-      -and => [
-        \'foo = bar',
-        \'baz = ber',
-        x => { -ident => 'y' },
-      ],
-    },
-    sql => 'WHERE foo = bar AND baz = ber AND x = y',
-    cc_result => {
-      -and => [
-        \'foo = bar',
-        \'baz = ber',
-      ],
-      x => { '=' => { -ident => 'y' } }
-    },
-    efcc_result => { x => { -ident => 'y' } },
-  },
-);
-
-# these die as of SQLA 1.80 - make sure we do not transform them
-# into something usable instead
-for my $lhs (undef, '', { -ident => 'foo' }, { -value => 'foo' } ) {
-  no warnings 'uninitialized';
-
-  for my $w (
-    ( map { { -or => $_ }, (ref $lhs ? () : { @$_ } ) }
-      [ $lhs => "foo" ],
-      [ $lhs => { "=" => "bozz" } ],
-      [ $lhs => { "=" => \"bozz" } ],
-      [ $lhs => { -max => \"bizz" } ],
-    ),
-
-    (ref $lhs) ? () : (
-      { -or => [ -and => { $lhs => "baz" }, bizz => "buzz" ] },
-      { -or => [ foo => "bar", { $lhs => "baz" }, bizz => "buzz" ] },
-      { foo => "bar", -or => { $lhs => "baz" } },
-      { foo => "bar", -or => { $lhs => \"baz" }, bizz => "buzz" },
-    ),
-
-    { foo => "bar", -and => [ $lhs => \"baz" ], bizz => "buzz" },
-    { foo => "bar", -or => [ $lhs => \"baz" ], bizz => "buzz" },
-
-    { -or => [ foo => "bar", [ $lhs => \"baz" ], bizz => "buzz" ] },
-    { -or => [ foo => "bar", $lhs => \"baz", bizz => "buzz" ] },
-    { -or => [ foo => "bar", $lhs => \["baz"], bizz => "buzz" ] },
-    { -or => [ $lhs => \"baz" ] },
-    { -or => [ $lhs => \["baz"] ] },
-
-  ) {
-    push @tests, {
-      where => $w,
-      throw => qr/
-        \QSupplying an empty left hand side argument is not supported in \E(?:array|hash)-pairs
-          |
-        \QIllegal use of top-level '-\E(?:value|ident)'
-      /x,
-    }
-  }
-}
-
-# these are deprecated as of SQLA 1.79 - make sure we do not transform
-# them without losing the warning
-for my $lhs (undef, '') {
-  for my $rhs ( \"baz", \[ "baz" ] ) {
-    no warnings 'uninitialized';
-
-    my $expected_warning = qr/\QHash-pairs consisting of an empty string with a literal are deprecated/;
-
-    push @tests, {
-      where => { $lhs => $rhs },
-      cc_result => { -and => [ $rhs ] },
-      efcc_result => {},
-      sql => 'WHERE baz',
-      warn => $expected_warning,
-    };
-
-    for my $w (
-      { foo => "bar", -and => { $lhs => $rhs }, bizz => "buzz" },
-      { foo => "bar", $lhs => $rhs, bizz => "buzz" },
-    ) {
-      push @tests, {
-        where => $w,
-        cc_result => {
-          -and => [ $rhs ],
-          bizz => "buzz",
-          foo => "bar",
-        },
-        efcc_result => {
-          foo => "bar",
-          bizz => "buzz",
-        },
-        sql => 'WHERE baz AND bizz = ? AND foo = ?',
-        warn => $expected_warning,
-      };
-    }
-  }
-}
-
-# lots of extra silly tests with a false column
-for my $eq (
-  \"= baz",
-  \[ "= baz" ],
-  { '=' => { -ident => 'baz' } },
-  { '=' => \'baz' },
-) {
-  for my $where (
-    { foo => "bar", -and => [ 0 => $eq ], bizz => "buzz" },
-    { foo => "bar", -or => [ 0 => $eq ], bizz => "buzz" },
-    { foo => "bar", -and => { 0 => $eq }, bizz => "buzz" },
-    { foo => "bar", -or => { 0 => $eq }, bizz => "buzz" },
-    { foo => "bar", 0 => $eq, bizz => "buzz" },
-  ) {
-    push @tests, {
-      where => $where,
-      cc_result => {
-        0 => $eq,
-        foo => 'bar',
-        bizz => 'buzz',
-      },
-      efcc_result => {
-        foo => 'bar',
-        bizz => 'buzz',
-        ( ref $eq eq 'HASH' ? ( 0 => $eq->{'='} ) : () ),
-      },
-      sql => 'WHERE 0 = baz AND bizz = ? AND foo = ?',
-    };
-
-    push @tests, {
-      where => { -or => $where },
-      cc_result => { -or => [
-        "0" => $eq,
-        bizz => 'buzz',
-        foo => 'bar',
-      ]},
-      efcc_result => {},
-      sql => 'WHERE 0 = baz OR bizz = ? OR foo = ?',
-    }
-
-  }
-
-  for my $where (
-    [ foo => "bar", -and => [ 0 => $eq ], bizz => "buzz" ],
-    [ foo => "bar", -or => [ 0 => $eq ], bizz => "buzz" ],
-    [ foo => "bar", -and => { 0 => $eq }, bizz => "buzz" ],
-    [ foo => "bar", -or => { 0 => $eq }, bizz => "buzz" ],
-    [ foo => "bar", 0 => $eq, bizz => "buzz" ],
-  ) {
-    push @tests, {
-      where => { -or => $where },
-      cc_result => { -or => [
-        "0" => $eq,
-        bizz => 'buzz',
-        foo => 'bar',
-      ]},
-      efcc_result => {},
-      sql => 'WHERE foo = ? OR 0 = baz OR bizz = ?',
-      collapsed_sql => 'WHERE 0 = baz OR bizz = ? OR foo = ?',
-    }
-  }
-
-  for my $where (
-    [ {foo => "bar"}, -and => { 0 => "baz" }, bizz => "buzz" ],
-    [ -or => [ foo => "bar", -or => { 0 => "baz" }, bizz => "buzz" ] ],
-  ) {
-    push @tests, {
-      where => { -or => $where },
-      cc_result => { -or => [
-        "0" => 'baz',
-        bizz => 'buzz',
-        foo => 'bar',
-      ]},
-      efcc_result => {},
-      sql => 'WHERE foo = ? OR 0 = ? OR bizz = ?',
-      collapsed_sql => 'WHERE 0 = ? OR bizz = ? OR foo = ?',
-    };
-  }
-
-};
-
-for my $t (@tests) {
-  for my $w (
-    $t->{where},
-    $t->{where},  # do it twice, make sure we didn't destory the condition
-    [ -and => $t->{where} ],
-    [ -AND => $t->{where} ],
-    { -OR => [ -AND => $t->{where} ] },
-    ( ( keys %{$t->{where}} == 1 and length( (keys %{$t->{where}})[0] ) )
-      ? [ %{$t->{where}} ]
-      : ()
-    ),
-    ( (keys %{$t->{where}} == 1 and $t->{where}{-or})
-      ? ( ref $t->{where}{-or} eq 'HASH'
-        ? [ map { $_ => $t->{where}{-or}{$_} } sort keys %{$t->{where}{-or}} ]
-        : $t->{where}{-or}
-      )
-      : ()
-    ),
-  ) {
-    die unless Test::Builder->new->is_passing;
-
-    my $name = do { local $Data::Dumper::Indent = 0; dump_value $w };
-
-    my ($collapsed_cond, $collapsed_cond_as_sql);
-
-    if ($t->{throw}) {
-      throws_ok {
-        $collapsed_cond = $schema->storage->_collapse_cond($w);
-        ($collapsed_cond_as_sql) = $sm->where($collapsed_cond);
-      } $t->{throw}, "Exception on attempted collapse/render of $name"
-        and
-      next;
-    }
-
-    warnings_exist {
-      $collapsed_cond = $schema->storage->_collapse_cond($w);
-      ($collapsed_cond_as_sql) = $sm->where($collapsed_cond);
-    } $t->{warn} || [], "Expected warning when collapsing/rendering $name";
-
-    is_deeply(
-      $collapsed_cond,
-      $t->{cc_result},
-      "Expected collapsed condition produced on $name",
-    );
-
-    my ($original_sql) = do {
-      local $SIG{__WARN__} = sub {};
-      $sm->where($w);
-    };
-
-    is_same_sql ( $original_sql, $t->{sql}, "Expected original SQL from $name" )
-      if exists $t->{sql};
-
-    is_same_sql(
-      $collapsed_cond_as_sql,
-      ( $t->{collapsed_sql} || $t->{sql} || $original_sql ),
-      "Collapse did not alter *the semantics* of the final SQL based on $name",
-    );
-
-    is_deeply(
-      $schema->storage->_extract_fixed_condition_columns($collapsed_cond),
-      $t->{efcc_result},
-      "Expected fixed_condition produced on $name",
-    );
-
-    is_deeply(
-      $schema->storage->_extract_fixed_condition_columns($collapsed_cond, 'consider_nulls'),
-      $t->{efcc_n_result},
-      "Expected fixed_condition including NULLs produced on $name",
-    ) if $t->{efcc_n_result};
-
-    is_deeply(
-      $collapsed_cond,
-      $t->{cc_result},
-      "Collapsed condition result unaltered by fixed condition extractor",
-    );
-  }
-}
-
-done_testing;