Whitespace

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Producer / Dumper.pm

diff --git a/lib/SQL/Translator/Producer/Dumper.pm b/lib/SQL/Translator/Producer/Dumper.pm
index c0cb96b..38b67a2 100644 (file)
--- a/lib/SQL/Translator/Producer/Dumper.pm
+++ b/lib/SQL/Translator/Producer/Dumper.pm
@@ -1,9 +1,7 @@
 package SQL::Translator::Producer::Dumper;
 
 # -------------------------------------------------------------------
-# $Id: Dumper.pm,v 1.1 2004-03-09 19:14:42 kycl4rk Exp $
-# -------------------------------------------------------------------
-# Copyright (C) 2002-4 SQLFairy Authors
+# Copyright (C) 2002-2006 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -30,7 +28,6 @@ SQL::Translator::Producer::Dumper - SQL Dumper producer for SQL::Translator
 
   Options:
 
-    add-truncate    Add "TRUNCATE TABLE" statements for each table
     db_user         Database username
     db_password     Database password
     dsn             DSN for DBI
@@ -62,24 +59,24 @@ use vars qw($VERSION);
 
 use Data::Dumper;
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/;
+$VERSION = '1.59';
 
 sub produce {
     my $t              = shift;
     my $args           = $t->producer_args;
     my $schema         = $t->schema;
-    my $add_truncate   = $args->{'add_truncate'}   || 0; 
+    my $add_truncate   = $args->{'add_truncate'}   || 0;
     my $skip           = $args->{'skip'}           || '';
     my $skiplike       = $args->{'skiplike'}       || '';
     my $db_user        = $args->{'db_user'}        || 'db_user';
     my $db_pass        = $args->{'db_password'}    || 'db_pass';
     my $parser_name    = $t->parser_type;
-    my %skip           = map { $_, 1 } map { s/^\s+|\s+$//; $_ } 
+    my %skip           = map { $_, 1 } map { s/^\s+|\s+$//; $_ }
                          split (/,/, $skip);
     my $sqlt_version   = $t->version;
 
-    if ( $parser_name  =~ /Parser::(\w+)$/ ) { 
-        $parser_name = $1 
+    if ( $parser_name  =~ /Parser::(\w+)$/ ) {
+        $parser_name = $1
     }
 
     my %type_to_dbd    = (
@@ -106,9 +103,9 @@ sub produce {
     my $template      = Template->new;
     my $template_text = template();
     my $out;
-    $template->process( 
-        \$template_text, 
-        { 
+    $template->process(
+        \$template_text,
+        {
             translator     => $t,
             schema         => $schema,
             db_user        => $db_user,
@@ -117,8 +114,8 @@ sub produce {
             perl           => $Config{'startperl'},
             skip           => \%skip,
             skiplike       => $skiplike,
-        }, 
-        \$out 
+        },
+        \$out
     ) or die $template->error;
 
     return $out;
@@ -144,7 +141,8 @@ use DBI;
 use Getopt::Long;
 use File::Spec::Functions 'catfile';
 
-my ( $help, $add_truncate, $skip, $skiplike, $no_comments, $mysql_loadfile );
+my ( $help, $add_truncate, $skip, $skiplike, $no_comments,
+    $takelike, $mysql_loadfile );
 GetOptions(
     'add-truncate'   => \$add_truncate,
     'h|help'         => \$help,
@@ -152,12 +150,13 @@ GetOptions(
     'mysql-loadfile' => \$mysql_loadfile,
     'skip:s'         => \$skip,
     'skiplike:s'     => \$skiplike,
+    'takelike:s'     => \$takelike,
 );
 
 if ( $help ) {
     print <<"USAGE";
 Usage:
-  $0 [options]
+  $0 [options] > dump.sql
 
   Options:
     -h|--help          Show help and exit
@@ -165,7 +164,8 @@ Usage:
     --mysql-loadfile   Create MySQL's LOAD FILE syntax, not INSERTs
     --no-comments      Suppress comments
     --skip=t1[,t2]     Comma-separated list of tables to skip
-    --skiplike=regex   Comma-separated list of tables to skip
+    --skiplike=regex   Regular expression of table names to skip
+    --takelike=regex   Regular expression of table names to take
 
 USAGE
     exit(0);
@@ -188,7 +188,7 @@ FOREACH table IN schema.get_tables;
         field_name = field.name;
         fname_len  = field.name.length;
         max_field  = fname_len > max_field ? fname_len : max_field;
-        types.$field_name = field.data_type.match( '(char|str|long|text)' )
+        types.$field_name = field.data_type.match( '(char|str|long|text|enum|date)' )
             ? 'string' : 'number';
         field_names.push( field_name );
     END;
@@ -198,10 +198,15 @@ FOREACH table IN schema.get_tables;
         types  => types,
         fields => field_names,
     });
-END 
+END
 -%]
 
-my $db     = DBI->connect('[% dsn %]', '[% db_user %]', '[% db_pass %]');
+my $db     = DBI->connect(
+    '[% dsn %]',
+    '[% db_user %]',
+    '[% db_pass %]',
+    { RaiseError => 1 }
+);
 my %skip   = map { $_, 1 } map { s/^\s+|\s+$//; $_ } split (/,/, $skip);
 my @tables = (
 [%- FOREACH t IN table_defs %]
@@ -221,11 +226,12 @@ for my $table ( @tables ) {
     my $table_name = $table->{'table_name'};
     next if $skip{ $table_name };
     next if $skiplike && $table_name =~ qr/$skiplike/;
+    next if $takelike && $table_name !~ qr/$takelike/;
 
     my ( $out_fh, $outfile );
     if ( $mysql_loadfile ) {
         $outfile = catfile( cwd(), "$table_name.txt" );
-        open $out_fh, ">$outfile" or 
+        open $out_fh, ">$outfile" or
             die "Can't write LOAD FILE to '$table_name': $!\n";
     }
 
@@ -235,12 +241,13 @@ for my $table ( @tables ) {
         print "TRUNCATE TABLE $table_name;\n";
     }
 
-    my $data = $db->selectall_arrayref(
-        'select ' . join(', ', @{ $table->{'fields'} } ) . " from $table_name",
-        { Columns => {} }
-    );
+    my $sql =
+        'select ' . join(', ', @{ $table->{'fields'} } ) . " from $table_name"
+    ;
+    my $sth = $db->prepare( $sql );
+    $sth->execute;
 
-    for my $rec ( @{ $data } ) {
+    while ( my $rec = $sth->fetchrow_hashref ) {
         my @vals;
         for my $fld ( @{ $table->{'fields'} } ) {
             my $val = $rec->{ $fld };
@@ -257,15 +264,15 @@ for my $table ( @tables ) {
                 $val = defined $val ? $val : $mysql_loadfile ? '\N' : 'NULL';
             }
             push @vals, $val;
-        }        
+        }
 
         if ( $mysql_loadfile ) {
             print $out_fh join("\t", @vals), "\n";
         }
         else {
             print "INSERT INTO $table_name (".
-                join(', ', @{ $table->{'fields'} }) . 
-                ' VALUES (', join(', ', @vals), ");\n";
+                join(', ', @{ $table->{'fields'} }) .
+                ') VALUES (', join(', ', @vals), ");\n";
         }
     }
 
@@ -292,6 +299,6 @@ EOF
 
 =head1 AUTHOR
 
-Ken Y. Clark E<lt>kclark@cpan.orgE<gt>.
+Ken Youens-Clark E<lt>kclark@cpan.orgE<gt>.
 
 =cut