(travis) Work around RT#116788

[dbsrgits/DBIx-Class.git] / examples / Schema / testdb.pl

diff --git a/examples/Schema/testdb.pl b/examples/Schema/testdb.pl
old mode 100644 (file)
new mode 100755 (executable)
index b31773d..0149bc2
--- a/examples/Schema/testdb.pl
+++ b/examples/Schema/testdb.pl
@@ -1,11 +1,16 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 
-use MyDatabase::Main;
+use warnings;
 use strict;
 
-my $schema = MyDatabase::Main->connect('dbi:SQLite:db/example.db');
+use MyApp::Schema;
+use DBIx::Class::_Util 'parent_dir';
+
+my $db_fn = parent_dir( $INC{'MyApp/Schema.pm'} ) . '../db/example.db';
+
 # for other DSNs, e.g. MySql, see the perldoc for the relevant dbd
 # driver, e.g perldoc L<DBD::mysql>.
+my $schema = MyApp::Schema->connect("dbi:SQLite:$db_fn");
 
 get_tracks_by_cd('Bad');
 get_tracks_by_artist('Michael Jackson');
@@ -26,7 +31,6 @@ sub get_tracks_by_cd {
         },
         {
             join     => [qw/ cd /],
-            prefetch => [qw/ cd /]
         }
     );
     while (my $track = $rs->next) {
@@ -49,12 +53,12 @@ sub get_tracks_by_artist {
         }
     );
     while (my $track = $rs->next) {
-        print $track->title . "\n";
+        print $track->title . " (from the CD '" . $track->cd->title
+          . "')\n";
     }
     print "\n";
 }
 
-
 sub get_cd_by_track {
     my $tracktitle = shift;
     print "get_cd_by_track($tracktitle):\n";
@@ -67,7 +71,7 @@ sub get_cd_by_track {
         }
     );
     my $cd = $rs->first;
-    print $cd->title . "\n\n";
+    print $cd->title . " has the track '$tracktitle'.\n\n";
 }
 
 sub get_cds_by_artist {
@@ -79,7 +83,6 @@ sub get_cds_by_artist {
         },
         {
             join     => [qw/ artist /],
-            prefetch => [qw/ artist /]
         }
     );
     while (my $cd = $rs->next) {
@@ -88,8 +91,6 @@ sub get_cds_by_artist {
     print "\n";
 }
 
-
-
 sub get_artist_by_track {
     my $tracktitle = shift;
     print "get_artist_by_track($tracktitle):\n";
@@ -104,10 +105,9 @@ sub get_artist_by_track {
         }
     );
     my $artist = $rs->first;
-    print $artist->name . "\n\n";
+    print $artist->name . " recorded the track '$tracktitle'.\n\n";
 }
 
-         
 sub get_artist_by_cd {
     my $cdtitle = shift;
     print "get_artist_by_cd($cdtitle):\n";
@@ -120,5 +120,5 @@ sub get_artist_by_cd {
         }
     );
     my $artist = $rs->first;
-    print $artist->name . "\n\n";
+    print $artist->name . " recorded the CD '$cdtitle'.\n\n";
 }