Attachment #42630 for bug #66431

View | Details | Raw Unified | Return to bug 66431
Collapse All | Expand All





PORTNAME=	SQL-Translator
PORTVERSION=	0.05
PORTREVISION=	1
CATEGORIES=	databases perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	SQL

.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} < 500600
BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
		${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
EXTRA_PATCHES+=	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::Excel.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm \
		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Utils.pm \
		${PATCHDIR}/5.005_03-patch-t::05bgep-re.t \
		${PATCHDIR}/5.005_03-patch-t::16xml-parser.t \
		${PATCHDIR}/5.005_03-patch-t::17sqlfxml-producer.t \
		${PATCHDIR}/5.005_03-patch-t::18ttschema-producer.t \
		${PATCHDIR}/5.005_03-patch-t::19sybase-parser.t \
		${PATCHDIR}/5.005_03-patch-t::27sqlite-parser.t

.endif

.include <bsd.port.post.mk>




--- lib/SQL/Translator/Parser/Excel.pm.orig	Sun May  9 14:49:45 2004
+++ lib/SQL/Translator/Parser/Excel.pm	Sun May  9 14:50:21 2004
@@ -183,9 +183,9 @@
                     $size = [ $size->[0] + $size->[1] ];
                 }
 
-                my $field = $table->get_field( $field );
-                $field->size( $size ) if $size;
-                $field->data_type( $data_type );
+                my $f = $table->get_field( $field );
+                $f->size( $size ) if $size;
+                $f->data_type( $data_type );
             }
         }
     }




--- lib/SQL/Translator/Parser/xSV.pm.orig	Sun May  9 21:39:20 2004
+++ lib/SQL/Translator/Parser/xSV.pm	Sun May  9 21:39:50 2004
@@ -174,9 +174,9 @@
                 $size = [ $size->[0] + $size->[1] ];
             }
 
-            my $field = $table->get_field( $field );
-            $field->size( $size );
-            $field->data_type( $data_type );
+            my $f = $table->get_field( $field );
+            $f->size( $size );
+            $f->data_type( $data_type );
         }
     }
 




--- lib/SQL/Translator/Producer/Diagram.pm.orig	Sun May  9 15:00:01 2004
+++ lib/SQL/Translator/Producer/Diagram.pm	Sun May  9 15:09:32 2004
@@ -502,27 +502,27 @@
     #
     debug("imap file = '$imap_file'");
     if ( $imap_file && @imap_coords ) {
-        open my $fh, ">$imap_file" or die "Can't write '$imap_file': $!\n";
-        print $fh qq[<html><body><img src="" usemap="#imap" border="0">\n].
+        open FH, ">$imap_file" or die "Can't write '$imap_file': $!\n";
+        print FH qq[<html><body><img src="" usemap="#imap" border="0">\n].
             qq[<map name="imap">\n];
         for my $rec ( @imap_coords ) {
             my $href = shift @$rec;
-            print $fh q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
+            print FH q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
         } 
-        print $fh qq[</body></html>];
-        close $fh;
+        print FH qq[</body></html>];
+        close FH;
     }
 
     #
     # Print the image.
     #
     if ( $out_file ) {
-        open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
-        print $fh $gd->$output_type;
-        close $fh;
+        open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
+        print FH $gd->$output_type();
+        close FH;
     }
     else {
-        return $gd->$output_type;
+        return $gd->$output_type();
     }
 }
 




--- lib/SQL/Translator/Producer/GraphViz.pm.orig	Sun May  9 15:10:03 2004
+++ lib/SQL/Translator/Producer/GraphViz.pm	Sun May  9 15:10:53 2004
@@ -378,13 +378,13 @@
     #
     my $output_method = "as_$output_type";
     if ( $out_file ) {
-        open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
-        binmode $fh;
-        print $fh $gv->$output_method;
-        close $fh;
+        open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
+        binmode FH;
+        print FH $gv->$output_method();
+        close FH;
     }
     else {
-        return $gv->$output_method;
+        return $gv->$output_method();
     }
 }
 

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm (+11 lines)
	1	--- lib/SQL/Translator/Producer/HTML.pm.orig Sun May 9 21:14:22 2004
	2	+++ lib/SQL/Translator/Producer/HTML.pm Sun May 9 21:14:45 2004
	3	@@ -59,7 +59,7 @@
	4	CGI::Pretty->new }
	5	: do { require CGI;
	6	import CGI;
	7	- CGI->new };
	8	+ CGI->new('') };
	9	my ($table, @table_names);
	10
	11	if ($wrap) {




--- lib/SQL/Translator/Producer/XML/SQLFairy.pm.orig	Sun May  9 15:11:42 2004
+++ lib/SQL/Translator/Producer/XML/SQLFairy.pm	Sun May  9 15:13:45 2004
@@ -224,9 +224,9 @@
         # Use array to ensure consistant (ie not hash) ordering of attribs
         # The order comes from the meths list passes in.
         my @attr = map {
-            my $val = $obj->$_;
+            my $val = $obj->$_();
             ($_ => ref($val) eq 'ARRAY' ? join(', ', @$val) : $val);
-        } grep { defined $obj->$_ } @meths;
+        } grep { defined $obj->$_() } @meths;
         $empty_tag ? $xml->emptyTag( [ $Namespace => $tag ], @attr )
                    : $xml->startTag( [ $Namespace => $tag ], @attr );
     }
@@ -247,7 +247,7 @@
     my $emit_empty            = $PArgs->{'emit_empty_tags'};
 
     for my $method ( @methods ) {
-        my $val = $obj->$method;
+        my $val = $obj->$method();
         debug "        ".ref($obj)."->$method=",
               (defined $val ? "'$val'" : "<UNDEF>");
         next unless $emit_empty || defined $val;

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm (+11 lines)
	1	--- lib/SQL/Translator/Schema/Table.pm.orig Sun May 9 19:09:06 2004
	2	+++ lib/SQL/Translator/Schema/Table.pm Sun May 9 19:09:30 2004
	3	@@ -104,7 +104,7 @@
	4	my $constraint_class = 'SQL::Translator::Schema::Constraint';
	5	my $constraint;
	6
	7	- if ( UNIVERSAL::isa( $_[0], $constraint_class ) ) {
	8	+ if ( UNIVERSAL::isa( $_[0]\|\|'', $constraint_class ) ) {
	9	$constraint = shift;
	10	$constraint->table( $self );
	11	}

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Utils.pm (+11 lines)
	1	--- lib/SQL/Translator/Utils.pm.orig Mon Feb 9 23:04:26 2004
	2	+++ lib/SQL/Translator/Utils.pm Sun May 9 19:11:27 2004
	3	@@ -123,7 +123,7 @@
	4	# arguments. Modified to also handle a list of references.
	5	# ----------------------------------------------------------------------
	6	sub parse_list_arg {
	7	- my $list = UNIVERSAL::isa( $_[0], 'ARRAY' ) ? shift : [ @_ ];
	8	+ my $list = UNIVERSAL::isa( $_[0]\|\|'', 'ARRAY' ) ? shift : [ @_ ];
	9
	10	#
	11	# This protects stringification of references.

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::05bgep-re.t (+11 lines)
	1	--- t/05bgep-re.t.orig Sun May 9 19:03:10 2004
	2	+++ t/05bgep-re.t Sun May 9 19:03:27 2004
	3	@@ -44,7 +44,7 @@
	4	SUFFIX => '.xml',
	5	DIR => tmpdir);
	6	print $fh $data;
	7	- $fh->close;
	8	+ close $fh;
	9
	10	ok(XML::Parser->new->parsefile($fname),
	11	"Successfully parsed output");




--- t/16xml-parser.t.orig	Sun May  9 19:15:25 2004
+++ t/16xml-parser.t	Sun May  9 19:27:08 2004
@@ -12,7 +12,7 @@
 
 use strict;
 use Test::More;
-use Test::Exception;
+#use Test::Exception;  # not actually used
 
 use strict;
 use Data::Dumper;
@@ -49,16 +49,16 @@
         if ( exists $test->{$attr} ) {
             my $ans = $test->{$attr};
             if ( $attr =~ m/^is_/ ) {
-                if ($ans) { ok $fld->$attr,  "$name - $attr true"; }
-                else      { ok !$fld->$attr, "$name - $attr false"; }
+                if ($ans) { ok $fld->$attr(),  "$name - $attr true"; }
+                else      { ok !$fld->$attr(), "$name - $attr false"; }
             }
             else {
-                is $fld->$attr, $ans, "$name - $attr = '"
+                is $fld->$attr(), $ans, "$name - $attr = '"
                                      .(defined $ans ? $ans : "NULL" )."'";
             }
         }
         else {
-            ok !$fld->$attr, "$name - $attr not set";
+            ok !$fld->$attr(), "$name - $attr not set";
         }
     }
 }




--- t/17sqlfxml-producer.t.orig	Sun May  9 20:51:50 2004
+++ t/17sqlfxml-producer.t	Sun May  9 20:55:44 2004
@@ -8,7 +8,10 @@
 
 use strict;
 use Test::More;
-use Test::Exception;
+use vars '$no_test_exception';
+$no_test_exception = 0;
+eval { require Test::Exception; };
+$no_test_exception = $@;
 
 use Data::Dumper;
 my %opt;
@@ -149,7 +152,12 @@
     from           => 'MySQL',
     to             => 'XML-SQLFairy',
 );
-lives_ok {$xml = $obj->translate($file);} "Translate (emit_empty_tags=>0) ran";
+if ($no_test_exception) {
+    $xml = $obj->translate($file);
+    pass "Translate (emit_empty_tags=>0) ran";
+} else {
+    lives_ok {$xml = $obj->translate($file);} "Translate (emit_empty_tags=>0) ran";
+}
 ok("$xml" ne ""                             ,"Produced something!");
 print "XML:\n$xml" if DEBUG;
 # Strip sqlf header with its variable date so we diff safely
@@ -270,7 +278,12 @@
     to             => 'XML-SQLFairy',
     producer_args  => { emit_empty_tags => 1 },
 );
-lives_ok { $xml=$obj->translate($file); } "Translate (emit_empty_tags=>1) ran";
+if ($no_test_exception) {
+    $xml=$obj->translate($file);
+    pass "Translate (emit_empty_tags=>1) ran";
+} else {
+    lives_ok { $xml=$obj->translate($file); } "Translate (emit_empty_tags=>1) ran";
+}
 ok("$xml" ne ""                             ,"Produced something!");
 print "XML emit_empty_tags=>1:\n$xml" if DEBUG;
 # Strip sqlf header with its variable date so we diff safely
@@ -314,7 +327,12 @@
     to             => "XML-SQLFairy",
     producer_args  => { attrib_values => 1 },
 );
-lives_ok {$xml = $obj->translate($file);} "Translate (attrib_values=>1) ran";
+if ($no_test_exception) {
+    $xml = $obj->translate($file);
+    pass "Translate (attrib_values=>1) ran";
+} else {
+    lives_ok {$xml = $obj->translate($file);} "Translate (attrib_values=>1) ran";
+}
 ok("$xml" ne ""                             ,"Produced something!");
 print "XML attrib_values=>1:\n$xml" if DEBUG;
 # Strip sqlf header with its variable date so we diff safely
@@ -364,7 +382,12 @@
     
     # As we have created a Schema we give translate a dummy string so that
     # it will run the produce.
-    lives_ok {$xml =$obj->translate("FOO");} "Translate (View) ran";
+    if ($no_test_exception) {
+        $xml =$obj->translate("FOO");
+        pass "Translate (View) ran";
+    } else {
+        lives_ok {$xml =$obj->translate("FOO");} "Translate (View) ran";
+    }
     ok("$xml" ne ""                             ,"Produced something!");
     print "XML attrib_values=>1:\n$xml" if DEBUG;
     # Strip sqlf header with its variable date so we diff safely
@@ -418,7 +441,12 @@
     
     # As we have created a Schema we give translate a dummy string so that
     # it will run the produce.
-    lives_ok {$xml =$obj->translate("FOO");} "Translate (Trigger) ran";
+    if ($no_test_exception) {
+        $xml =$obj->translate("FOO");
+        pass "Translate (Trigger) ran";
+    } else {
+        lives_ok {$xml =$obj->translate("FOO");} "Translate (Trigger) ran";
+    }
     ok("$xml" ne ""                             ,"Produced something!");
     print "XML attrib_values=>1:\n$xml" if DEBUG;
     # Strip sqlf header with its variable date so we diff safely
@@ -472,7 +500,12 @@
 
     # As we have created a Schema we give translate a dummy string so that
     # it will run the produce.
-    lives_ok {$xml =$obj->translate("FOO");} "Translate (Procedure) ran";
+    if ($no_test_exception) {
+        $xml =$obj->translate("FOO");
+        pass "Translate (Procedure) ran";
+    } else {
+        lives_ok {$xml =$obj->translate("FOO");} "Translate (Procedure) ran";
+    }
     ok("$xml" ne ""                             ,"Produced something!");
     print "XML attrib_values=>1:\n$xml" if DEBUG;
     # Strip sqlf header with its variable date so we diff safely




--- t/18ttschema-producer.t.orig	Sun May  9 20:56:35 2004
+++ t/18ttschema-producer.t	Sun May  9 20:57:54 2004
@@ -6,7 +6,10 @@
 
 use strict;
 use Test::More;
-use Test::Exception;
+use vars '$no_test_exception';
+$no_test_exception = 0;
+eval { require Test::Exception; };
+$no_test_exception = $@;
 
 use Data::Dumper;
 use vars '%opt';
@@ -47,7 +50,12 @@
     },
 );
 my $out;
-lives_ok { $out = $obj->translate; }  "Translate ran";
+if ($no_test_exception) {
+    $out = $obj->translate;
+    pass "Translate ran";
+} else {
+    lives_ok { $out = $obj->translate; }  "Translate ran";
+}
 ok $out ne ""                        ,"Produced something!";
 local $/ = undef; # slurp
 eq_or_diff $out, <DATA>              ,"Output looks right";

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::19sybase-parser.t (+15 lines)
	1	--- t/19sybase-parser.t.orig Sun May 9 19:14:03 2004
	2	+++ t/19sybase-parser.t Sun May 9 19:14:34 2004
	3	@@ -17,9 +17,9 @@
	4	my $data;
	5	{
	6	local $/;
	7	- open my $fh, "<$file" or die "Can't read file '$file': $!\n";
	8	- $data = <$fh>;
	9	- close $fh;
	10	+ open FH, "<$file" or die "Can't read file '$file': $!\n";
	11	+ $data = <FH>;
	12	+ close FH;
	13	}
	14
	15	ok( $data, 'Data' );

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::27sqlite-parser.t (+13 lines)
	1	--- t/27sqlite-parser.t.orig Sun May 9 21:02:06 2004
	2	+++ t/27sqlite-parser.t Sun May 9 21:02:33 2004
	3	@@ -13,8 +13,8 @@
	4
	5	{
	6	local $/;
	7	- open my $fh, "<$file" or die "Can't read file '$file': $!\n";
	8	- my $data = <$fh>;
	9	+ open FH, "<$file" or die "Can't read file '$file': $!\n";
	10	+ my $data = <FH>;
	11	my $t = SQL::Translator->new;
	12	parse($t, $data);
	13




--- lib/SQL/Translator/Parser/xSV.pm.orig	Sun May  9 23:33:46 2004
+++ lib/SQL/Translator/Parser/xSV.pm	Sun May  9 23:34:11 2004
@@ -66,7 +66,7 @@
 # -------------------------------------------------------------------
 
 use strict;
-use vars qw($VERSION @EXPORT);
+use vars qw($VERSION @EXPORT_OK);
 $VERSION = sprintf "%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/;
 
 use Exporter;
@@ -75,7 +75,7 @@
 use SQL::Translator::Utils qw(debug normalize_name);
 
 use base qw(Exporter);
-@EXPORT = qw(parse);
+@EXPORT_OK = qw(parse);
 
 #
 # Passed a SQL::Translator instance and a string containing the data

Return to bug 66431

Lines 7-12 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/Makefile (-1 / +18 lines)
7		7
8	PORTNAME= SQL-Translator	8	PORTNAME= SQL-Translator
9	PORTVERSION= 0.05	9	PORTVERSION= 0.05
		10	PORTREVISION= 1
10	CATEGORIES= databases perl5	11	CATEGORIES= databases perl5
11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	12	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
12	MASTER_SITE_SUBDIR= SQL	13	MASTER_SITE_SUBDIR= SQL
Lines 85-91 Link Here
85	.include <bsd.port.pre.mk>	86	.include <bsd.port.pre.mk>
86		87
87	.if ${PERL_LEVEL} < 500600	88	.if ${PERL_LEVEL} < 500600
88	IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."	89	BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
		90	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
		91	EXTRA_PATCHES+= ${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::Excel.pm \
		92	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm \
		93	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm \
		94	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm \
		95	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm \
		96	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm \
		97	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm \
		98	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Utils.pm \
		99	${PATCHDIR}/5.005_03-patch-t::05bgep-re.t \
		100	${PATCHDIR}/5.005_03-patch-t::16xml-parser.t \
		101	${PATCHDIR}/5.005_03-patch-t::17sqlfxml-producer.t \
		102	${PATCHDIR}/5.005_03-patch-t::18ttschema-producer.t \
		103	${PATCHDIR}/5.005_03-patch-t::19sybase-parser.t \
		104	${PATCHDIR}/5.005_03-patch-t::27sqlite-parser.t
		105
89	.endif	106	.endif
90		107
91	.include <bsd.port.post.mk>	108	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Parser::Excel.pm (+15 lines)
	1	--- lib/SQL/Translator/Parser/Excel.pm.orig Sun May 9 14:49:45 2004
	2	+++ lib/SQL/Translator/Parser/Excel.pm Sun May 9 14:50:21 2004
	3	@@ -183,9 +183,9 @@
	4	$size = [ $size->[0] + $size->[1] ];
	5	}
	6
	7	- my $field = $table->get_field( $field );
	8	- $field->size( $size ) if $size;
	9	- $field->data_type( $data_type );
	10	+ my $f = $table->get_field( $field );
	11	+ $f->size( $size ) if $size;
	12	+ $f->data_type( $data_type );
	13	}
	14	}
	15	}

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm (+15 lines)
	1	--- lib/SQL/Translator/Parser/xSV.pm.orig Sun May 9 21:39:20 2004
	2	+++ lib/SQL/Translator/Parser/xSV.pm Sun May 9 21:39:50 2004
	3	@@ -174,9 +174,9 @@
	4	$size = [ $size->[0] + $size->[1] ];
	5	}
	6
	7	- my $field = $table->get_field( $field );
	8	- $field->size( $size );
	9	- $field->data_type( $data_type );
	10	+ my $f = $table->get_field( $field );
	11	+ $f->size( $size );
	12	+ $f->data_type( $data_type );
	13	}
	14	}
	15

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm (+39 lines)
	1	--- lib/SQL/Translator/Producer/Diagram.pm.orig Sun May 9 15:00:01 2004
	2	+++ lib/SQL/Translator/Producer/Diagram.pm Sun May 9 15:09:32 2004
	3	@@ -502,27 +502,27 @@
	4	#
	5	debug("imap file = '$imap_file'");
	6	if ( $imap_file && @imap_coords ) {
	7	- open my $fh, ">$imap_file" or die "Can't write '$imap_file': $!\n";
	8	- print $fh qq[<html><body><img src="" usemap="#imap" border="0">\n].
	9	+ open FH, ">$imap_file" or die "Can't write '$imap_file': $!\n";
	10	+ print FH qq[<html><body><img src="" usemap="#imap" border="0">\n].
	11	qq[<map name="imap">\n];
	12	for my $rec ( @imap_coords ) {
	13	my $href = shift @$rec;
	14	- print $fh q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
	15	+ print FH q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
	16	}
	17	- print $fh qq[</body></html>];
	18	- close $fh;
	19	+ print FH qq[</body></html>];
	20	+ close FH;
	21	}
	22
	23	#
	24	# Print the image.
	25	#
	26	if ( $out_file ) {
	27	- open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
	28	- print $fh $gd->$output_type;
	29	- close $fh;
	30	+ open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
	31	+ print FH $gd->$output_type();
	32	+ close FH;
	33	}
	34	else {
	35	- return $gd->$output_type;
	36	+ return $gd->$output_type();
	37	}
	38	}
	39

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm (+21 lines)
	1	--- lib/SQL/Translator/Producer/GraphViz.pm.orig Sun May 9 15:10:03 2004
	2	+++ lib/SQL/Translator/Producer/GraphViz.pm Sun May 9 15:10:53 2004
	3	@@ -378,13 +378,13 @@
	4	#
	5	my $output_method = "as_$output_type";
	6	if ( $out_file ) {
	7	- open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
	8	- binmode $fh;
	9	- print $fh $gv->$output_method;
	10	- close $fh;
	11	+ open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
	12	+ binmode FH;
	13	+ print FH $gv->$output_method();
	14	+ close FH;
	15	}
	16	else {
	17	- return $gv->$output_method;
	18	+ return $gv->$output_method();
	19	}
	20	}
	21

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm (+23 lines)
	1	--- lib/SQL/Translator/Producer/XML/SQLFairy.pm.orig Sun May 9 15:11:42 2004
	2	+++ lib/SQL/Translator/Producer/XML/SQLFairy.pm Sun May 9 15:13:45 2004
	3	@@ -224,9 +224,9 @@
	4	# Use array to ensure consistant (ie not hash) ordering of attribs
	5	# The order comes from the meths list passes in.
	6	my @attr = map {
	7	- my $val = $obj->$_;
	8	+ my $val = $obj->$_();
	9	($_ => ref($val) eq 'ARRAY' ? join(', ', @$val) : $val);
	10	- } grep { defined $obj->$_ } @meths;
	11	+ } grep { defined $obj->$_() } @meths;
	12	$empty_tag ? $xml->emptyTag( [ $Namespace => $tag ], @attr )
	13	: $xml->startTag( [ $Namespace => $tag ], @attr );
	14	}
	15	@@ -247,7 +247,7 @@
	16	my $emit_empty = $PArgs->{'emit_empty_tags'};
	17
	18	for my $method ( @methods ) {
	19	- my $val = $obj->$method;
	20	+ my $val = $obj->$method();
	21	debug " ".ref($obj)."->$method=",
	22	(defined $val ? "'$val'" : "<UNDEF>");
	23	next unless $emit_empty \|\| defined $val;

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::16xml-parser.t (+32 lines)
	1	--- t/16xml-parser.t.orig Sun May 9 19:15:25 2004
	2	+++ t/16xml-parser.t Sun May 9 19:27:08 2004
	3	@@ -12,7 +12,7 @@
	4
	5	use strict;
	6	use Test::More;
	7	-use Test::Exception;
	8	+#use Test::Exception; # not actually used
	9
	10	use strict;
	11	use Data::Dumper;
	12	@@ -49,16 +49,16 @@
	13	if ( exists $test->{$attr} ) {
	14	my $ans = $test->{$attr};
	15	if ( $attr =~ m/^is_/ ) {
	16	- if ($ans) { ok $fld->$attr, "$name - $attr true"; }
	17	- else { ok !$fld->$attr, "$name - $attr false"; }
	18	+ if ($ans) { ok $fld->$attr(), "$name - $attr true"; }
	19	+ else { ok !$fld->$attr(), "$name - $attr false"; }
	20	}
	21	else {
	22	- is $fld->$attr, $ans, "$name - $attr = '"
	23	+ is $fld->$attr(), $ans, "$name - $attr = '"
	24	.(defined $ans ? $ans : "NULL" )."'";
	25	}
	26	}
	27	else {
	28	- ok !$fld->$attr, "$name - $attr not set";
	29	+ ok !$fld->$attr(), "$name - $attr not set";
	30	}
	31	}
	32	}

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::17sqlfxml-producer.t (+98 lines)
		1	--- t/17sqlfxml-producer.t.orig Sun May 9 20:51:50 2004
		2	+++ t/17sqlfxml-producer.t Sun May 9 20:55:44 2004
		3	@@ -8,7 +8,10 @@
		4
		5	use strict;
		6	use Test::More;
		7	-use Test::Exception;
		8	+use vars '$no_test_exception';
		9	+$no_test_exception = 0;
		10	+eval { require Test::Exception; };
		11	+$no_test_exception = $@;
		12
		13	use Data::Dumper;
		14	my %opt;
		15	@@ -149,7 +152,12 @@
		16	from => 'MySQL',
		17	to => 'XML-SQLFairy',
		18	);
		19	-lives_ok {$xml = $obj->translate($file);} "Translate (emit_empty_tags=>0) ran";
		20	+if ($no_test_exception) {
		21	+ $xml = $obj->translate($file);
		22	+ pass "Translate (emit_empty_tags=>0) ran";
		23	+} else {
		24	+ lives_ok {$xml = $obj->translate($file);} "Translate (emit_empty_tags=>0) ran";
		25	+}
		26	ok("$xml" ne "" ,"Produced something!");
		27	print "XML:\n$xml" if DEBUG;
		28	# Strip sqlf header with its variable date so we diff safely
		29	@@ -270,7 +278,12 @@
		30	to => 'XML-SQLFairy',
		31	producer_args => { emit_empty_tags => 1 },
		32	);
		33	-lives_ok { $xml=$obj->translate($file); } "Translate (emit_empty_tags=>1) ran";
		34	+if ($no_test_exception) {
		35	+ $xml=$obj->translate($file);
		36	+ pass "Translate (emit_empty_tags=>1) ran";
		37	+} else {
		38	+ lives_ok { $xml=$obj->translate($file); } "Translate (emit_empty_tags=>1) ran";
		39	+}
		40	ok("$xml" ne "" ,"Produced something!");
		41	print "XML emit_empty_tags=>1:\n$xml" if DEBUG;
		42	# Strip sqlf header with its variable date so we diff safely
		43	@@ -314,7 +327,12 @@
		44	to => "XML-SQLFairy",
		45	producer_args => { attrib_values => 1 },
		46	);
		47	-lives_ok {$xml = $obj->translate($file);} "Translate (attrib_values=>1) ran";
		48	+if ($no_test_exception) {
		49	+ $xml = $obj->translate($file);
		50	+ pass "Translate (attrib_values=>1) ran";
		51	+} else {
		52	+ lives_ok {$xml = $obj->translate($file);} "Translate (attrib_values=>1) ran";
		53	+}
		54	ok("$xml" ne "" ,"Produced something!");
		55	print "XML attrib_values=>1:\n$xml" if DEBUG;
		56	# Strip sqlf header with its variable date so we diff safely
		57	@@ -364,7 +382,12 @@
		58
		59	# As we have created a Schema we give translate a dummy string so that
		60	# it will run the produce.
		61	- lives_ok {$xml =$obj->translate("FOO");} "Translate (View) ran";
		62	+ if ($no_test_exception) {
		63	+ $xml =$obj->translate("FOO");
		64	+ pass "Translate (View) ran";
65	+ } else {
66	+ lives_ok {$xml =$obj->translate("FOO");} "Translate (View) ran";
67	+ }
68	ok("$xml" ne "" ,"Produced something!");
69	print "XML attrib_values=>1:\n$xml" if DEBUG;
70	# Strip sqlf header with its variable date so we diff safely
71	@@ -418,7 +441,12 @@
72
73	# As we have created a Schema we give translate a dummy string so that
74	# it will run the produce.
75	- lives_ok {$xml =$obj->translate("FOO");} "Translate (Trigger) ran";
76	+ if ($no_test_exception) {
77	+ $xml =$obj->translate("FOO");
78	+ pass "Translate (Trigger) ran";
79	+ } else {
80	+ lives_ok {$xml =$obj->translate("FOO");} "Translate (Trigger) ran";
81	+ }
82	ok("$xml" ne "" ,"Produced something!");
83	print "XML attrib_values=>1:\n$xml" if DEBUG;
84	# Strip sqlf header with its variable date so we diff safely
85	@@ -472,7 +500,12 @@
86
87	# As we have created a Schema we give translate a dummy string so that
88	# it will run the produce.
89	- lives_ok {$xml =$obj->translate("FOO");} "Translate (Procedure) ran";
90	+ if ($no_test_exception) {
91	+ $xml =$obj->translate("FOO");
92	+ pass "Translate (Procedure) ran";
93	+ } else {
94	+ lives_ok {$xml =$obj->translate("FOO");} "Translate (Procedure) ran";
95	+ }
96	ok("$xml" ne "" ,"Produced something!");
97	print "XML attrib_values=>1:\n$xml" if DEBUG;
98	# Strip sqlf header with its variable date so we diff safely

Line 0 Link Here

(-)/usr/home/lth/ports/databases/p5-SQL-Translator/files/5.005_03-patch-t::18ttschema-producer.t (+28 lines)
	1	--- t/18ttschema-producer.t.orig Sun May 9 20:56:35 2004
	2	+++ t/18ttschema-producer.t Sun May 9 20:57:54 2004
	3	@@ -6,7 +6,10 @@
	4
	5	use strict;
	6	use Test::More;
	7	-use Test::Exception;
	8	+use vars '$no_test_exception';
	9	+$no_test_exception = 0;
	10	+eval { require Test::Exception; };
	11	+$no_test_exception = $@;
	12
	13	use Data::Dumper;
	14	use vars '%opt';
	15	@@ -47,7 +50,12 @@
	16	},
	17	);
	18	my $out;
	19	-lives_ok { $out = $obj->translate; } "Translate ran";
	20	+if ($no_test_exception) {
	21	+ $out = $obj->translate;
	22	+ pass "Translate ran";
	23	+} else {
	24	+ lives_ok { $out = $obj->translate; } "Translate ran";
	25	+}
	26	ok $out ne "" ,"Produced something!";
	27	local $/ = undef; # slurp
	28	eq_or_diff $out, <DATA> ,"Output looks right";