-#!/usr/bin/perl
-
use strict;
use warnings;
use Test::More;
},
{
func => 'update',
-# LDNOTE : removed the "-maybe", because we no longer admit unknown ops
-#
-# acked by RIBASUSHI
-# args => ['fhole', {fpoles => 4}, [-maybe => {race => [-and => [qw(black white asian)]]},
args => ['fhole', {fpoles => 4}, [
{ race => [qw/-or black white asian /] },
{ -nest => { firsttime => [-or => {'=','yes'}, undef] } },
},
{
func => 'select',
-# LDNOTE: modified test below because we agreed with MST that literal SQL
-# should not automatically insert a '='; the user has to do it
-#
-# acked by MSTROUT
-# args => ['test', '*', { a => \["to_date(?, 'MM/DD/YY')", '02/02/02']}],
args => ['test', '*', { a => \["= to_date(?, 'MM/DD/YY')", '02/02/02']}],
stmt => q{SELECT * FROM test WHERE ( a = to_date(?, 'MM/DD/YY') )},
stmt_q => q{SELECT * FROM `test` WHERE ( `a` = to_date(?, 'MM/DD/YY') )},
stmt => 'INSERT INTO test (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)',
stmt_q => 'INSERT INTO `test` (`a`, `b`, `c`, `d`, `e`) VALUES (?, ?, ?, ?, ?)',
bind => [qw/1 2 3 4/, { answer => 42}],
- warning_like => qr/HASH ref as bind value in insert is not supported/i,
+ warns => qr/HASH ref as bind value in insert is not supported/i,
},
{
func => 'update',
func => 'insert',
new => {bindtype => 'columns'},
args => ['test', {a => 1, b => \["to_date(?, 'MM/DD/YY')", '02/02/02']}],
- exception_like => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ throws => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
},
{
func => 'update',
new => {bindtype => 'columns'},
args => ['test', {a => 1, b => \["to_date(?, 'MM/DD/YY')", '02/02/02']}, {a => {'between', [1,2]}}],
- exception_like => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ throws => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
},
{
func => 'select',
new => {bindtype => 'columns'},
args => ['test', '*', { a => \["= to_date(?, 'MM/DD/YY')", '02/02/02']}],
- exception_like => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ throws => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
},
{
func => 'select',
new => {bindtype => 'columns'},
args => ['test', '*', { a => {'<' => \["to_date(?, 'MM/DD/YY')", '02/02/02']}, b => 8 }],
- exception_like => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ throws => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ },
+ {
+ func => 'select',
+ args => ['test', '*', { foo => { '>=' => [] }} ],
+ throws => qr/\Qoperator '>=' applied on an empty array (field 'foo')/,
},
{
func => 'select',
func => 'select',
new => {bindtype => 'columns'},
args => ['test', '*', { a => {-in => \["(SELECT d FROM to_date(?, 'MM/DD/YY') AS d)", '02/02/02']}, b => 8 }],
- exception_like => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
+ throws => qr/bindtype 'columns' selected, you need to pass: \[column_name => bind_value\]/,
},
{
func => 'insert',
bind => [],
},
{
- exception_like => qr/
+ throws => qr/
\QSQL::Abstract before v1.75 used to generate incorrect SQL \E
\Qwhen the -IN operator was given an undef-containing list: \E
\Q!!!AUDIT YOUR CODE AND DATA!!! (the upcoming Data::Query-based \E
bind => [ 42, 42 ],
},
{
- exception_like => qr/
+ throws => qr/
\QSQL::Abstract before v1.75 used to generate incorrect SQL \E
\Qwhen the -IN operator was given an undef-containing list: \E
\Q!!!AUDIT YOUR CODE AND DATA!!! (the upcoming Data::Query-based \E
{
func => 'select',
args => ['test', '*', { a => { -in => undef } }],
- exception_like => qr/Argument passed to the 'IN' operator can not be undefined/,
+ throws => qr/Argument passed to the 'IN' operator can not be undefined/,
},
);
for my $t (@tests) {
- local $"=', ';
-
my $new = $t->{new} || {};
- $new->{debug} = $ENV{DEBUG} || 0;
for my $quoted (0, 1) {
($stmt, @bind) = $maker->$op (@ { $t->{args} } );
};
- if ($t->{exception_like}) {
+ if (my $e = $t->{throws}) {
throws_ok(
sub { $cref->() },
- $t->{exception_like},
- "throws the expected exception ($t->{exception_like})"
+ $e,
+ );
+ }
+ else {
+ warnings_exist(
+ sub { $cref->() },
+ $t->{warns} || [],
);
- } else {
- if ($t->{warning_like}) {
- warning_like(
- sub { $cref->() },
- $t->{warning_like},
- "issues the expected warning ($t->{warning_like})"
- );
- }
- else {
- $cref->();
- }
is_same_sql_bind(
$stmt,