[Bast-commits] r6446 - in DBIx-Class/0.08/trunk/t: . lib lib/DBICTest/Schema

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-05-28 08:20:57 +0000 (Thu, 28 May 2009)
New Revision: 6446

Modified:
   DBIx-Class/0.08/trunk/t/71mysql.t
   DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/BooksInLibrary.pm
   DBIx-Class/0.08/trunk/t/lib/sqlite.sql
Log:
Commit rather useless but already written mysql test extension

Modified: DBIx-Class/0.08/trunk/t/71mysql.t
===================================================================
--- DBIx-Class/0.08/trunk/t/71mysql.t	2009-05-27 22:44:07 UTC (rev 6445)
+++ DBIx-Class/0.08/trunk/t/71mysql.t	2009-05-28 08:20:57 UTC (rev 6446)
@@ -14,7 +14,7 @@
 plan skip_all => 'Set $ENV{DBICTEST_MYSQL_DSN}, _USER and _PASS to run this test'
   unless ($dsn && $user);
 
-plan tests => 15;
+plan tests => 23;
 
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
@@ -104,23 +104,62 @@
 
 $schema->populate ('BooksInLibrary', [
   [qw/source  owner title   /],
-  [qw/nsa     1     secrets1/],
-  [qw/fbi     1     secrets2/],
-  [qw/cia     2     secrets3/],
+  [qw/Library 1     secrets1/],
+  [qw/Eatery  1     secrets2/],
+  [qw/Library 2     secrets3/],
 ]);
 
-# try a distinct + prefetch with tables with identical columns (mysql allegedly doesn't like this)
-my $owners = $schema->resultset ('Owners')->search (
-  { 'books.id' => { '!=', undef }},
-  { prefetch => 'books', distinct => 1 }
-);
-my $owners2 = $schema->resultset ('Owners')->search ({ id => { -in => $owners->get_column ('me.id')->as_query }});
-for ($owners, $owners2) {
-  is ($_->all, 2, 'Prefetched grouped search returns correct number of rows');
-  is ($_->count, 2, 'Prefetched grouped search returns correct count');
+#
+# try a distinct + prefetch on tables with identically named columns 
+# (mysql doesn't seem to like subqueries with equally named columns)
+#
+
+SKIP: {
+  # try a ->has_many direction (due to a 'multi' accessor the select/group_by group is collapsed)
+  my $owners = $schema->resultset ('Owners')->search (
+    { 'books.id' => { '!=', undef }},
+    { prefetch => 'books', distinct => 1 }
+  );
+  my $owners2 = $schema->resultset ('Owners')->search ({ id => { -in => $owners->get_column ('me.id')->as_query }});
+  for ($owners, $owners2) {
+    lives_ok { is ($_->all, 2, 'Prefetched grouped search returns correct number of rows') }
+      || skip ('No test due to exception', 1);
+    lives_ok { is ($_->count, 2, 'Prefetched grouped search returns correct count') }
+      || skip ('No test due to exception', 1);
+  }
+
+  TODO: {
+    # try a ->prefetch direction (no select collapse)
+    my $books = $schema->resultset ('BooksInLibrary')->search (
+      { 'owner.name' => 'wiggle' },
+      { prefetch => 'owner', distinct => 1 }
+    );
+
+    local $TODO = 'MySQL is crazy - there seems to be no way to make this work';
+    # error thrown is:
+    # Duplicate column name 'id' [for Statement "
+    #   SELECT COUNT( * )
+    #     FROM (
+    #       SELECT me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name
+    #         FROM books me
+    #         JOIN owners owner ON owner.id = me.owner 
+    #       WHERE ( ( owner.name = ? AND source = ? ) ) 
+    #       GROUP BY me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name
+    #     ) count_subq
+    # " with ParamValues: 0='wiggle', 1='Library']
+    #
+    # go fucking figure
+
+    my $books2 = $schema->resultset ('BooksInLibrary')->search ({ id => { -in => $books->get_column ('me.id')->as_query }});
+    for ($books, $books2) {
+      lives_ok { is ($_->all, 1, 'Prefetched grouped search returns correct number of rows') }
+        || skip ('No test due to exception', 1);
+      lives_ok { is ($_->count, 1, 'Prefetched grouped search returns correct count') }
+        || skip ('No test due to exception', 1);
+    }
+  }
 }
 
-
 SKIP: {
     my $mysql_version = $dbh->get_info( $GetInfoType{SQL_DBMS_VER} );
     skip "Cannot determine MySQL server version", 1 if !$mysql_version;

Modified: DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/BooksInLibrary.pm
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/BooksInLibrary.pm	2009-05-27 22:44:07 UTC (rev 6445)
+++ DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/BooksInLibrary.pm	2009-05-28 08:20:57 UTC (rev 6446)
@@ -29,4 +29,6 @@
 
 __PACKAGE__->resultset_attributes({where => { source => "Library" } });
 
+__PACKAGE__->belongs_to ( owner => 'DBICTest::Schema::Owners', 'owner' );
+
 1;

Modified: DBIx-Class/0.08/trunk/t/lib/sqlite.sql
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/sqlite.sql	2009-05-27 22:44:07 UTC (rev 6445)
+++ DBIx-Class/0.08/trunk/t/lib/sqlite.sql	2009-05-28 08:20:57 UTC (rev 6446)
@@ -1,6 +1,6 @@
 -- 
 -- Created by SQL::Translator::Producer::SQLite
--- Created on Tue May 26 18:29:15 2009
+-- Created on Thu May 28 10:10:00 2009
 -- 
 
 
@@ -82,6 +82,8 @@
   price integer
 );
 
+CREATE INDEX books_idx_owner_books ON books (owner);
+
 --
 -- Table: cd
 --