Allow scalarefs passed to order_by to pass straight through to SQL

[dbsrgits/DBIx-Class.git] / t / 19quotes.t

diff --git a/t/19quotes.t b/t/19quotes.t
index 69ba5b5..18588c8 100644 (file)
--- a/t/19quotes.t
+++ b/t/19quotes.t
@@ -6,7 +6,7 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 3 );
+        : ( tests => 6 );
 }
 
 use lib qw(t/lib);
@@ -15,8 +15,8 @@ use_ok('DBICTest');
 
 use_ok('DBICTest::HelperRels');
 
-DBICTest->schema->storage->sql_maker->{'quote_char'} = q!'!;
-DBICTest->schema->storage->sql_maker->{'name_sep'} = '.';
+DBICTest->schema->storage->sql_maker->quote_char("'");
+DBICTest->schema->storage->sql_maker->name_sep('.');
 
 my $rs = DBICTest::CD->search(
            { 'me.year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
@@ -24,3 +24,34 @@ my $rs = DBICTest::CD->search(
 
 cmp_ok( $rs->count, '==', 1, "join with fields quoted");
 
+$rs = DBICTest::CD->search({},
+            { 'order_by' => 'year DESC'});
+{
+       my $warnings;
+       local $SIG{__WARN__} = sub { $warnings .= $_[0] };
+       my $first = eval{ $rs->first() };
+       ok( $warnings =~ /ORDER BY terms/, "Problem with ORDER BY quotes" );
+}
+
+my $order = 'year DESC';
+$rs = DBICTest::CD->search({},
+            { 'order_by' => \$order });
+{
+       my $warnings;
+       local $SIG{__WARN__} = sub { $warnings .= $_[0] };
+       my $first = $rs->first();
+       ok( $warnings !~ /ORDER BY terms/,
+            "No problem handling ORDER by scalaref" );
+}
+
+DBICTest->schema->storage->sql_maker->quote_char([qw/[ ]/]);
+DBICTest->schema->storage->sql_maker->name_sep('.');
+
+$rs = DBICTest::CD->search(
+           { 'me.year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
+           { join => 'artist' });
+cmp_ok($rs->count,'==', 1,"join quoted with brackets.");
+
+
+
+