Use ExprDeclare in tests instead of expr.include

[dbsrgits/Data-Query.git] / t / sql.t

diff --git a/t/sql.t b/t/sql.t
index a8cc66d..6bf46e8 100644 (file)
--- a/t/sql.t
+++ b/t/sql.t
@@ -1,11 +1,11 @@
 use strictures 1;
 use Test::More qw(no_plan);
 
+use Scalar::Util qw(blessed);
 use Devel::Dwarn;
 use Data::Query::Renderer::SQL::Naive;
 use Data::Query::ExprHelpers qw(perl_scalar_value);
-
-BEGIN { require 't/expr.include' }
+use Data::Query::ExprDeclare qw(SELECT AS expr);
 
 my $rend = Data::Query::Renderer::SQL::Naive->new({ quote_chars => [ "'" ] });
 
@@ -13,9 +13,11 @@ sub binding { map perl_scalar_value($_), @_ }
 
 sub expr_sql_is (&;@) {
   my $sub = shift;
+  my $e = Data::Query::ExprDeclare::_run_expr($sub);
+  $e = blessed($e) ? $e->{expr} : $e;
   @_
-    ? is_deeply($rend->render(_run_expr($sub)->{expr}), @_)
-    : ::Dwarn($rend->render(_run_expr($sub)->{expr}));
+    ? is_deeply($rend->render($e), @_)
+    : ::Dwarn($rend->render($e));
 }
 
 expr_sql_is { $_->foo }