r47818 - in /branches/upstream/libdbd-csv-perl/current: ChangeLog META.yml lib/DBD/CSV.pm t/71_csv-ext.t t/72_csv-schema.t t/80_rt.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Nov 27 02:41:46 UTC 2009
Author: jawnsy-guest
Date: Fri Nov 27 02:41:40 2009
New Revision: 47818
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47818
Log:
[svn-upgrade] Integrating new upstream version, libdbd-csv-perl (0.2600)
Modified:
branches/upstream/libdbd-csv-perl/current/ChangeLog
branches/upstream/libdbd-csv-perl/current/META.yml
branches/upstream/libdbd-csv-perl/current/lib/DBD/CSV.pm
branches/upstream/libdbd-csv-perl/current/t/71_csv-ext.t
branches/upstream/libdbd-csv-perl/current/t/72_csv-schema.t
branches/upstream/libdbd-csv-perl/current/t/80_rt.t
Modified: branches/upstream/libdbd-csv-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/ChangeLog?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/ChangeLog (original)
+++ branches/upstream/libdbd-csv-perl/current/ChangeLog Fri Nov 27 02:41:40 2009
@@ -1,4 +1,11 @@
-2009-10-15 H.Merijn Brand (0.25)
+2009-11-10 0.26 H.Merijn Brand
+
+ * Adjustments for windows (RT#50544)
+ * Mark all non-\w chars illegal in field and table names
+ * Fix field types after execute (RT#51090, vgdoqd)
+ * Fix for NULL joins. Requires SQL::Statement 1.23 (RT#43010, JBAZIK)
+
+2009-10-15 0.25 H.Merijn Brand
* Raised minimum perl version to 5.005_03
* Requires Text::CSV_XS 0.43 (needs eof () method and
@@ -20,7 +27,7 @@
* Table names case sensitiveness
* Implemented raw_header (RT#44583)
-2005-08-10 Jeff Zucker <jzuckerATcpan.org> (0.23)
+2005-08-10 0.23 Jeff Zucker <jzuckerATcpan.org>
* fixed bug in automatic column generation, defining
col_names => [] will auto generate col1, col2, etc.
@@ -28,17 +35,17 @@
* added support for multi-character end-of-line separators
thanks for suggestion, harleypig on AnnoCPAN
-
-2005-04-01 Jeff Zucker <jzuckerATcpan.org> (0.22)
+
+2005-04-01 0.22 Jeff Zucker <jzuckerATcpan.org>
* removed DESTROY and disconnect - use DBD File's instead
* added ignore_missing_table flag to avoid warnings with
DROP TABLE IF EXISTS
-
-2004-04-18 Jeff Zucker <jzuckerATcpan.org> (0.21)
-
- * added support for $dbh->{Active}, should now work
+
+2004-04-18 0.21 Jeff Zucker <jzuckerATcpan.org>
+
+ * added support for $dbh->{Active}, should now work
well with Class::DBI and other caching systems
* added support for DROP TABLE IF EXISTS - doesn't
@@ -46,8 +53,8 @@
* removed DBD::File from the distribution - it's now
distributed with DBI 1.42 and higher
-
-2002-03-01 Jeff Zucker <jzuckerATcpan.org> (0.2002)
+
+2002-03-01 0.2002 Jeff Zucker <jzuckerATcpan.org>
* added parser-caching for speedier operation,
see File.pm prepare()
@@ -56,7 +63,7 @@
prototypes to make it perl 5.8 compatible
-2002-01-21 Jeff Zucker <jzuckerATcpan.org> (0.2001)
+2002-01-21 0.2001 Jeff Zucker <jzuckerATcpan.org>
* adjusted docs to show Jeff as the new maintainer.
@@ -66,7 +73,7 @@
* adjusted tests blobs.t, chopblanks.t, and ak-dbd.t
to work with all versions of SQL::Statement.
-2002-12-20 Jochen Wiedmann <joe at ispsoft.de> (0.1030)
+2002-12-20 0.1030 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm: Locking is now suppressed under
VMS. David Webb <d.webb at mdx.ac.uk>
@@ -75,22 +82,22 @@
on VMS and not "f_dir=.". David Webb
<d.webb at mdx.ac.uk>
-2001-11-28 Jochen Wiedmann <joe at ispsoft.de> (0.1029)
+2001-11-28 0.1029 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm (fetch_row): A numeric value
must be assigned to $!.
-2001-11-20 Jochen Wiedmann <joe at ispsoft.de> (0.1028)
+2001-11-20 0.1028 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm (fetch_row): Changed "undef $!"
to "$! = ''". David Arnold <arnoldd at aecl.ca>
-2001-05-04 Jochen Wiedmann <joe at ispsoft.de> (0.1026)
+2001-05-04 0.1026 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (table_info): Added closedir().
Alex Hornby <alex at anvil.co.uk>
-2000-12-22 Jochen Wiedmann <joe at ispsoft.de> (0.1025)
+2000-12-22 0.1025 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm (fetch_row): Now cleaning $! before
calling $csv->getline(). Seems to return false errors
@@ -100,19 +107,19 @@
* Removed unnecessary stuff in Makefile.PL which verified
the DBI installation.
-2000-07-31 Jochen Wiedmann <joe at ispsoft.de> (0.1023)
+2000-07-31 0.1023 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (STORE): Changed croak to die.
- Guido Flohr <guido at imperia.westend.com>
-
-2000-07-31 Jochen Wiedmann <joe at ispsoft.de> (0.1023)
+ Guido Flohr <guido at imperia.westend.com>
+
+2000-07-31 0.1023 Jochen Wiedmann <joe at ispsoft.de>
* Minor fix in the docs, thanks to Andreas Grupp,
grupp at elektronikschule.de.
* Minor compatibility fixes in the test suite for
Perl 5.6.
-1999-10-07 Jochen Wiedmann <joe at ispsoft.de> (0.1022)
+1999-10-07 0.1022 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (connect): In the DSN, \ was removed in
all cases. It is now possible to use \\ for a DSN
@@ -123,7 +130,7 @@
* lib/DBD/CSV.pm: More POD patches, thanks to
Timothy F Armbruster <tfarmbruster at notes.west.raytheon.com>.
-1999-05-10 Jochen Wiedmann <joe at ispsoft.de> (0.1021)
+1999-05-10 0.1021 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm (push_row): Fixed typo in docs where DBI:File:
was used instead of DBI:CSV: (Mitra <mitra at earth.path.net>)
@@ -132,36 +139,36 @@
<smnayeem at dhaka.agni.com>.
* lib/DBD/File.pm: Removed use of flock under Win95.
-1999-03-17 Jochen Wiedmann <joe at ispsoft.de> (0.1020)
+1999-03-17 0.1020 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (FETCH): Simplified handling of $sth->{'NAME'}
due to a change in SQL::Statement 0.1011. (Teun Burgers,
Teun Burgers <burgers at ecn.nl>)
-1999-02-11 Jochen Wiedmann <joe at ispsoft.de> (0.1019)
+1999-02-11 0.1019 Jochen Wiedmann <joe at ispsoft.de>
* Makefile.PL (CheckModule): Now requires Text::CSV_XS 0.16, due
to an imcompatible change.
-1998-12-30 Jochen Wiedmann <joe at ispsoft.de> (0.1018)
+1998-12-30 0.1018 Jochen Wiedmann <joe at ispsoft.de>
* t/lib.pl: Fixed a bug in the test suite. (File::Spec wasn't
loaded)
-1998-10-26 Jochen Wiedmann <joe at ispsoft.de> (0.1017)
+1998-10-26 0.1017 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm: Fixed some examples in the docs. (Brian
Millett, bpm at ec-group.com)
* Now using File::Spec, if available, for Mac portability.
(Chris Nandor, pudge at pobox.com)
-1998-10-20 Jochen Wiedmann <joe at ispsoft.de> (0.1016)
+1998-10-20 0.1016 Jochen Wiedmann <joe at ispsoft.de>
* lib/Bundle/DBD/CSV.pm: Added lib/Bundle/DBD/CSV.pm
* lib/DBD/File.pm: Added $dbh->table_info(). Added
$dbh->type_info_all(). Added $dbh->quote($str, $type).
-1998-09-17 Jochen Wiedmann <joe at ispsoft.de> (0.1015)
+1998-09-17 0.1015 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/CSV.pm: Fixed bug in the docs, the "undef" argument
was missing in conjunction with parameters,
@@ -169,18 +176,18 @@
* lib/DBD/CSV.pm: Added csv_eol, csv_sep_char, csv_quote_char
and csv_escape_char to DSN.
-1998-08-31 Jochen Wiedmann <joe at ispsoft.de> (0.1014)
+1998-08-31 0.1014 Jochen Wiedmann <joe at ispsoft.de>
* Makefile.PL: Added AUTHOR, ABSTRACT_FROM and PREREQ_PM.
* Makefile.PL: Fixed error handling by using DBI::set_err.
-1998-08-17 Jochen Wiedmann <joe at ispsoft.de> (0.1013)
+1998-08-17 0.1013 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (drop): $self->{'fh'} is now closed before
unlinking it. This makes DROP TABLE work under Win32 and
other Non-Unixes.
-1998-08-17 Jochen Wiedmann <joe at ispsoft.de> (0.1012)
+1998-08-17 0.1012 Jochen Wiedmann <joe at ispsoft.de>
* lib/DBD/File.pm (open_table): Added binmode.
* Added Gerald Richter's modifications for DBD::ConfFile to the
@@ -194,24 +201,24 @@
* DBD-File/File.pm: Fixed some $sth->{attr}'s to $sth->FETCH|STORE,
my thanks to Gerald Richter.
-1998-06-25 Jochen Wiedmann <joe at ispsoft.de> (0.1011)
+1998-06-25 0.1011 Jochen Wiedmann <joe at ispsoft.de>
* DBD-File/File.pm (execute): Added missing eval around
$stmt->execute();
* DBD-File/File.pm (FETCH): $sth->{TYPE} is now returning
undef (workaround for a bug in DBI 0.93).
-1998-06-11 Jochen Wiedmann <joe at ispsoft.de> (0.1010)
+1998-06-11 0.1010 Jochen Wiedmann <joe at ispsoft.de>
* Added DBD::File, DBD::CSV is derived from it.
* CSV.pm (open_table): Added $dbh->{tables}->{$table}->{file}.
-1998-05-21 Jochen Wiedmann <joe at ispsoft.de> (0.1002)
+1998-05-21 0.1002 Jochen Wiedmann <joe at ispsoft.de>
* CSV.pm: Now using the misc.files_as_tables feature
of SQL::Statement
-1998-05-05 Jochen Wiedmann <joe at ispsoft.de> (0.1000)
+1998-05-05 0.1000 Jochen Wiedmann <joe at ispsoft.de>
* Initial version
Modified: branches/upstream/libdbd-csv-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/META.yml?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/META.yml (original)
+++ branches/upstream/libdbd-csv-perl/current/META.yml Fri Nov 27 02:41:40 2009
@@ -1,6 +1,6 @@
--- #YAML:1.1
name: DBD::CSV
-version: 0.25
+version: 0.26
abstract: DBI driver for CSV files
license: perl
author:
@@ -12,12 +12,12 @@
provides:
DBD::CSV:
file: lib/DBD/CSV.pm
- version: 0.25
+ version: 0.26
requires:
perl: 5.005003
DBI: 1.00
DBD::File: 0.37
- SQL::Statement: 1.22
+ SQL::Statement: 1.23
Text::CSV_XS: 0.64
recommends:
perl: 5.010001
Modified: branches/upstream/libdbd-csv-perl/current/lib/DBD/CSV.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/lib/DBD/CSV.pm?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/lib/DBD/CSV.pm (original)
+++ branches/upstream/libdbd-csv-perl/current/lib/DBD/CSV.pm Fri Nov 27 02:41:40 2009
@@ -34,7 +34,7 @@
@ISA = qw( DBD::File );
-$VERSION = "0.25";
+$VERSION = "0.26";
$err = 0; # holds error code for DBI::err
$errstr = ""; # holds error string for DBI::errstr
@@ -204,7 +204,7 @@
my $t = [];
for (@{$types}) {
$_ = $_
- ? $DBD::CSV::CSV_TYPES[$_ + 6] || Text::CSV_XS::PV ()
+ ? $DBD::CSV::dr::CSV_TYPES[$_ + 6] || Text::CSV_XS::PV ()
: Text::CSV_XS::PV();
push @$t, $_;
}
@@ -219,7 +219,7 @@
if ($skipRows--) {
$array = $tbl->fetch_row ($data) or croak "Missing first row";
unless ($self->{raw_header}) {
- s/[-\x00-\x20'":;.,\/\\]/_/g for @$array;
+ s/\W/_/g for @$array;
}
$tbl->{col_names} = $array;
while ($skipRows--) {
@@ -268,6 +268,8 @@
my @diag = $csv->error_diag;
croak "Error $diag[0] while reading file $self->{file}: $diag[1]";
}
+ @$fields < @{$self->{col_names}} and
+ push @$fields, (undef) x (@{$self->{col_names}} - @$fields);
$self->{row} = (@$fields ? $fields : undef);
} # fetch_row
Modified: branches/upstream/libdbd-csv-perl/current/t/71_csv-ext.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/t/71_csv-ext.t?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/t/71_csv-ext.t (original)
+++ branches/upstream/libdbd-csv-perl/current/t/71_csv-ext.t Fri Nov 27 02:41:40 2009
@@ -22,9 +22,6 @@
my @tbl = $dbh->tables ();
if ($usr) {
s/^['"]*$usr["']*\.// for @tbl;
- }
- else {
- s/^[^.]+\.// for @tbl;
}
sort @tbl;
} # Tables
Modified: branches/upstream/libdbd-csv-perl/current/t/72_csv-schema.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/t/72_csv-schema.t?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/t/72_csv-schema.t (original)
+++ branches/upstream/libdbd-csv-perl/current/t/72_csv-schema.t Fri Nov 27 02:41:40 2009
@@ -22,10 +22,15 @@
qr{^create table $tbl}i, "table definition");
ok ($dbh->do ($def), "create table");
-my $usr = eval { getpwuid $< };
- $usr and $usr = qq{"$usr"};
-is_deeply ([ $dbh->tables () ],
- [ qq{$usr.$tbl} ], "tables");
+if (my $usr = eval { getpwuid $< }) {
+ $usr = qq{"$usr"};
+ is_deeply ([ $dbh->tables () ],
+ [ qq{$usr.$tbl} ], "tables");
+ }
+else {
+ is_deeply ([ $dbh->tables () ],
+ [ qq{$tbl} ], "tables");
+ }
ok ($dbh->disconnect, "disconnect");
undef $dbh;
Modified: branches/upstream/libdbd-csv-perl/current/t/80_rt.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libdbd-csv-perl/current/t/80_rt.t?rev=47818&op=diff
==============================================================================
--- branches/upstream/libdbd-csv-perl/current/t/80_rt.t (original)
+++ branches/upstream/libdbd-csv-perl/current/t/80_rt.t Fri Nov 27 02:41:40 2009
@@ -4,6 +4,7 @@
$^W = 1;
use Test::More "no_plan";
+use DBI qw(:sql_types);
do "t/lib.pl";
my ($rt, %input, %desc);
@@ -115,12 +116,8 @@
"JOIN $tbl[1][0]",
"USING (id)")), "join 1 2");
- TODO: {
- local $TODO = "NULL handling not finished yet";
-
- is_deeply ($row, { id => 8,
- one => 1, two => undef, thre => 3, four => undef }, "content");
- }
+ is_deeply ($row, { id => 8,
+ one => 1, two => undef, thre => 3, four => undef }, "content");
ok ($dbh->do ("drop table $_"), "drop table") for map { $_->[0] } @tbl;
ok ($dbh->disconnect, "disconnect");
@@ -194,12 +191,35 @@
ok ($sth->finish, "finish");
open my $fh, "<", DbFile ("RT$rt.csv");
+ binmode $fh;
is (scalar <$fh>, qq{name,id\r\n}, "Field names");
is (scalar <$fh>, qq{Tim,1\r\n}, "Record 1");
is (scalar <$fh>, qq{Tux,2\r\n}, "Record 2");
is (scalar <$fh>, qq{,3\r\n}, "Record 3");
is (scalar <$fh>, undef, "EOF");
close $fh;
+
+ ok ($dbh->do ("drop table RT$rt"), "drop");
+ ok ($dbh->disconnect, "disconnect");
+ }
+
+{ $rt = 51090;
+ ok ($rt, "RT-$rt - $desc{$rt}");
+ my @lines = @{$input{$rt}};
+ my @dbitp = ( SQL_INTEGER, SQL_LONGVARCHAR, SQL_NUMERIC );
+ my @csvtp = ( 1, 0, 2 );
+
+ open FILE, ">output/rt$rt";
+ print FILE @lines;
+ close FILE;
+
+ ok (my $dbh = Connect (), "connect");
+ ok (my $sth = $dbh->prepare ("select * from rt$rt"), "prepare");
+ $dbh->{csv_tables}{rt51090}{types} = [ @dbitp ];
+ is_deeply ($dbh->{csv_tables}{rt51090}{types}, \@dbitp, "set types (@dbitp)");
+
+ ok ($sth->execute (), "execute");
+ is_deeply ($dbh->{csv_tables}{rt51090}{types}, \@csvtp, "get types (@csvtp)");
ok ($dbh->do ("drop table RT$rt"), "drop");
ok ($dbh->disconnect, "disconnect");
@@ -235,3 +255,5 @@
c.tab,"s,tab"
1,ok
«46627» - DBD::File is damaged now
+«51090» - Report a bug in DBD-CSV
+integer,longvarchar,numeric
More information about the Pkg-perl-cvs-commits
mailing list