Revert some test changes to bring things back in line with master

In particular: 13ab0b9f, e2feb536, a67b4f3c

diff --git a/t/752sqlite.t b/t/752sqlite.t
index f079284..fd7e8d7 100644 (file)
--- a/t/752sqlite.t
+++ b/t/752sqlite.t
@@ -136,12 +136,6 @@ warnings_exist { $row = $schema->resultset('Artist')->create ({ name => 'alpha r
 $row->discard_changes;
 is ($row->rank, 'abc', 'proper rank inserted into database');
 
-# temporary - can't get a win32 machine to investigate all possibilities
-if ($^O eq 'MSWin32' or $^O eq 'cygwin') {
-  done_testing;
-  exit;
-}
-
 # and make sure we do not lose actual bigints
 {
   package DBICTest::BigIntArtist;

diff --git a/t/84serialize.t b/t/84serialize.t
index c84ca94..34e2195 100644 (file)
--- a/t/84serialize.t
+++ b/t/84serialize.t
@@ -9,9 +9,6 @@ use Storable qw(dclone freeze nfreeze thaw);
 use Scalar::Util qw/refaddr/;
 use Carp;
 
-plan skip_all => 'Something causes this to fail on TravisCI'
-  if $ENV{TRAVIS};
-
 sub ref_ne {
   my ($refa, $refb) = map { refaddr $_ or croak "$_ is not a reference!" } @_[0,1];
   cmp_ok (

diff --git a/t/sqlmaker/limit_dialects/fetch_first.t b/t/sqlmaker/limit_dialects/fetch_first.t
index ed532a4..431423e 100644 (file)
--- a/t/sqlmaker/limit_dialects/fetch_first.t
+++ b/t/sqlmaker/limit_dialects/fetch_first.t
@@ -32,7 +32,7 @@ for my $null_order (
             SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name
               FROM books me
               JOIN owners owner ON owner.id = me.owner
-            WHERE source = ?
+            WHERE ( source = ? )
             ORDER BY me.id
             FETCH FIRST 5 ROWS ONLY
           ) me
@@ -49,23 +49,23 @@ for my $ord_set (
   {
     order_by => \'title DESC',
     order_inner => 'title DESC',
-    order_outer => 'ORDER__BY__001',
+    order_outer => 'ORDER__BY__001 ASC',
     order_req => 'ORDER__BY__001 DESC',
     exselect_outer => 'ORDER__BY__001',
     exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => { -asc => 'title'  },
-    order_inner => 'title',
+    order_inner => 'title ASC',
     order_outer => 'ORDER__BY__001 DESC',
-    order_req => 'ORDER__BY__001',
+    order_req => 'ORDER__BY__001 ASC',
     exselect_outer => 'ORDER__BY__001',
     exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => { -desc => 'title' },
     order_inner => 'title DESC',
-    order_outer => 'ORDER__BY__001',
+    order_outer => 'ORDER__BY__001 ASC',
     order_req => 'ORDER__BY__001 DESC',
     exselect_outer => 'ORDER__BY__001',
     exselect_inner => 'title AS ORDER__BY__001',
@@ -89,16 +89,16 @@ for my $ord_set (
   {
     order_by => ['title', { -desc => 'bar' } ],
     order_inner => 'title, bar DESC',
-    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002',
+    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 ASC',
     order_req => 'ORDER__BY__001, ORDER__BY__002 DESC',
     exselect_outer => 'ORDER__BY__001, ORDER__BY__002',
     exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002',
   },
   {
     order_by => { -asc => [qw{ title bar }] },
-    order_inner => 'title, bar',
+    order_inner => 'title ASC, bar ASC',
     order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 DESC',
-    order_req => 'ORDER__BY__001, ORDER__BY__002',
+    order_req => 'ORDER__BY__001 ASC, ORDER__BY__002 ASC',
     exselect_outer => 'ORDER__BY__001, ORDER__BY__002',
     exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002',
   },
@@ -108,9 +108,9 @@ for my $ord_set (
       { -desc => [qw{bar}] },
       { -asc  => [qw{me.owner sensors}]},
     ],
-    order_inner => 'title, bar DESC, me.owner, sensors',
-    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002, me.owner DESC, ORDER__BY__003 DESC',
-    order_req => 'ORDER__BY__001, ORDER__BY__002 DESC, me.owner, ORDER__BY__003',
+    order_inner => 'title, bar DESC, me.owner ASC, sensors ASC',
+    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 ASC, me.owner DESC, ORDER__BY__003 DESC',
+    order_req => 'ORDER__BY__001, ORDER__BY__002 DESC, me.owner ASC, ORDER__BY__003 ASC',
     exselect_outer => 'ORDER__BY__001, ORDER__BY__002, ORDER__BY__003',
     exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002, sensors AS ORDER__BY__003',
   },
@@ -133,7 +133,7 @@ for my $ord_set (
               SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name$i_sel
                 FROM books me
                 JOIN owners owner ON owner.id = me.owner
-              WHERE source = ?
+              WHERE ( source = ? )
               ORDER BY $ord_set->{order_inner}
               FETCH FIRST 5 ROWS ONLY
             ) me
@@ -159,7 +159,7 @@ is_same_sql_bind (
                 SELECT me.id, me.source, me.owner, me.price, me.title
                   FROM books me
                   JOIN owners owner ON owner.id = me.owner
-                WHERE source = ?
+                WHERE ( source = ? )
                 GROUP BY title
                 ORDER BY title
                 FETCH FIRST 5 ROWS ONLY
@@ -170,7 +170,7 @@ is_same_sql_bind (
         ORDER BY me.title
       ) me
       JOIN owners owner ON owner.id = me.owner
-    WHERE source = ?
+    WHERE ( source = ? )
     ORDER BY title
   )',
   [ map { [
@@ -192,7 +192,7 @@ is_same_sql_bind( $rs_selectas_top->search({})->as_query,
                       me.id, me.source, me.owner, me.title, me.price, owner.name
                     FROM books me
                     JOIN owners owner ON owner.id = me.owner
-                    WHERE source = ?
+                    WHERE ( source = ? )
                     FETCH FIRST 1 ROWS ONLY
                    )',
                   [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }