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

diff --git a/lib/SQL/Translator/Parser/xSV.pm b/lib/SQL/Translator/Parser/xSV.pm
index dff86b8..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.7 2003-05-09 17:15:30 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>
@@ -66,7 +66,7 @@ C<SQL::Translator::Utils::normalize>.
 
 use strict;
 use vars qw($VERSION @EXPORT);
-$VERSION = sprintf "%d.%02d", q$Revision: 1.7 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.10 $ =~ /(\d+)\.(\d+)/;
 
 use Exporter;
 use Text::ParseWords qw(quotewords);
@@ -80,7 +80,7 @@ use base qw(Exporter);
 # Passed a SQL::Translator instance and a string containing the data
 #
 sub parse {
-    my ($tr, $data, $schema) = @_;
+    my ( $tr, $data )    = @_;
     my $args             = $tr->parser_args;
     my $parser           = Text::RecordParser->new(
         field_separator  => $args->{'field_separator'}  || ',',
@@ -92,17 +92,7 @@ sub parse {
     $parser->field_filter( sub { $_ = shift; s/^\s+|\s+$//g; $_ } ) 
         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' );
 
     #
@@ -112,24 +102,6 @@ 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',
@@ -156,22 +128,33 @@ sub parse {
         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';
                 }
 
-                my $fsize = $field_info{ $field }{'size'} || 0;
-                if ( $size > $fsize ) {
-                    $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 }++;
@@ -184,27 +167,13 @@ sub parse {
                 $field_info{ $field }{'char'}  ? 'char'  : 
                 $field_info{ $field }{'float'} ? 'float' : 'integer';
 
-            $parsed->{'table1'}{'fields'}{ $field }{'size'} = 
-                [ $field_info{ $field }{'size'} ];
-
-            $parsed->{'table1'}{'fields'}{ $field }{'data_type'} = $data_type;
-
             my $field = $table->get_field( $field );
             $field->size( $size );
             $field->data_type( $data_type );
         }
     }
 
-    #
-    # 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] ];
-    }
-
-    return $parsed;
+    return 1;
 }
 
 1;