Merge 'column_attr' into 'trunk'

[dbsrgits/DBIx-Class.git] / t / 60core.t

diff --git a/t/60core.t b/t/60core.t
index 0c7d434..011675b 100644 (file)
--- a/t/60core.t
+++ b/t/60core.t
@@ -240,9 +240,9 @@ cmp_ok($or_rs->count, '==', 5, 'Search with OR ok');
 my $distinct_rs = $schema->resultset("CD")->search($search, { join => 'tags', distinct => 1 });
 cmp_ok($distinct_rs->all, '==', 4, 'DISTINCT search with OR ok');
 
-#SKIP: {
-#  skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 2
-#    if $is_broken_sqlite;
+SKIP: {
+  skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 2
+    if $is_broken_sqlite;
 
   my $tcount = $schema->resultset("Track")->search(
     {},
@@ -260,8 +260,8 @@ cmp_ok($distinct_rs->all, '==', 4, 'DISTINCT search with OR ok');
     }
   );
   cmp_ok($tcount->next->get_column('count'), '==', 13, 'multiple column COUNT DISTINCT using column syntax ok');
+}
 
-#}
 my $tag_rs = $schema->resultset('Tag')->search(
                [ { 'me.tag' => 'Cheesy' }, { 'me.tag' => 'Blue' } ]);