X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FxSV.pm;h=fad98a9eda140b369abc490878f1fb7716da5d18;hb=b8ea6076bd06412fff2026d7e1b2bcaea436ddf5;hp=cb9b48fb468ff5d374379b436acc4349e3432936;hpb=825ed07bb31a500ff4150222ea4d41815950d6f8;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Parser/xSV.pm b/lib/SQL/Translator/Parser/xSV.pm
index cb9b48f..fad98a9 100644
--- a/lib/SQL/Translator/Parser/xSV.pm
+++ b/lib/SQL/Translator/Parser/xSV.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Parser::xSV;
 
 # -------------------------------------------------------------------
-# $Id: xSV.pm,v 1.6 2003-05-07 20:36:59 kycl4rk Exp $
+# $Id: xSV.pm,v 1.10 2003-06-11 03:59:49 kycl4rk Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
 #                    darren chamberlain <darren@cpan.org>
@@ -47,12 +47,13 @@ include:
 =item * scan_fields
 
 Indicates that the columns should be scanned to determine data types
-and field sizes.
+and field sizes.  True by default.
 
 =item * trim_fields
 
 A shortcut to sending filters to Text::RecordParser, will create 
 callbacks that trim leading and trailing spaces from fields and headers.
+True by default.
 
 =back
 
@@ -65,7 +66,7 @@ C<SQL::Translator::Utils::normalize>.
 
 use strict;
 use vars qw($VERSION @EXPORT);
-$VERSION = sprintf "%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.10 $ =~ /(\d+)\.(\d+)/;
 
 use Exporter;
 use Text::ParseWords qw(quotewords);
@@ -79,8 +80,7 @@ use base qw(Exporter);
 # Passed a SQL::Translator instance and a string containing the data
 #
 sub parse {
-    my ($tr, $data) = @_;
-
+    my ( $tr, $data )    = @_;
     my $args             = $tr->parser_args;
     my $parser           = Text::RecordParser->new(
         field_separator  => $args->{'field_separator'}  || ',',
@@ -90,18 +90,10 @@ sub parse {
     );
 
     $parser->field_filter( sub { $_ = shift; s/^\s+|\s+$//g; $_ } ) 
-        if $args->{'trim_fields'};
+        unless defined $args->{'trim_fields'} && $args->{'trim_fields'} == 0;
 
-    #
-    # Create skeleton structure, mostly empty.
-    #
-    my $parsed      =  {
-        table1      => {
-            type    => undef,
-            indices => [ { } ],
-            fields  => { },
-        },
-    };
+    my $schema = $tr->schema;
+    my $table = $schema->add_table( name => 'table1' );
 
     #
     # Get the field names from the first row.
@@ -110,48 +102,59 @@ sub parse {
     my @field_names = $parser->field_list;
 
     for ( my $i = 0; $i < @field_names; $i++ ) {
-        $parsed->{'table1'}{'fields'}{ $field_names[$i] } = {
-            type           => 'field',
-            order          => $i,
-            name           => $field_names[$i],
-
-            # Default datatype is "char"
-            data_type      => "char",
-
-            # default size is 8bits; something more reasonable?
-            size           => [ 255 ],
-            null           => 1,
-            default        => '',
-            is_auto_inc    => undef,
-
-            # field field is the primary key
-            is_primary_key => ($i == 0) ? 1 : undef,
+        my $field = $table->add_field(
+            name              => $field_names[$i],
+            data_type         => 'char',
+            default_value     => '',
+            size              => 255,
+            is_nullable       => 1,
+            is_auto_increment => undef,
+        ) or die $table->error;
+
+        if ( $i == 0 ) {
+            $table->primary_key( $field->name );
+            $field->is_primary_key(1);
         }
     }
 
     #
     # If directed, look at every field's values to guess size and type.
     #
-    if ( $args->{'scan_fields'} ) {
+    unless ( 
+        defined $args->{'scan_fields'} &&
+        $args->{'scan_fields'} == 0
+    ) {
         my %field_info = map { $_, {} } @field_names;
         while ( my $rec = $parser->fetchrow_hashref ) {
             for my $field ( @field_names ) {
                 my $data = defined $rec->{ $field } ? $rec->{ $field } : '';
-                my $size = length $data;
+                my $size = [ length $data ];
                 my $type;
 
                 if ( $data =~ /^-?\d+$/ ) {
                     $type = 'integer';
                 }
-                elsif ( $data =~ /^[\d.-]+$/ ) {
+                elsif ( 
+                    $data =~ /^-?[,\d]+\.[\d+]?$/ 
+                    ||
+                    $data =~ /^-?[,\d]+?\.\d+$/  
+                    ||
+                    $data =~ /^-?\.\d+$/  
+                ) {
                     $type = 'float';
+                    my ( $w, $d ) = map { s/,//g; $_ } split( /\./, $data );
+                    $size = [ length $w, length $d ];
                 }
                 else {
                     $type = 'char';
                 }
 
-                if ( $size > $field_info{ $field }{'size'} ) {
-                    $field_info{ $field }{'size'} = $size;
+                for my $i ( 0, 1 ) {
+                    next unless defined $size->[ $i ];
+                    my $fsize = $field_info{ $field }{'size'}[ $i ] || 0;
+                    if ( $size->[ $i ] > $fsize ) {
+                        $field_info{ $field }{'size'}[ $i ] = $size->[ $i ];
+                    }
                 }
 
                 $field_info{ $field }{ $type }++;
@@ -159,25 +162,18 @@ sub parse {
         }
 
         for my $field ( keys %field_info ) {
-            $parsed->{'table1'}{'fields'}{ $field }{'size'} = 
-                [ $field_info{ $field }{'size'} ];
-
-            $parsed->{'table1'}{'fields'}{ $field }{'data_type'} = 
+            my $size      = $field_info{ $field }{'size'};
+            my $data_type = 
                 $field_info{ $field }{'char'}  ? 'char'  : 
                 $field_info{ $field }{'float'} ? 'float' : 'integer';
-        }
-    }
 
-    #
-    # Field 0 is primary key, by default, so add an index
-    #
-    for ( $parsed->{'table1'}->{'indices'}->[0] ) {
-        $_->{'type'}   = 'primary_key';
-        $_->{'name'}   = undef;
-        $_->{'fields'} = [ $field_names[0] ];
+            my $field = $table->get_field( $field );
+            $field->size( $size );
+            $field->data_type( $data_type );
+        }
     }
 
-    return $parsed;
+    return 1;
 }
 
 1;