head 1.74; access; symbols OPENPKG_E1_MP_HEAD:1.22 OPENPKG_E1_MP:1.22 OPENPKG_E1_MP_2_STABLE:1.18.2.1 OPENPKG_E1_FP:1.18.2.1 OPENPKG_2_STABLE_MP:1.23 OPENPKG_2_STABLE_20061018:1.18.2.1 OPENPKG_2_STABLE_20060622:1.18 OPENPKG_2_STABLE:1.18.0.2 OPENPKG_2_STABLE_BP:1.18 OPENPKG_2_5_RELEASE:1.16 OPENPKG_2_5_SOLID:1.16.0.2 OPENPKG_2_5_SOLID_BP:1.16 OPENPKG_2_4_RELEASE:1.15 OPENPKG_2_4_SOLID:1.15.0.2 OPENPKG_2_4_SOLID_BP:1.15 OPENPKG_CW_FP:1.15 OPENPKG_2_3_RELEASE:1.14 OPENPKG_2_3_SOLID:1.14.0.2 OPENPKG_2_3_SOLID_BP:1.14 OPENPKG_2_2_RELEASE:1.13.2.1 OPENPKG_2_2_SOLID:1.13.0.2 OPENPKG_2_2_SOLID_BP:1.13 OPENPKG_2_1_RELEASE:1.7 OPENPKG_2_1_SOLID:1.7.0.2 OPENPKG_2_1_SOLID_BP:1.7 OPENPKG_2_0_RELEASE:1.6 OPENPKG_2_0_SOLID:1.6.0.2 OPENPKG_2_0_SOLID_BP:1.6 OPENPKG_1_3_RELEASE:1.4.2.1 OPENPKG_1_3_SOLID:1.4.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.4.2.1 OPENPKG_1_STABLE:1.4.0.2 OPENPKG_1_STABLE_MP:1.4; locks; strict; comment @# @; 1.74 date 2009.12.24.21.15.39; author rse; state Exp; branches; next 1.73; commitid i1hU4vnFf0TiHFgu; 1.73 date 2009.11.26.13.03.21; author rse; state Exp; branches; next 1.72; commitid adaoOvYuF6gdS1du; 1.72 date 2009.11.23.16.50.07; author rse; state Exp; branches; next 1.71; commitid vqLCct7qZHeZdFcu; 1.71 date 2009.11.16.20.03.09; author rse; state Exp; branches; next 1.70; commitid KcAUO4Vym2s9wMbu; 1.70 date 2009.10.30.21.33.16; author rse; state Exp; branches; next 1.69; commitid AYjeCJuxxkzXyB9u; 1.69 date 2009.10.16.16.19.42; author rse; state Exp; branches; next 1.68; commitid cakB9qv3zgahhM7u; 1.68 date 2009.10.12.06.55.10; author rse; state Exp; branches; next 1.67; commitid WT4XKf6KUkhAhd7u; 1.67 date 2009.10.07.06.06.46; author rse; state Exp; branches; next 1.66; commitid Gmx5zSlXuyIWaz6u; 1.66 date 2009.09.19.07.29.05; author rse; state Exp; branches; next 1.65; commitid GZ8iElqm9Jm3dg4u; 1.65 date 2009.09.16.10.15.48; author rse; state Exp; branches; next 1.64; commitid bhXhFvfu9EaeeT3u; 1.64 date 2009.08.12.10.43.32; author rse; state Exp; branches; next 1.63; commitid Pi2Y3FeSogCuvoZt; 1.63 date 2009.06.19.19.27.29; author rse; state Exp; branches; next 1.62; commitid fTRAE3mFMyER8vSt; 1.62 date 2009.05.05.19.31.44; author rse; state Exp; branches; next 1.61; commitid OWQQ3YzjDbMZBIMt; 1.61 date 2009.04.23.17.13.01; author rse; state Exp; branches; next 1.60; commitid iu26GL4gnEskeaLt; 1.60 date 2009.04.19.20.56.07; author rse; state Exp; branches; next 1.59; commitid C3V2YFAxGGrPAFKt; 1.59 date 2009.04.18.06.42.07; author rse; state Exp; branches; next 1.58; commitid xMyAwebNjJaRTsKt; 1.58 date 2009.04.16.19.49.50; author rse; state Exp; branches; next 1.57; commitid NMqzaDQVcpr4khKt; 1.57 date 2009.04.15.17.05.05; author rse; state Exp; branches; next 1.56; commitid TPKhAgnO9KTwr8Kt; 1.56 date 2009.04.14.19.51.51; author rse; state Exp; branches; next 1.55; commitid UlQJIo4eDtkKo1Kt; 1.55 date 2009.04.11.09.01.19; author rse; state Exp; branches; next 1.54; commitid 9Zd6NWoGEEeyTzJt; 1.54 date 2009.04.10.09.47.05; author rse; state Exp; branches; next 1.53; commitid dfeGvJDgutJebsJt; 1.53 date 2009.04.09.07.59.12; author rse; state Exp; branches; next 1.52; commitid ibQq96DT9pOdCjJt; 1.52 date 2009.04.06.20.33.31; author rse; state Exp; branches; next 1.51; commitid m2qmwi1T4yVXSZIt; 1.51 date 2009.04.05.07.21.51; author rse; state Exp; branches; next 1.50; commitid kRYcDv84jxhoxNIt; 1.50 date 2009.02.16.18.43.22; author rse; state Exp; branches; next 1.49; commitid d5B34qZ8937RQGCt; 1.49 date 2009.02.10.08.00.43; author rse; state Exp; branches; next 1.48; commitid XtH3WyqTwkKkuRBt; 1.48 date 2008.12.14.18.33.40; author rse; state Exp; branches; next 1.47; commitid XQNk1WGTuHo3Rsut; 1.47 date 2008.12.06.18.36.53; author rse; state Exp; branches; next 1.46; commitid lTZ2JLOMPY778rtt; 1.46 date 2008.10.25.07.45.40; author rse; state Exp; branches; next 1.45; commitid eWaG404oCdlpSYnt; 1.45 date 2008.10.22.21.34.28; author rse; state Exp; branches; next 1.44; commitid sHTrw7YCF3uIyFnt; 1.44 date 2008.08.20.07.24.14; author rse; state Exp; branches; next 1.43; commitid uqUjSziPSZAASuft; 1.43 date 2008.08.16.15.25.43; author rse; state Exp; branches; next 1.42; commitid 6djSZ1Io5f5KF1ft; 1.42 date 2008.08.09.14.15.58; author rse; state Exp; branches; next 1.41; commitid JzA7MvYUTI4Lv7et; 1.41 date 2008.07.29.16.35.45; author rse; state Exp; branches; next 1.40; commitid OAkYtoXPMCrDDIct; 1.40 date 2008.07.23.06.22.09; author rse; state Exp; branches; next 1.39; commitid yzu2RLtj75y5rTbt; 1.39 date 2008.06.17.06.20.26; author rse; state Exp; branches; next 1.38; commitid Hyo09LsKVhlfAg7t; 1.38 date 2008.05.12.08.13.08; author rse; state Exp; branches; next 1.37; commitid UITECLNklTBEmE2t; 1.37 date 2008.02.29.16.04.17; author rse; state Exp; branches; next 1.36; commitid XXmXuXzlWMnLjjTs; 1.36 date 2008.02.26.18.43.51; author rse; state Exp; branches; next 1.35; commitid dkAtWKUwYXcuiWSs; 1.35 date 2008.02.10.09.10.31; author rse; state Exp; branches; next 1.34; commitid TZ4n3uV0kyDGDPQs; 1.34 date 2008.02.02.09.59.48; author rse; state Exp; branches; next 1.33; commitid fwBgKyANZgHxaOPs; 1.33 date 2007.12.27.10.01.00; author rse; state Exp; branches; next 1.32; commitid EPSSpmS4NkMFm3Ls; 1.32 date 2007.10.21.19.59.15; author rse; state Exp; branches; next 1.31; commitid cJJ5tfDqUMxrPuCs; 1.31 date 2007.09.20.08.17.30; author rse; state Exp; branches; next 1.30; commitid lytOeLtZxaHtWrys; 1.30 date 2007.09.20.07.59.57; author cs; state Exp; branches; next 1.29; commitid 8aCIKwmtHaIsQrys; 1.29 date 2007.06.26.19.15.20; author rse; state Exp; branches; next 1.28; commitid x8hXgZwzHtRxlsns; 1.28 date 2007.06.09.08.06.44; author rse; state Exp; branches; next 1.27; commitid V5I5hcOEGfP2cdls; 1.27 date 2007.04.15.08.51.20; author rse; state Exp; branches; next 1.26; commitid gNqXAeJLwcQXc9es; 1.26 date 2007.03.23.09.33.37; author rse; state Exp; branches; next 1.25; commitid Pv7LiAipm2djbcbs; 1.25 date 2007.03.03.09.04.11; author rse; state Exp; branches; next 1.24; commitid sdNVpq2CltW3FC8s; 1.24 date 2007.03.02.18.27.16; author rse; state Exp; branches; next 1.23; commitid QOjtMftMuw3fOx8s; 1.23 date 2007.01.08.18.33.04; author rse; state Exp; branches; next 1.22; commitid LUERIsd80DAQxJ1s; 1.22 date 2006.09.19.19.27.04; author rse; state Exp; branches; next 1.21; commitid NV0HFJDaCyOAptNr; 1.21 date 2006.09.19.18.08.30; author rse; state Exp; branches; next 1.20; commitid A7q7jxBFSr9DYsNr; 1.20 date 2006.09.08.15.29.49; author rse; state Exp; branches; next 1.19; commitid CKQW1rfn9o77s2Mr; 1.19 date 2006.07.24.11.06.09; author thl; state Exp; branches; next 1.18; commitid aJYtX03mZ61lt6Gr; 1.18 date 2006.06.07.07.59.40; author rse; state Exp; branches 1.18.2.1; next 1.17; commitid Ex2RhsX1ZDI1X2Ar; 1.17 date 2006.05.08.07.12.05; author rse; state Exp; branches; next 1.16; commitid hMqnEYaErYiuEbwr; 1.16 date 2005.06.21.19.04.13; author rse; state Exp; branches; next 1.15; 1.15 date 2005.02.27.21.54.17; author thl; state Exp; branches 1.15.2.1; next 1.14; 1.14 date 2004.10.13.17.34.52; author ms; state Exp; branches; next 1.13; 1.13 date 2004.09.24.08.46.56; author rse; state Exp; branches 1.13.2.1; next 1.12; 1.12 date 2004.09.18.11.11.17; author rse; state Exp; branches; next 1.11; 1.11 date 2004.08.24.07.57.32; author tho; state Exp; branches; next 1.10; 1.10 date 2004.08.10.10.39.33; author tho; state Exp; branches; next 1.9; 1.9 date 2004.08.01.18.18.28; author rse; state Exp; branches; next 1.8; 1.8 date 2004.07.23.10.06.55; author rse; state Exp; branches; next 1.7; 1.7 date 2004.02.26.08.55.27; author rse; state dead; branches; next 1.6; 1.6 date 2003.11.29.13.21.59; author rse; state Exp; branches; next 1.5; 1.5 date 2003.11.21.20.13.47; author rse; state Exp; branches; next 1.4; 1.4 date 2003.07.01.06.46.46; author mlelstv; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2003.06.23.13.50.45; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2003.05.28.11.56.51; author rse; state Exp; branches; next 1.1; 1.1 date 2003.05.17.11.41.51; author rse; state Exp; branches; next ; 1.18.2.1 date 2006.09.20.19.26.48; author rse; state Exp; branches; next 1.18.2.2; commitid DfYprSvU2mwvnBNr; 1.18.2.2 date 2007.01.26.17.00.53; author thl; state Exp; branches; next ; commitid RajVR207jGKgs24s; 1.15.2.1 date 2005.09.23.16.27.35; author rse; state Exp; branches; next ; 1.13.2.1 date 2004.10.13.18.57.07; author rse; state Exp; branches; next ; 1.4.2.1 date 2003.07.24.20.44.45; author rse; state Exp; branches; next ; desc @@ 1.74 log @modifying package: perl-dbi-5.10 20091126 -> 20091224 @ text @Index: DBD-SQLite-1.28_01/Makefile.PL --- DBD-SQLite-1.28_01/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.28_01/Makefile.PL 2009-10-12 08:29:04 +0200 @@@@ -17,46 +17,7 @@@@ return @@_; } -# Are we upgrading from a critically out of date version? -eval { - require DBD::SQLite; - if ( $DBD::SQLite::VERSION < 1.0 ) { - print <VERSION < $DBI_required ) { - print "DBI 1.57 is required to configure this module, please install it or upgrade your CPAN/CPANPLUS shell\n"; - exit(0); -} # See if we have a C compiler # The following code is adapted from Module::Install::Can @@@@ -198,17 +159,17 @@@@ # Prepare Compiler Options my @@CC_LIBS = (); -if ( $sqlite_lib ) { - push @@CC_LIBS, "-L$sqlite_lib"; -} -unless ( $sqlite_local ) { - push @@CC_LIBS, '-lsqlite3'; -} +my $libs = `@@l_prefix@@/bin/pkg-config sqlite3 --libs`; +$libs =~ s/\r?\n$//s; +push @@CC_LIBS, $libs; +my $inc = `@@l_prefix@@/bin/pkg-config sqlite3 --cflags-only-I`; +$inc =~ s/\r?\n$//s; my @@CC_INC = ( '-I.', '-I$(DBI_INSTARCH_DIR)', ); +unshift @@INC, $inc; if ( $sqlite_inc ) { push @@CC_INC, "-I$sqlite_inc"; } Index: DBD-Sybase-1.09/dbdimp.c --- DBD-Sybase-1.09/dbdimp.c.orig 2008-08-31 14:08:17 +0200 +++ DBD-Sybase-1.09/dbdimp.c 2009-10-12 08:29:04 +0200 @@@@ -774,22 +774,22 @@@@ #if defined(CS_VERSION_150) if(cs_ver == CS_VERSION_150) - BLK_VERSION = BLK_VERSION_150; + BLK_VERSION = CS_VERSION_150; #endif #if defined(CS_VERSION_125) if(cs_ver == CS_VERSION_125) - BLK_VERSION = BLK_VERSION_125; + BLK_VERSION = CS_VERSION_125; #endif #if defined(CS_VERSION_120) if(cs_ver == CS_VERSION_120) - BLK_VERSION = BLK_VERSION_120; + BLK_VERSION = CS_VERSION_120; #endif #if defined(CS_VERSION_110) if(cs_ver == CS_VERSION_110) - BLK_VERSION = BLK_VERSION_110; + BLK_VERSION = CS_VERSION_110; #endif if (cs_ver == CS_VERSION_100) - BLK_VERSION = BLK_VERSION_100; + BLK_VERSION = CS_VERSION_100; #if USE_CSLIB_CB if (cs_config(context, CS_SET, CS_MESSAGE_CB, Index: DBD-cego/Makefile.PL --- DBD-cego/Makefile.PL.orig 2009-04-09 17:37:51 +0200 +++ DBD-cego/Makefile.PL 2009-10-12 08:29:04 +0200 @@@@ -43,7 +43,7 @@@@ 'VERSION_FROM' => 'Cego.pm', 'PREREQ_PM' => {DBI => 1.03}, 'OBJECT' => '$(O_FILES)', - 'INC' => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include', + 'INC' => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} . '/include/cego', 'MYEXTLIB' => $opt->{'prefix'} . "/lib/libcego.a " . $opt->{'prefix'} . "/lib/libXML.a " . $opt->{'prefix'} . "/lib/libBase.a", Index: DBD-mysql-4.013/dbdimp.h --- DBD-mysql-4.013/dbdimp.h.orig 2009-09-15 03:57:53 +0200 +++ DBD-mysql-4.013/dbdimp.h 2009-10-12 08:29:04 +0200 @@@@ -19,6 +19,7 @@@@ * Header files we use */ #include /* installed by the DBI module */ +#include #include /* Comes with MySQL-devel */ #include /* Comes MySQL */ Index: SQL-Statement-1.23/Makefile.PL --- SQL-Statement-1.23/Makefile.PL.orig 2009-10-12 08:29:18 +0200 +++ SQL-Statement-1.23/Makefile.PL 2009-10-12 08:32:31 +0200 @@@@ -3,52 +3,6 @@@@ use strict; require ExtUtils::MakeMaker; -eval { require SQL::Statement; }; - -unless ($@@) -{ - my $sqlstmtver = $SQL::Statement::VERSION; - $sqlstmtver =~ s/_[0-9]+$//; - if ( $sqlstmtver <= 1.20 ) - { - my $warning = sprintf( <<'END_OF_WARNING', $SQL::Statement::VERSION ); - -WARNING! You seem to have an older version of SQL::Statement already installed (%s <= 1.20). -This new version introduces a number of features that will impact operation of SQL::Statement and of DBD drivers for CSV, AnyData, and Excel. - -Changes include (1.003): - * There are *many* new SQL features including table joins - * BLOBS, Empty strings, and NULLs behave differently - * Some applications may run a bit slower than previously - -Changes include (1.22): - * behavior for unquoted identifiers modified to lower case them - * IN and BETWEEN operators are supported native - -See the Changes for details. - -END_OF_WARNING - - my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ } keys %ENV; - if ( $cpan_smoker || defined( $ENV{SQL_STATEMENT_WARN_UPDATE} ) ) - { - warn $warning; - } - else - { - $warning .= <<'END_OF_WORKAROUND'; -Use - -$ env SQL_STATEMENT_WARN_UPDATE=sure perl Makefile.PL - -to build and install anyway. - -END_OF_WORKAROUND - Carp::croak($warning); - } - } -} - my %opts = ( 'NAME' => 'SQL::Statement', 'VERSION_FROM' => './lib/SQL/Statement.pm', @@@@ -76,3 +30,4 @@@@ $opts{'AUTHOR'} = 'Jeff Zucker , Jens Rehsack '; } ExtUtils::MakeMaker::WriteMakefile(%opts); + Index: SQL-Translator-0.11002/Makefile.PL --- SQL-Translator-0.11002/Makefile.PL.orig 2009-08-28 14:08:09 +0200 +++ SQL-Translator-0.11002/Makefile.PL 2009-10-12 08:29:04 +0200 @@@@ -14,7 +14,7 @@@@ 'Carp::Clan' => 0, 'IO::Dir' => 0, 'IO::Scalar' => 2.110, - 'Parse::RecDescent' => 1.962002, + 'Parse::RecDescent' => 1.962, 'Pod::Usage' => 0, 'Class::Accessor::Fast' => 0, 'DBI' => 0, @@@@ -32,13 +32,6 @@@@ 'Text::RecordParser' => 0.02, 'XML::LibXML' => 1.69, }, - test_requires => { - 'YAML' => 0.66, - 'File::Basename' => 0, - 'Test::More' => 0.6, - 'Test::Differences' => 0, - 'Test::Exception' => 0, - }, }; perl_version '5.005'; @ 1.73 log @modifying package: perl-dbi-5.10 20091123 -> 20091126 @ text @d1 3 a3 3 Index: DBD-SQLite-1.27/Makefile.PL --- DBD-SQLite-1.27/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.27/Makefile.PL 2009-10-12 08:29:04 +0200 @ 1.72 log @modifying package: perl-dbi-5.10 20091116 -> 20091123 @ text @d129 3 a131 3 Index: SQL-Statement-1.22/Makefile.PL --- SQL-Statement-1.22/Makefile.PL.orig 2009-10-12 08:29:18 +0200 +++ SQL-Statement-1.22/Makefile.PL 2009-10-12 08:32:31 +0200 @ 1.71 log @modifying package: perl-dbi-5.10 20091030 -> 20091116 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_07/Makefile.PL --- DBD-SQLite-1.26_07/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.26_07/Makefile.PL 2009-10-12 08:29:04 +0200 @ 1.70 log @modifying package: perl-dbi-5.10 20091016 -> 20091030 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_06/Makefile.PL --- DBD-SQLite-1.26_06/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.26_06/Makefile.PL 2009-10-12 08:29:04 +0200 @ 1.69 log @modifying package: perl-dbi-5.10 20091012 -> 20091016 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_05/Makefile.PL --- DBD-SQLite-1.26_05/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.26_05/Makefile.PL 2009-10-12 08:29:04 +0200 @ 1.68 log @modifying package: perl-dbi-5.10 20091007 -> 20091012 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_04/Makefile.PL --- DBD-SQLite-1.26_04/Makefile.PL.orig 2009-10-06 08:16:49 +0200 +++ DBD-SQLite-1.26_04/Makefile.PL 2009-10-12 08:29:04 +0200 @ 1.67 log @modifying package: perl-dbi-5.10 20090923 -> 20091007 @ text @d2 2 a3 2 --- DBD-SQLite-1.26_04/Makefile.PL.orig 2009-08-12 07:53:19 +0200 +++ DBD-SQLite-1.26_04/Makefile.PL 2009-09-16 12:13:17 +0200 d49 3 a51 3 # Determine if we are going to use the provided SQLite code, or an already- # installed copy. To this end, look for two command-line parameters: @@@@ -148,17 +109,17 @@@@ d77 1 a77 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-09-16 12:13:17 +0200 d108 1 a108 1 +++ DBD-cego/Makefile.PL 2009-09-16 12:13:17 +0200 d119 2 a120 2 --- DBD-mysql-4.013/dbdimp.h.orig 2009-06-19 03:54:47 +0200 +++ DBD-mysql-4.013/dbdimp.h 2009-09-16 12:13:17 +0200 d129 61 d192 1 a192 1 +++ SQL-Translator-0.11002/Makefile.PL 2009-09-16 12:13:33 +0200 @ 1.66 log @modifying package: perl-dbi-5.10 20090916 -> 20090919 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_03/Makefile.PL --- DBD-SQLite-1.26_03/Makefile.PL.orig 2009-08-12 07:53:19 +0200 +++ DBD-SQLite-1.26_03/Makefile.PL 2009-09-16 12:13:17 +0200 @ 1.65 log @reduce dependencies @ text @d118 3 a120 3 Index: DBD-mysql-4.012/dbdimp.h --- DBD-mysql-4.012/dbdimp.h.orig 2009-06-19 03:54:47 +0200 +++ DBD-mysql-4.012/dbdimp.h 2009-09-16 12:13:17 +0200 @ 1.64 log @modifying package: perl-dbi-5.10.0 20090807 -> 20090812 @ text @d3 1 a3 1 +++ DBD-SQLite-1.26_03/Makefile.PL 2009-08-12 12:40:10 +0200 d77 1 a77 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-08-12 12:39:07 +0200 d108 1 a108 1 +++ DBD-cego/Makefile.PL 2009-08-12 12:39:07 +0200 d120 1 a120 1 +++ DBD-mysql-4.012/dbdimp.h 2009-08-12 12:39:07 +0200 d129 26 @ 1.63 log @modifying package: perl-dbi-5.10.0 20090612 -> 20090619 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_02/Makefile.PL --- DBD-SQLite-1.26_02/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.26_02/Makefile.PL 2009-04-15 18:18:30 +0200 d49 3 a51 3 # 2005/6/19, by rjray@@blackperl.com # @@@@ -154,20 +115,17 @@@@ d58 1 a58 1 -unless ( $force_local ) { a70 3 -if ( $sqlite_inc ) { - push @@CC_INC, "-I$sqlite_inc"; -} d72 3 a74 3 my @@CC_DEFINE = ( '-DSQLITE_CORE', d77 1 a77 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-04-15 18:18:30 +0200 d108 1 a108 1 +++ DBD-cego/Makefile.PL 2009-04-15 18:18:55 +0200 d119 2 a120 2 --- DBD-mysql-4.012/dbdimp.h.orig 2009-04-13 14:10:40 +0200 +++ DBD-mysql-4.012/dbdimp.h 2009-04-15 18:18:30 +0200 @ 1.62 log @modifying package: perl-dbi-5.10.0 20090504 -> 20090505 @ text @d1 3 a3 3 Index: DBD-SQLite-1.26_01/Makefile.PL --- DBD-SQLite-1.26_01/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.26_01/Makefile.PL 2009-04-15 18:18:30 +0200 d121 3 a123 3 Index: DBD-mysql-4.011/dbdimp.h --- DBD-mysql-4.011/dbdimp.h.orig 2009-04-13 14:10:40 +0200 +++ DBD-mysql-4.011/dbdimp.h 2009-04-15 18:18:30 +0200 @ 1.61 log @modifying package: perl-dbi-5.10.0 20090421 -> 20090423 @ text @d1 3 a3 3 Index: DBD-SQLite-1.25/Makefile.PL --- DBD-SQLite-1.25/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.25/Makefile.PL 2009-04-15 18:18:30 +0200 @ 1.60 log @modifying package: perl-dbi-5.10.0 20090418 -> 20090419 @ text @d1 3 a3 3 Index: DBD-SQLite-1.23/Makefile.PL --- DBD-SQLite-1.23/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.23/Makefile.PL 2009-04-15 18:18:30 +0200 @ 1.59 log @modifying package: perl-dbi-5.10.0 20090416 -> 20090418 @ text @d1 3 a3 3 Index: DBD-SQLite-1.22_08/Makefile.PL --- DBD-SQLite-1.22_08/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.22_08/Makefile.PL 2009-04-15 18:18:30 +0200 @ 1.58 log @modifying package: perl-dbi-5.10.0 20090415 -> 20090416 @ text @d1 3 a3 3 Index: DBD-SQLite-1.22_07/Makefile.PL --- DBD-SQLite-1.22_07/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.22_07/Makefile.PL 2009-04-15 18:18:30 +0200 @ 1.57 log @modifying package: perl-dbi-5.10.0 20090414 -> 20090415 @ text @d1 3 a3 3 Index: DBD-SQLite-1.22_05/Makefile.PL --- DBD-SQLite-1.22_05/Makefile.PL.orig 2009-04-14 17:43:16 +0200 +++ DBD-SQLite-1.22_05/Makefile.PL 2009-04-15 18:18:30 +0200 @ 1.56 log @modifying package: perl-dbi-5.10.0 20090411 -> 20090414 @ text @d1 4 a4 4 Index: DBD-SQLite-1.22_04/Makefile.PL --- DBD-SQLite-1.22_04/Makefile.PL.orig 2009-04-09 11:30:10 +0200 +++ DBD-SQLite-1.22_04/Makefile.PL 2009-04-10 11:40:03 +0200 @@@@ -16,46 +16,7 @@@@ d80 1 a80 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-04-10 11:14:49 +0200 d110 2 a111 2 --- DBD-cego/Makefile.PL.orig 2007-06-25 20:38:07 +0200 +++ DBD-cego/Makefile.PL 2009-04-10 11:14:49 +0200 d118 1 a118 1 'MYEXTLIB' => $opt->{'prefix'} . "/lib/libCego.a " d122 2 a123 2 --- DBD-mysql-4.011/dbdimp.h.orig 2008-04-29 01:36:17 +0200 +++ DBD-mysql-4.011/dbdimp.h 2009-04-10 11:14:49 +0200 @ 1.55 log @modifying package: perl-dbi-5.10.0 20090410 -> 20090411 @ text @d121 3 a123 3 Index: DBD-mysql-4.010/dbdimp.h --- DBD-mysql-4.010/dbdimp.h.orig 2008-04-29 01:36:17 +0200 +++ DBD-mysql-4.010/dbdimp.h 2009-04-10 11:14:49 +0200 @ 1.54 log @modifying package: perl-dbi-5.10.0 20090409 -> 20090410 @ text @d1 3 a3 3 Index: DBD-SQLite-1.22_03/Makefile.PL --- DBD-SQLite-1.22_03/Makefile.PL.orig 2009-04-09 11:30:10 +0200 +++ DBD-SQLite-1.22_03/Makefile.PL 2009-04-10 11:40:03 +0200 @ 1.53 log @modifying package: perl-dbi-5.10.0 20090406 -> 20090409 @ text @d1 3 a3 3 Index: DBD-SQLite-1.22_02/Makefile.PL --- DBD-SQLite-1.22_02/Makefile.PL.orig 2009-04-08 13:42:58 +0200 +++ DBD-SQLite-1.22_02/Makefile.PL 2009-04-09 09:52:53 +0200 d72 1 a72 1 - push @@INC, "-I$sqlite_inc"; d80 1 a80 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-04-09 09:52:08 +0200 d111 1 a111 1 +++ DBD-cego/Makefile.PL 2009-04-09 09:52:08 +0200 d123 1 a123 1 +++ DBD-mysql-4.010/dbdimp.h 2009-04-09 09:52:08 +0200 @ 1.52 log @modifying package: perl-dbi-5.10.0 20090405 -> 20090406 @ text @d1 4 a4 4 Index: DBD-SQLite-1.19_10/Makefile.PL --- DBD-SQLite-1.19_10/Makefile.PL.orig 2009-04-05 21:35:21 +0200 +++ DBD-SQLite-1.19_10/Makefile.PL 2009-04-06 22:28:29 +0200 @@@@ -16,36 +16,6 @@@@ d38 11 d51 1 a51 2 # Determine if we are going to use the provided SQLite code, or an already- @@@@ -143,24 +113,20 @@@@ a77 22 - '-DSQLITE_ENABLE_FTS3', '-DSQLITE_ENABLE_COLUMN_METADATA', '-DNDEBUG=1', "-DSQLITE_PTR_SZ=$Config{ptrsize}" @@@@ -193,8 +159,6 @@@@ VERSION_FROM => 'lib/DBD/SQLite.pm', PREREQ_PM => { 'DBI' => '1.43', - 'Test::More' => '0.42', - 'Test::NoWarnings' => '0.081', }, OPTIONAL( '6.48', MIN_PERL_VERSION => '5.006', @@@@ -213,8 +177,6 @@@@ 'DBI' => '1.57', }, build_requires => { - 'Test::More' => '0.42', - 'Test::NoWarnings' => '0.081', }, resources => { license => 'http://dev.perl.org/licenses/', d80 1 a80 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-04-06 22:25:14 +0200 d111 1 a111 1 +++ DBD-cego/Makefile.PL 2009-04-06 22:25:14 +0200 d123 1 a123 1 +++ DBD-mysql-4.010/dbdimp.h 2009-04-06 22:25:14 +0200 @ 1.51 log @upgrade to a newer DBD::SQLite version @ text @d1 3 a3 3 Index: DBD-SQLite-1.19_09/Makefile.PL --- DBD-SQLite-1.19_09/Makefile.PL.orig 2009-04-05 05:09:55 +0200 +++ DBD-SQLite-1.19_09/Makefile.PL 2009-04-05 09:11:40 +0200 d59 1 a59 2 - '-I$(DBI_INSTARCH_DIR)', + '-I$(DBI_INSTARCH_DIR)' d69 1 d72 1 a72 2 ); @@@@ -192,8 +158,6 @@@@ d81 2 a82 2 @@@@ -212,8 +176,6 @@@@ 'DBI' => '1.43', d92 1 a92 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-04-05 09:10:54 +0200 d123 1 a123 1 +++ DBD-cego/Makefile.PL 2009-04-05 09:10:54 +0200 d135 1 a135 1 +++ DBD-mysql-4.010/dbdimp.h 2009-04-05 09:10:54 +0200 @ 1.50 log @modifying package: perl-dbi-5.10.0 20090210 -> 20090216 @ text @d1 5 a5 4 Index: DBD-SQLite-1.14/Makefile.PL --- DBD-SQLite-1.14/Makefile.PL.orig 2007-08-28 21:57:09 +0200 +++ DBD-SQLite-1.14/Makefile.PL 2009-02-10 08:56:57 +0100 @@@@ -10,34 +10,6 @@@@ d7 2 a8 2 use Config; use strict; d10 3 a12 3 - require DBD::SQLite; - if ($DBD::SQLite::VERSION < 1.0) { - print < 1.42 ? '' : '-Dno_last_insert_id'; -my $libs = ''; -$libs .= "-L$sqlite_lib " if ($sqlite_lib); -$libs .= "-lsqlite3 " unless ($force_local); +my $inc = `@@l_prefix@@/bin/pkg-config sqlite3 --cflags-only-I`; +$inc =~ s/\r?\n$//s; d52 2 a53 24 +$libs =~ s/\r?\n$//s; WriteMakefile( 'NAME' => 'DBD::SQLite', 'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o', - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' . + 'INC' => $inc . ' -I. -I$(DBI_INSTARCH_DIR)' . (($sqlite_inc) ? " -I$sqlite_inc" : ''), - $libs ? ('LIBS' => $libs) : (), + 'LIBS' => [ $libs ], 'OPTIMIZE' => "-O2", 'DEFINE' => "-DSQLITE_CORE -DSQLITE_ENABLE_FTS2 -DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ( ($Config{d_usleep} || Index: DBD-SQLite-1.14/dbdimp.h --- DBD-SQLite-1.14/dbdimp.h.orig 2007-08-23 02:45:08 +0200 +++ DBD-SQLite-1.14/dbdimp.h 2009-02-10 08:56:57 +0100 @@@@ -4,7 +4,7 @@@@ #define _DBDIMP_H 1 #include "SQLiteXS.h" -#include "sqliteInt.h" +#include "sqlite3.h" d55 36 a90 2 /* 30 second timeout by default */ #define SQL_TIMEOUT 30000 d93 1 a93 1 +++ DBD-Sybase-1.09/dbdimp.c 2009-02-10 08:56:57 +0100 d124 1 a124 1 +++ DBD-cego/Makefile.PL 2009-02-10 08:56:57 +0100 d136 1 a136 1 +++ DBD-mysql-4.010/dbdimp.h 2009-02-10 08:56:57 +0100 @ 1.49 log @modifying package: perl-dbi-5.10.0 20090206 -> 20090210 @ text @a129 80 Index: SQL-Translator-0.09003/Build.PL --- SQL-Translator-0.09003/Build.PL.orig 2009-02-07 19:21:37 +0100 +++ SQL-Translator-0.09003/Build.PL 2009-02-10 08:57:34 +0100 @@@@ -25,7 +25,6 @@@@ 'Class::MakeMethods' => 0, 'Digest::SHA1' => 2.00, 'IO::Dir' => 0, - 'Log::Log4perl' => 0, 'Parse::RecDescent' => 1.94, 'Pod::Usage' => 0, 'Class::Accessor::Fast' => 0, @@@@ -45,13 +44,6 @@@@ 'XML::XPath' => 1.13, }, build_requires => { - 'File::Basename' => 0, - 'File::Spec' => 0, - 'Test::More' => 0.6, - 'Test::Differences' => 0, - 'Test::Exception' => 0, - 'Test::Differences' => 0, - 'YAML' => 0.39, }, add_to_cleanup => [ 'SQL-Translator-*' ], Index: SQL-Translator-0.09003/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.09003/lib/SQL/Translator/Schema/Graph.pm.orig 2009-02-07 19:21:37 +0100 +++ SQL-Translator-0.09003/lib/SQL/Translator/Schema/Graph.pm 2009-02-10 08:56:57 +0100 @@@@ -5,8 +5,6 @@@@ use Data::Dumper; local $Data::Dumper::Maxdepth = 3; -use Log::Log4perl qw(:easy); -Log::Log4perl->easy_init($ERROR) unless Log::Log4perl->initialized(); use SQL::Translator::Schema::Graph::Node; use SQL::Translator::Schema::Graph::Edge; use SQL::Translator::Schema::Graph::Port; @@@@ -173,7 +171,6 @@@@ } my $graph = $self; #hack - my $log = Log::Log4perl->get_logger('SQL.Translator.Schema.Graph'); # # create methods @@@@ -208,8 +205,6 @@@@ $hyperedge->push_thatfield($edge->thisfield); $hyperedge->push_thatviafield($edge->thatfield); } - $log->debug($edge->thisfield->name); - $log->debug($edge->thatfield->name); } if ($hyperedge->count_thisnode == 1 and $hyperedge->count_thatnode == 1) { @@@@ -222,25 +217,11 @@@@ $hyperedge->type('many2many'); } - $log->debug($_) foreach sort keys %::SQL::Translator::Schema::Graph::HyperEdge::; - #node_to won't always be defined b/c of multiple edges to a single other node if (defined($node_to)) { - $log->debug($node_from->name); - $log->debug($node_to->name); - if (scalar($hyperedge->thisnode) > 1) { - $log->debug($hyperedge->type ." via ". $hyperedge->vianode->name); my $i = 0; foreach my $thisnode ( $hyperedge->thisnode ) { - $log->debug($thisnode->name .' '. - $hyperedge->thisfield_index(0)->name .' -> '. - $hyperedge->thisviafield_index($i)->name .' '. - $hyperedge->vianode->name .' '. - $hyperedge->thatviafield_index(0)->name .' <- '. - $hyperedge->thatfield_index(0)->name .' '. - $hyperedge->thatnode_index(0)->name ."\n" - ); $i++; } } @ 1.48 log @modifying package: perl-dbi-5.10.0 20081206 -> 20081214 @ text @d3 1 a3 1 +++ DBD-SQLite-1.14/Makefile.PL 2008-12-14 19:29:06 +0100 d66 1 a66 1 +++ DBD-SQLite-1.14/dbdimp.h 2008-12-14 19:29:06 +0100 d78 1 a78 1 +++ DBD-Sybase-1.09/dbdimp.c 2008-12-14 19:30:18 +0100 d109 1 a109 1 +++ DBD-cego/Makefile.PL 2008-12-14 19:29:06 +0100 d121 1 a121 1 +++ DBD-mysql-4.010/dbdimp.h 2008-12-14 19:29:06 +0100 d130 28 a157 28 Index: SQL-Translator-0.09002/Build.PL --- SQL-Translator-0.09002/Build.PL.orig 2008-12-05 14:14:58 +0100 +++ SQL-Translator-0.09002/Build.PL 2008-12-14 19:29:06 +0100 @@@@ -26,7 +26,6 @@@@ 'Class::MakeMethods' => 0, 'Digest::SHA1' => 2.00, 'IO::Dir' => 0, - 'Log::Log4perl' => 0, 'Parse::RecDescent' => 1.94, 'Pod::Usage' => 0, 'Class::Accessor::Fast' => 0, @@@@ -46,13 +45,6 @@@@ 'XML::XPath' => 1.13, }, build_requires => { - 'File::Basename' => 0, - 'File::Spec' => 0, - 'Test::More' => 0.6, - 'Test::Differences' => 0, - 'Test::Exception' => 0, - 'Test::Differences' => 0, - 'YAML' => 0.39, }, get_options => { # Where to store additional files such as templates. Index: SQL-Translator-0.09002/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.09002/lib/SQL/Translator/Schema/Graph.pm.orig 2008-12-05 14:14:58 +0100 +++ SQL-Translator-0.09002/lib/SQL/Translator/Schema/Graph.pm 2008-12-14 19:29:06 +0100 @ 1.47 log @modifying package: perl-dbi-5.10.0 20081201 -> 20081206 @ text @d3 1 a3 1 +++ DBD-SQLite-1.14/Makefile.PL 2008-08-20 09:12:11 +0200 d66 1 a66 1 +++ DBD-SQLite-1.14/dbdimp.h 2008-08-20 09:12:11 +0200 d76 4 a79 4 Index: DBD-Sybase-1.08/dbdimp.c --- DBD-Sybase-1.08/dbdimp.c.orig 2007-04-19 20:33:30 +0200 +++ DBD-Sybase-1.08/dbdimp.c 2008-08-20 09:12:11 +0200 @@@@ -797,22 +797,22 @@@@ d82 3 a84 3 if(cs_ver == CS_VERSION_150) - BLK_VERSION = BLK_VERSION_150; + BLK_VERSION = CS_VERSION_150; d87 3 a89 3 if(cs_ver == CS_VERSION_125) - BLK_VERSION = BLK_VERSION_125; + BLK_VERSION = CS_VERSION_125; d92 3 a94 3 if(cs_ver == CS_VERSION_120) - BLK_VERSION = BLK_VERSION_120; + BLK_VERSION = CS_VERSION_120; d97 3 a99 3 if(cs_ver == CS_VERSION_110) - BLK_VERSION = BLK_VERSION_110; + BLK_VERSION = CS_VERSION_110; d101 3 a103 3 if(cs_ver == CS_VERSION_100) - BLK_VERSION = BLK_VERSION_100; + BLK_VERSION = CS_VERSION_100; d106 1 a106 1 if (cs_config(context, CS_SET, CS_MESSAGE_CB, d109 1 a109 1 +++ DBD-cego/Makefile.PL 2008-08-20 09:12:11 +0200 d121 1 a121 1 +++ DBD-mysql-4.010/dbdimp.h 2008-08-20 09:12:11 +0200 d131 2 a132 2 --- SQL-Translator-0.09002/Build.PL.orig 2008-08-19 17:40:47 +0200 +++ SQL-Translator-0.09002/Build.PL 2008-08-20 09:12:11 +0200 d156 2 a157 2 --- SQL-Translator-0.09002/lib/SQL/Translator/Schema/Graph.pm.orig 2008-08-19 17:40:47 +0200 +++ SQL-Translator-0.09002/lib/SQL/Translator/Schema/Graph.pm 2008-08-20 09:14:47 +0200 @ 1.46 log @modifying package: perl-dbi-5.10.0 20081022 -> 20081025 @ text @d130 3 a132 3 Index: SQL-Translator-0.09001/Build.PL --- SQL-Translator-0.09001/Build.PL.orig 2008-08-19 17:40:47 +0200 +++ SQL-Translator-0.09001/Build.PL 2008-08-20 09:12:11 +0200 d155 3 a157 3 Index: SQL-Translator-0.09001/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.09001/lib/SQL/Translator/Schema/Graph.pm.orig 2008-08-19 17:40:47 +0200 +++ SQL-Translator-0.09001/lib/SQL/Translator/Schema/Graph.pm 2008-08-20 09:14:47 +0200 @ 1.45 log @modifying package: perl-dbi-5.10.0 20081016 -> 20081022 @ text @d119 3 a121 3 Index: DBD-mysql-4.009/dbdimp.h --- DBD-mysql-4.009/dbdimp.h.orig 2008-04-29 01:36:17 +0200 +++ DBD-mysql-4.009/dbdimp.h 2008-08-20 09:12:11 +0200 @ 1.44 log @modifying package: perl-dbi-5.10.0 20080818 -> 20080820 @ text @d119 3 a121 3 Index: DBD-mysql-4.008/dbdimp.h --- DBD-mysql-4.008/dbdimp.h.orig 2008-04-29 01:36:17 +0200 +++ DBD-mysql-4.008/dbdimp.h 2008-08-20 09:12:11 +0200 @ 1.43 log @modifying package: perl-dbi-5.10.0 20080809 -> 20080816 @ text @d3 1 a3 1 +++ DBD-SQLite-1.14/Makefile.PL 2008-02-02 10:57:18 +0100 d66 1 a66 1 +++ DBD-SQLite-1.14/dbdimp.h 2008-02-02 10:57:18 +0100 d76 31 d109 1 a109 1 +++ DBD-cego/Makefile.PL 2008-02-02 10:57:18 +0100 d120 2 a121 2 --- DBD-mysql-4.008/dbdimp.h.orig 2007-12-11 22:41:50 +0100 +++ DBD-mysql-4.008/dbdimp.h 2008-02-02 10:57:18 +0100 d130 4 a133 5 Index: SQL-Translator-0.09000/Build.PL --- SQL-Translator-0.09000/Build.PL.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.09000/Build.PL 2008-02-02 10:58:12 +0100 @@@@ -25,7 +25,6 @@@@ 'Class::Data::Inheritable' => 0.02, d135 1 d141 1 a141 1 @@@@ -44,13 +43,6 @@@@ d155 3 a157 3 Index: SQL-Translator-0.09000/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.09000/lib/SQL/Translator/Schema/Graph.pm.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.09000/lib/SQL/Translator/Schema/Graph.pm 2008-02-02 10:57:18 +0100 d163 1 a163 1 -Log::Log4perl->easy_init($ERROR); a209 31 Index: DBD-Sybase-1.08/dbdimp.c --- DBD-Sybase-1.08/dbdimp.c.orig 2007-04-19 20:33:30 +0200 +++ DBD-Sybase-1.08/dbdimp.c 2008-07-29 18:32:49 +0200 @@@@ -797,22 +797,22 @@@@ #if defined(CS_VERSION_150) if(cs_ver == CS_VERSION_150) - BLK_VERSION = BLK_VERSION_150; + BLK_VERSION = CS_VERSION_150; #endif #if defined(CS_VERSION_125) if(cs_ver == CS_VERSION_125) - BLK_VERSION = BLK_VERSION_125; + BLK_VERSION = CS_VERSION_125; #endif #if defined(CS_VERSION_120) if(cs_ver == CS_VERSION_120) - BLK_VERSION = BLK_VERSION_120; + BLK_VERSION = CS_VERSION_120; #endif #if defined(CS_VERSION_110) if(cs_ver == CS_VERSION_110) - BLK_VERSION = BLK_VERSION_110; + BLK_VERSION = CS_VERSION_110; #endif if(cs_ver == CS_VERSION_100) - BLK_VERSION = BLK_VERSION_100; + BLK_VERSION = CS_VERSION_100; #if USE_CSLIB_CB if (cs_config(context, CS_SET, CS_MESSAGE_CB, @ 1.42 log @remove a now obsolete and now partly broken error handling @ text @d88 3 a90 3 Index: DBD-mysql-4.007/dbdimp.h --- DBD-mysql-4.007/dbdimp.h.orig 2007-12-11 22:41:50 +0100 +++ DBD-mysql-4.007/dbdimp.h 2008-02-02 10:57:18 +0100 @ 1.41 log @fix building against FreeTDS 0.82 @ text @a63 23 Index: DBD-SQLite-1.14/dbdimp.c --- DBD-SQLite-1.14/dbdimp.c.orig 2007-08-24 04:51:25 +0200 +++ DBD-SQLite-1.14/dbdimp.c 2008-02-02 10:57:18 +0100 @@@@ -394,15 +394,18 @@@@ sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth)); if (DBIc_NUM_FIELDS(imp_sth) == 0) { + char *defererr = strdup((char*)sqlite3_errmsg(imp_dbh->db)); while ((imp_sth->retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) { if (imp_sth->retval == SQLITE_ROW) { continue; } /* There are bug reports that say this should be sqlite3_reset() */ sqlite3_finalize(imp_sth->stmt); - sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, defererr); + free(defererr); return -5; } + free(defererr); /* warn("Finalize\n"); */ sqlite3_reset(imp_sth->stmt); imp_sth->nrow = sqlite3_changes(imp_dbh->db); @ 1.40 log @modifying package: perl-dbi-5.10.0 20080722 -> 20080723 @ text @d202 31 @ 1.39 log @modifying package: perl-dbi-5.10.0 20080613 -> 20080617 @ text @a121 8 Index: DBI-1.605/Makefile.PL --- DBI-1.605/Makefile.PL.orig 2007-06-28 15:12:27 +0200 +++ DBI-1.605/Makefile.PL 2008-02-02 10:57:18 +0100 @@@@ -343,3 +343,4 @@@@ } # end. + @ 1.38 log @modifying package: perl-dbi-5.10.0 20080511 -> 20080512 @ text @d122 3 a124 3 Index: DBI-1.602/Makefile.PL --- DBI-1.602/Makefile.PL.orig 2007-06-28 15:12:27 +0200 +++ DBI-1.602/Makefile.PL 2008-02-02 10:57:18 +0100 @ 1.37 log @modifying package: perl-dbi-5.10.0 20080228 -> 20080229 @ text @d111 3 a113 3 Index: DBD-mysql-4.006/dbdimp.h --- DBD-mysql-4.006/dbdimp.h.orig 2007-12-11 22:41:50 +0100 +++ DBD-mysql-4.006/dbdimp.h 2008-02-02 10:57:18 +0100 @ 1.36 log @modifying package: perl-dbi-5.10.0 20080223 -> 20080226 @ text @d130 3 a132 3 Index: SQL-Translator-0.0900/Build.PL --- SQL-Translator-0.0900/Build.PL.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.0900/Build.PL 2008-02-02 10:58:12 +0100 d155 3 a157 3 Index: SQL-Translator-0.0900/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.0900/lib/SQL/Translator/Schema/Graph.pm.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.0900/lib/SQL/Translator/Schema/Graph.pm 2008-02-02 10:57:18 +0100 @ 1.35 log @modifying package: perl-dbi-5.10.0 20080202 -> 20080210 @ text @d130 3 a132 3 Index: SQL-Translator-0.0899_02/Build.PL --- SQL-Translator-0.0899_02/Build.PL.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.0899_02/Build.PL 2008-02-02 10:58:12 +0100 d155 3 a157 3 Index: SQL-Translator-0.0899_02/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.0899_02/lib/SQL/Translator/Schema/Graph.pm.orig 2008-01-31 13:06:23 +0100 +++ SQL-Translator-0.0899_02/lib/SQL/Translator/Schema/Graph.pm 2008-02-02 10:57:18 +0100 @ 1.34 log @modifying package: perl-dbi-5.10.0 20080129 -> 20080202 @ text @d122 3 a124 3 Index: DBI-1.59/Makefile.PL --- DBI-1.59/Makefile.PL.orig 2007-06-28 15:12:27 +0200 +++ DBI-1.59/Makefile.PL 2008-02-02 10:57:18 +0100 @ 1.33 log @modifying package: perl-dbi-5.10.0 20071219 -> 20071227 @ text @d3 1 a3 1 +++ DBD-SQLite-1.14/Makefile.PL 2007-10-21 21:55:59 +0200 d66 1 a66 1 +++ DBD-SQLite-1.14/dbdimp.c 2007-10-21 21:55:59 +0200 d89 1 a89 1 +++ DBD-SQLite-1.14/dbdimp.h 2007-10-21 21:55:59 +0200 d101 1 a101 1 +++ DBD-cego/Makefile.PL 2007-10-21 21:55:59 +0200 d112 2 a113 2 --- DBD-mysql-4.006/dbdimp.h.orig 2007-06-07 13:51:16 +0200 +++ DBD-mysql-4.006/dbdimp.h 2007-10-21 21:55:59 +0200 d121 1 a121 1 #include /* Comes with MySQL-devel */ d124 1 a124 1 +++ DBI-1.59/Makefile.PL 2007-10-21 21:55:59 +0200 d130 3 a132 3 Index: SQL-Translator-0.0899_01/Build.PL --- SQL-Translator-0.0899_01/Build.PL.orig 2007-10-21 14:43:48 +0200 +++ SQL-Translator-0.0899_01/Build.PL 2007-10-21 21:56:21 +0200 d140 2 a141 2 }, @@@@ -43,12 +42,6 @@@@ d148 1 d155 3 a157 3 Index: SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm --- SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm.orig 2007-10-21 14:43:48 +0200 +++ SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm 2007-10-21 21:55:59 +0200 @ 1.32 log @add SQL::Translator @ text @d111 3 a113 3 Index: DBD-mysql-4.005/dbdimp.h --- DBD-mysql-4.005/dbdimp.h.orig 2007-06-07 13:51:16 +0200 +++ DBD-mysql-4.005/dbdimp.h 2007-10-21 21:55:59 +0200 @ 1.31 log @fix bug introduced with recent package upgrade @ text @d3 1 a3 1 +++ DBD-SQLite-1.14/Makefile.PL 2007-09-20 09:40:47 +0200 d66 1 a66 1 +++ DBD-SQLite-1.14/dbdimp.c 2007-09-20 09:42:02 +0200 d89 1 a89 1 +++ DBD-SQLite-1.14/dbdimp.h 2007-09-20 09:42:28 +0200 d101 1 a101 1 +++ DBD-cego/Makefile.PL 2007-06-26 21:07:10 +0200 d113 1 a113 1 +++ DBD-mysql-4.005/dbdimp.h 2007-06-26 21:06:20 +0200 d122 87 @ 1.30 log @modifying package: perl-dbi-5.8.8 20070824 -> 20070920 @ text @d79 1 a79 1 + sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, defererr); @ 1.29 log @modifying package: perl-dbi-5.8.8 20070626 again @ text @d1 3 a3 3 Index: DBD-SQLite-1.13/Makefile.PL --- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200 +++ DBD-SQLite-1.13/Makefile.PL 2007-06-26 21:06:20 +0200 d46 2 a47 2 +my $inc = `@@l_prefix@@/bin/pkg-config sqlite3 --cflags-only-I`; +$inc =~ s/\r?\n$//s; d49 1 a49 1 +$libs =~ s/\r?\n$//s; d62 1 a62 1 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . d64 4 a67 4 Index: DBD-SQLite-1.13/dbdimp.c --- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.c 2007-06-26 21:06:20 +0200 @@@@ -394,14 +394,17 @@@@ d72 2 a73 2 while ((retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) { if (retval == SQLITE_ROW) { d76 1 d78 1 a78 1 - sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, (char*)sqlite3_errmsg(imp_dbh->db)); d87 3 a89 3 Index: DBD-SQLite-1.13/dbdimp.h --- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.h 2007-06-26 21:06:20 +0200 @ 1.28 log @modifying package: perl-dbi-5.8.8 20070514 -> 20070609 @ text @d3 1 a3 1 +++ DBD-SQLite-1.13/Makefile.PL 2007-04-15 10:47:17 +0200 d66 1 a66 1 +++ DBD-SQLite-1.13/dbdimp.c 2007-04-15 10:47:17 +0200 d88 1 a88 1 +++ DBD-SQLite-1.13/dbdimp.h 2007-04-15 10:47:17 +0200 d99 3 a101 3 --- DBD-cego/Makefile.PL.orig 2007-03-31 19:16:24 +0200 +++ DBD-cego/Makefile.PL 2007-04-15 10:48:31 +0200 @@@@ -43,8 +43,8 @@@@ a105 1 - 'LDDLFLAGS' => '-bundle -undefined dynamic_lookup', a106 1 + 'LDDLFLAGS' => '', d111 2 a112 2 --- DBD-mysql-4.005/dbdimp.h.orig 2007-03-20 14:47:29 +0100 +++ DBD-mysql-4.005/dbdimp.h 2007-04-15 10:47:17 +0200 @ 1.27 log @add DBD::Cego support @ text @d112 3 a114 3 Index: DBD-mysql-4.004/dbdimp.h --- DBD-mysql-4.004/dbdimp.h.orig 2007-03-20 14:47:29 +0100 +++ DBD-mysql-4.004/dbdimp.h 2007-04-15 10:47:17 +0200 @ 1.26 log @modifying package: perl-dbi-5.8.8 20070303 -> 20070323 @ text @d3 1 a3 1 +++ DBD-SQLite-1.13/Makefile.PL 2007-01-08 19:32:01 +0100 d66 1 a66 1 +++ DBD-SQLite-1.13/dbdimp.c 2007-01-08 19:32:01 +0100 d88 1 a88 1 +++ DBD-SQLite-1.13/dbdimp.h 2007-01-08 19:32:01 +0100 d98 14 d113 2 a114 2 --- DBD-mysql-4.004/dbdimp.h.orig 2007-01-06 20:00:08 +0100 +++ DBD-mysql-4.004/dbdimp.h 2007-01-08 19:32:01 +0100 @ 1.25 log @modifying package: perl-dbi-5.8.8 20070302 -> 20070303 @ text @d98 3 a100 3 Index: DBD-mysql-4.003/dbdimp.h --- DBD-mysql-4.003/dbdimp.h.orig 2007-01-06 20:00:08 +0100 +++ DBD-mysql-4.003/dbdimp.h 2007-01-08 19:32:01 +0100 @ 1.24 log @modifying package: perl-dbi-5.8.8 20070302 again @ text @d98 3 a100 3 Index: DBD-mysql-4.002/dbdimp.h --- DBD-mysql-4.002/dbdimp.h.orig 2007-01-06 20:00:08 +0100 +++ DBD-mysql-4.002/dbdimp.h 2007-01-08 19:32:01 +0100 @ 1.23 log @modifying package: perl-dbi-5.8.8 20061104 -> 20070108 @ text @d98 3 a100 3 Index: DBD-mysql-4.001/dbdimp.h --- DBD-mysql-4.001/dbdimp.h.orig 2007-01-06 20:00:08 +0100 +++ DBD-mysql-4.001/dbdimp.h 2007-01-08 19:32:01 +0100 @ 1.22 log @fix dependency and use an absolute path to pkg-config although this shouldn't be really necessary @ text @d2 2 a3 2 --- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13.000000000 +0200 +++ DBD-SQLite-1.13/Makefile.PL 2006-09-19 20:05:27.104172279 +0200 d65 2 a66 2 --- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50.000000000 +0200 +++ DBD-SQLite-1.13/dbdimp.c 2006-09-19 20:03:45.164447005 +0200 d87 2 a88 2 --- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50.000000000 +0200 +++ DBD-SQLite-1.13/dbdimp.h 2006-09-19 20:03:45.164783426 +0200 d98 11 @ 1.21 log @fix building of DBD::SQLite under Solaris as SQLite 3.3 now uses fdatasync from Solaris librt @ text @d46 1 a46 1 +my $inc = `pkg-config sqlite3 --cflags-only-I`; d48 1 a48 1 +my $libs = `pkg-config sqlite3 --libs`; @ 1.20 log @modifying package: perl-dbi-5.8.8 20060809 -> 20060908 @ text @d2 2 a3 2 --- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200 +++ DBD-SQLite-1.13/Makefile.PL 2006-09-08 17:28:16 +0200 d39 14 a52 1 @@@@ -120,9 +92,9 @@@@ d57 1 a57 1 + 'INC' => '-I@@l_prefix@@/include -I. -I$(DBI_INSTARCH_DIR)' . d60 1 a60 1 + 'LIBS' => ['-L@@l_prefix@@/lib -lsqlite3'], d65 2 a66 2 --- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.c 2006-09-08 17:27:14 +0200 d87 2 a88 2 --- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.h 2006-09-08 17:27:14 +0200 @ 1.19 log @modifying package: perl-dbi-5.8.8 20060613 -> 20060724 @ text @d1 5 a5 5 Index: DBD-SQLite-1.12/Makefile.PL --- DBD-SQLite-1.12/Makefile.PL.orig 2005-06-20 14:45:11 +0200 +++ DBD-SQLite-1.12/Makefile.PL 2005-06-21 21:02:43 +0200 @@@@ -7,34 +7,6 @@@@ use ExtUtils::MakeMaker; d39 1 a39 1 @@@@ -113,8 +85,9 @@@@ d44 1 a44 1 + 'INC' => '-I@@l_prefix@@/include -I$(DBI_INSTARCH_DIR)' . d46 1 a47 2 $force_local ? () : ('LIBS' => '-lsqlite3'), $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (), d49 6 a54 16 Index: DBD-SQLite-1.12/dbdimp.h --- DBD-SQLite-1.12/dbdimp.h.orig 2004-09-10 17:24:28 +0200 +++ DBD-SQLite-1.12/dbdimp.h 2005-06-21 21:01:54 +0200 @@@@ -4,7 +4,7 @@@@ #define _DBDIMP_H 1 #include "SQLiteXS.h" -#include "sqliteInt.h" +#include "sqlite3.h" /* 30 second timeout by default */ #define SQL_TIMEOUT 30000 Index: DBD-SQLite-1.12/dbdimp.c --- DBD-SQLite-1.12/dbdimp.c.orig 2006-04-10 03:50:05 +0200 +++ DBD-SQLite-1.12/dbdimp.c 2006-07-24 13:01:30 +0200 @@@@ -390,14 +390,17 @@@@ d71 1 a71 1 sqlite3_finalize(imp_sth->stmt); d73 12 @ 1.18 log @modifying package: perl-dbi-5.8.8 20060522 -> 20060607 @ text @d62 22 @ 1.18.2.1 log @MFC: recent fixes for Solaris @ text @d1 5 a5 5 Index: DBD-SQLite-1.13/Makefile.PL --- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13.000000000 +0200 +++ DBD-SQLite-1.13/Makefile.PL 2006-09-19 20:05:27.104172279 +0200 @@@@ -10,34 +10,6 @@@@ } d39 1 a39 14 @@@@ -111,18 +83,19 @@@@ my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id'; -my $libs = ''; -$libs .= "-L$sqlite_lib " if ($sqlite_lib); -$libs .= "-lsqlite3 " unless ($force_local); +my $inc = `@@l_prefix@@/bin/pkg-config sqlite3 --cflags-only-I`; +$inc =~ s/\r?\n$//s; +my $libs = `@@l_prefix@@/bin/pkg-config sqlite3 --libs`; +$libs =~ s/\r?\n$//s; WriteMakefile( 'NAME' => 'DBD::SQLite', d44 1 a44 1 + 'INC' => $inc . ' -I. -I$(DBI_INSTARCH_DIR)' . d46 3 a48 2 - $libs ? ('LIBS' => $libs) : (), + 'LIBS' => [ $libs ], d50 3 a52 27 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ( ($Config{d_usleep} || Index: DBD-SQLite-1.13/dbdimp.c --- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50.000000000 +0200 +++ DBD-SQLite-1.13/dbdimp.c 2006-09-19 20:03:45.164447005 +0200 @@@@ -394,14 +394,17 @@@@ sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth)); if (DBIc_NUM_FIELDS(imp_sth) == 0) { + char *defererr = strdup((char*)sqlite3_errmsg(imp_dbh->db)); while ((retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) { if (retval == SQLITE_ROW) { continue; } sqlite3_finalize(imp_sth->stmt); - sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, (char*)sqlite3_errmsg(imp_dbh->db)); + sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, defererr); + free(defererr); return -5; } + free(defererr); /* warn("Finalize\n"); */ sqlite3_reset(imp_sth->stmt); imp_sth->nrow = sqlite3_changes(imp_dbh->db); Index: DBD-SQLite-1.13/dbdimp.h --- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50.000000000 +0200 +++ DBD-SQLite-1.13/dbdimp.h 2006-09-19 20:03:45.164783426 +0200 @ 1.18.2.2 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @d2 2 a3 2 --- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200 +++ DBD-SQLite-1.13/Makefile.PL 2007-01-08 19:32:01 +0100 d65 2 a66 2 --- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.c 2007-01-08 19:32:01 +0100 d87 2 a88 2 --- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200 +++ DBD-SQLite-1.13/dbdimp.h 2007-01-08 19:32:01 +0100 a97 11 Index: DBD-mysql-4.001/dbdimp.h --- DBD-mysql-4.001/dbdimp.h.orig 2007-01-06 20:00:08 +0100 +++ DBD-mysql-4.001/dbdimp.h 2007-01-08 19:32:01 +0100 @@@@ -19,6 +19,7 @@@@ * Header files we use */ #include /* installed by the DBI module */ +#include #include /* Comes with MySQL-devel */ #include /* Comes MySQL */ #include /* Comes with MySQL-devel */ @ 1.17 log @modifying package: perl-dbi-5.8.8 20060505 -> 20060508 @ text @a61 19 Index: DBI-1.50/dbipport.h --- DBI-1.50/dbipport.h.orig 2005-03-25 21:57:51 +0100 +++ DBI-1.50/dbipport.h 2006-05-08 08:42:30 +0200 @@@@ -217,6 +217,7 @@@@ /* Replace: 0 */ #endif +#ifndef PERL_UNUSED_DECL #ifdef HASATTRIBUTE # if defined(__GNUC__) && defined(__cplusplus) # define PERL_UNUSED_DECL @@@@ -226,6 +227,7 @@@@ #else # define PERL_UNUSED_DECL #endif +#endif #ifndef dNOOP # define NOOP (void)0 @ 1.16 log @modifying package: perl-dbi-5.8.7 20050618 -> 20050621 @ text @d1 3 a3 3 Index: Makefile.PL --- Makefile.PL.orig 2005-06-20 14:45:11 +0200 +++ Makefile.PL 2005-06-21 21:02:43 +0200 d50 3 a52 3 Index: dbdimp.h --- dbdimp.h.orig 2004-09-10 17:24:28 +0200 +++ dbdimp.h 2005-06-21 21:01:54 +0200 d62 19 @ 1.15 log @modifying package: perl-dbi-5.8.6 20050222 -> 20050227 @ text @d2 2 a3 2 --- Makefile.PL.orig 2004-10-12 11:03:50 +0200 +++ Makefile.PL 2004-10-13 19:23:27 +0200 d37 3 a39 3 my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id'; @@@@ -43,8 +15,9 @@@@ d42 7 a48 2 'OBJECT' => '$(O_FILES)', - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)', a49 5 + 'INC' => '-I@@l_prefix@@/include -I$(DBI_INSTARCH_DIR)', + 'LIBS' => ['-L@@l_prefix@@/lib -lsqlite3'], 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : "") . ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'), d52 1 a52 1 +++ dbdimp.h 2004-09-24 10:44:37 +0200 @ 1.15.2.1 log @fix DBD::SQLite: texts that looks like numbers (e.g. '1.200') where incorrectly treated as numbers (and in the example the trailing zeros after the decimal point are dropped by accident). This especially fixes the OpenPKG Foundation build-farm which had to deal with package versions like 1.20 ;-) @ text @a61 14 Index: dbdimp.c --- dbdimp.c 2005-02-22 17:09:23 +0100 +++ dbdimp.c 2005-06-20 15:53:01 +0200 @@@@ -357,10 +357,6 @@@@ char * data = SvPV(value, len); retval = sqlite3_bind_blob(imp_sth->stmt, i+1, data, len, SQLITE_TRANSIENT); } - else if (looks_like_number(value)) { - /* bind ordinary numbers as numbers - otherwise we might sort wrong */ - retval = sqlite3_bind_double(imp_sth->stmt, i+1, SvNV(value)); - } else { STRLEN len; char * data = SvPV(value, len); @ 1.14 log @modifying package: perl-dbi-5.8.5 20041006 -> 20041013 @ text @a0 73 Index: MANIFEST --- MANIFEST.orig 2004-09-13 09:15:30 +0200 +++ MANIFEST 2004-09-24 10:45:38 +0200 @@@@ -1,51 +1,14 @@@@ -attach.c -auth.c -btree.c -btree.h -build.c Changes -date.c dbdimp.c dbdimp.h -delete.c -expr.c -func.c -getsqlite.pl -hash.c -hash.h -insert.c -legacy.c lib/DBD/SQLite.pm -main.c Makefile.PL MANIFEST MANIFEST.SKIP META.yml Module meta-data (added by MakeMaker) -opcodes.c -opcodes.h -os.h -os_common.h -os_mac.c -os_mac.h -os_test.c -os_test.h -os_unix.c -os_unix.h -os_win.c -os_win.h -pager.c -pager.h -parse.c -parse.h ppport.h -pragma.c -printf.c -random.c README -select.c SQLite.xs -sqlite3.h -sqliteInt.h SQLiteXS.h t/00basic.t t/01logon.t @@@@ -73,17 +36,3 @@@@ t/dbdadmin.t t/lib.pl t/SQLite.dbtest -table.c -tokenize.c -trigger.c -update.c -utf.c -util.c -vacuum.c -vdbe.c -vdbe.h -vdbeapi.c -vdbeaux.c -vdbeInt.h -vdbemem.c -where.c @ 1.13 log @modifying package: perl-dbi-5.8.5 20040920 -> 20040924 @ text @d75 2 a76 2 --- Makefile.PL.orig 2004-09-20 11:41:39 +0200 +++ Makefile.PL 2004-09-24 10:44:37 +0200 d116 1 a116 1 - 'INC' => '-I$(DBI_INSTARCH_DIR)', @ 1.13.2.1 log @MFC: latest upgrades @ text @d75 2 a76 2 --- Makefile.PL.orig 2004-10-12 11:03:50 +0200 +++ Makefile.PL 2004-10-13 19:23:27 +0200 d116 1 a116 1 - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)', @ 1.12 log @modifying package: perl-dbi-5.8.5 20040909 -> 20040918 @ text @d2 3 a4 3 --- MANIFEST.orig 2004-07-21 22:48:03 +0200 +++ MANIFEST 2004-09-18 13:01:11 +0200 @@@@ -1,52 +1,14 @@@@ a14 1 -encode.c d56 1 a56 1 @@@@ -74,17 +36,3 @@@@ d75 3 a77 3 --- Makefile.PL.orig 2004-09-10 15:53:48 +0200 +++ Makefile.PL 2004-09-18 13:01:42 +0200 @@@@ -5,34 +5,6 @@@@ d112 1 a112 1 @@@@ -41,8 +13,9 @@@@ d122 1 a122 1 ($DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id'), d125 1 a125 1 +++ dbdimp.h 2004-09-18 13:01:12 +0200 @ 1.11 log @modifying package: perl-dbi-5.8.5 20040810 -> 20040824 @ text @d2 2 a3 2 --- MANIFEST.orig 2004-07-21 22:50:42 +0200 +++ MANIFEST 2004-08-01 20:16:30 +0200 d76 2 a77 2 --- Makefile.PL.orig 2004-08-23 16:46:22 +0200 +++ Makefile.PL 2004-08-24 09:54:46 +0200 d121 3 a123 3 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize} $nlid", 'clean' => { FILES => 'SQLite.xsi config.h' }, 'PL_FILES' => {}, d125 2 a126 2 --- dbdimp.h.orig 2004-08-01 06:36:19 +0200 +++ dbdimp.h 2004-08-01 20:16:30 +0200 @ 1.10 log @modifying package: perl-dbi-5.8.5 20040803 -> 20040810 @ text @d76 2 a77 2 --- Makefile.PL.orig 2004-08-01 06:36:27 +0200 +++ Makefile.PL 2004-08-01 20:17:27 +0200 d111 4 a114 3 WriteMakefile( 'NAME' => 'DBD::SQLite', @@@@ -40,7 +12,9 @@@@ d117 2 a118 2 'INC' => '-I$(DBI_INSTARCH_DIR)', - 'OPTIMIZE' => "-O6 -DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}", d121 1 a121 1 + 'OPTIMIZE' => "-O2", a123 1 ); @ 1.9 log @modifying package: perl-dbi-5.8.5 20040723 -> 20040801 @ text @d117 1 a117 1 - 'OPTIMIZE' => "-O2 -DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}", a123 12 Index: dbdimp.c --- dbdimp.c.orig 2004-08-01 06:39:16 +0200 +++ dbdimp.c 2004-08-01 20:16:30 +0200 @@@@ -249,7 +249,7 @@@@ return FALSE; } - DBIc_NUM_PARAMS(imp_sth) = sqlite3_bind_count(imp_sth->stmt); + DBIc_NUM_PARAMS(imp_sth) = sqlite3_bind_parameter_count(imp_sth->stmt); DBIc_NUM_FIELDS(imp_sth) = sqlite3_column_count(imp_sth->stmt); DBIc_IMPSET_on(imp_sth); @ 1.8 log @force to use external SQLite v3 @ text @a0 12 Index: dbdimp.h --- dbdimp.h.orig 2004-07-21 22:50:42 +0200 +++ dbdimp.h 2004-07-23 11:37:44 +0200 @@@@ -4,7 +4,7 @@@@ #define _DBDIMP_H 1 #include "SQLiteXS.h" -#include "sqliteInt.h" +#include "sqlite3.h" /* 30 second timeout by default */ #define SQL_TIMEOUT 30000 d2 2 a3 2 --- MANIFEST.orig 2004-07-21 22:48:03 +0200 +++ MANIFEST 2004-07-23 11:42:58 +0200 d76 3 a78 3 --- Makefile.PL.orig 2004-07-21 22:44:54 +0200 +++ Makefile.PL 2004-07-23 11:49:59 +0200 @@@@ -5,29 +5,15 @@@@ d86 3 d93 10 d113 1 a113 1 'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION d116 1 a116 1 - 'INC' => '-I$(DBI_INSTARCH_DIR)', d122 1 a123 1 d125 3 a127 3 --- dbdimp.c.orig 2004-07-21 22:50:42 +0200 +++ dbdimp.c 2004-07-23 12:02:11 +0200 @@@@ -224,7 +224,7 @@@@ d136 12 @ 1.7 log @modifying package: perl-dbi-5.8.3 20040224 -> 20040226 @ text @d1 5 a5 6 Index: DBD-Pg-1.31/dbdimp.c --- DBD-Pg-1.31/dbdimp.c.orig 2003-10-27 20:57:02.000000000 +0100 +++ DBD-Pg-1.31/dbdimp.c 2003-11-21 21:10:50.000000000 +0100 @@@@ -36,6 +36,34 @@@@ #include "large_object.c" #include "prescan_stmt.c" d7 128 a134 168 +static int +_dbd_begin(dbh, imp_dbh) + SV *dbh; + imp_dbh_t *imp_dbh; +{ + PGresult *result = NULL; + ExecStatusType status; + + if (DBIc_has(imp_dbh, DBIcf_AutoCommit)) + return 1; + + if (imp_dbh->pg_need_begin == 0) + return 1; + + imp_dbh->pg_need_begin = 0; + + /* start new transaction. AutoCommit must be FALSE (see above) */ + result = PQexec(imp_dbh->conn, "begin"); + status = result ? PQresultStatus(result) : -1; + PQclear(result); + if (status != PGRES_COMMAND_OK) { + pg_error(dbh, status, "begin failed\n"); + return 0; + } + + return 1; +} + void dbd_init (dbistate) dbistate_t *dbistate; @@@@ -219,6 +247,7 @@@@ #ifdef is_utf8_string imp_dbh->pg_enable_utf8 = 0; /* initialize pg_enable_utf8 */ #endif + imp_dbh->pg_need_begin = 1; /* initialize begin state */ DBIc_IMPSET_on(imp_dbh); /* imp_dbh set up now */ DBIc_ACTIVE_on(imp_dbh); /* call disconnect before freeing */ @@@@ -310,7 +339,7 @@@@ if (NULL != imp_dbh->conn) { PGresult* result = 0; - ExecStatusType commitstatus, beginstatus; + ExecStatusType commitstatus; /* execute commit */ result = PQexec(imp_dbh->conn, "commit"); @@@@ -323,15 +352,8 @@@@ pg_error(dbh, commitstatus, PQerrorMessage(imp_dbh->conn)); } - /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ - result = PQexec(imp_dbh->conn, "begin"); - beginstatus = result ? PQresultStatus(result) : -1; - PQclear(result); - if (beginstatus != PGRES_COMMAND_OK) { - /* Maybe add some loud barf here? Raising some very high error? */ - pg_error(dbh, beginstatus, "begin failed\n"); - return 0; - } + /* mark need for a begin at the start of the next command */ + imp_dbh->pg_need_begin = 1; /* if the initial COMMIT failed, return 0 now */ if (commitstatus != PGRES_COMMAND_OK) { @@@@ -361,6 +383,10 @@@@ if (NULL != imp_dbh->conn) { PGresult* result = 0; ExecStatusType status; + + /* no rollback is needed if we are not already in a transaction */ + if (imp_dbh->pg_need_begin) + return 1; /* execute rollback */ result = PQexec(imp_dbh->conn, "rollback"); @@@@ -375,14 +401,8 @@@@ return 0; } - /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ - result = PQexec(imp_dbh->conn, "begin"); - status = result ? PQresultStatus(result) : -1; - PQclear(result); - if (status != PGRES_COMMAND_OK) { - pg_error(dbh, status, "begin failed\n"); - return 0; - } + /* mark need for a begin at the start of the next command */ + imp_dbh->pg_need_begin = 1; return 1; } @@@@ -409,7 +429,8 @@@@ if (NULL != imp_dbh->conn) { /* rollback if AutoCommit = off */ - if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE) { + if ((imp_dbh->pg_need_begin == 0) + && (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE)) { PGresult* result = 0; ExecStatusType status; result = PQexec(imp_dbh->conn, "rollback"); @@@@ -485,16 +506,7 @@@@ if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to on: commit\n"); } } else if ((oldval != FALSE && newval == FALSE) || (oldval == FALSE && newval == FALSE && imp_dbh->init_commit)) { if (NULL != imp_dbh->conn) { - /* start new transaction */ - PGresult* result = 0; - ExecStatusType status; - result = PQexec(imp_dbh->conn, "begin"); - status = result ? PQresultStatus(result) : -1; - PQclear(result); - if (status != PGRES_COMMAND_OK) { - pg_error(dbh, status, "begin failed\n"); - return 0; - } + imp_dbh->pg_need_begin = 1; } if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to off: begin\n"); } } @@@@ -899,6 +911,9 @@@@ pg_error(sth, -1, "statement not prepared\n"); return -2; } + + if (_dbd_begin(sth, imp_dbh) == 0) + return -2; max_len = strlen(imp_sth->statement)+1; /* do we have input parameters ? */ Index: DBD-Pg-1.31/dbdimp.h --- DBD-Pg-1.31/dbdimp.h.orig 2003-03-31 19:52:39.000000000 +0200 +++ DBD-Pg-1.31/dbdimp.h 2003-11-21 20:53:09.000000000 +0100 @@@@ -28,6 +28,7 @@@@ #ifdef is_utf8_string int pg_enable_utf8; /* should we attempt to make utf8 strings? */ #endif + int pg_need_begin; /* does a begin need to be sent */ struct { int major; int minor; Index: DBD-Pg-1.31/Makefile.PL --- DBD-Pg-1.31/Makefile.PL.orig 2003-11-21 20:51:13.000000000 +0100 +++ DBD-Pg-1.31/Makefile.PL 2003-11-21 20:51:13.000000000 +0100 @@@@ -39,7 +39,7 @@@@ $POSTGRES_INCLUDE = $pg->inc_dir; $POSTGRES_LIB = $pg->lib_dir; } elsif ((!$ENV{POSTGRES_INCLUDE} or !$ENV{POSTGRES_LIB}) and $ENV{POSTGRES_HOME}) { - $POSTGRES_INCLUDE = "$ENV{POSTGRES_HOME}/include"; + $POSTGRES_INCLUDE = "$ENV{POSTGRES_HOME}/include/postgresql"; $POSTGRES_LIB = "$ENV{POSTGRES_HOME}/lib"; } else { $POSTGRES_INCLUDE = "$ENV{POSTGRES_INCLUDE}"; Index: DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm --- DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm.orig 2003-08-15 02:08:05.000000000 +0200 +++ DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm 2003-11-29 14:19:42.000000000 +0100 @@@@ -251,6 +251,9 @@@@ @@{$self}{qw(version major minor patch)} = ($version, $x, $y, $z); ## Beta/devel/release candidate versions are treated as patch level "0" + } elsif ($version =~ /^(\d+)\.(\d+)$/) { + @@{$self}{qw(version major minor patch)} = + ($version, $1, $2, 0); } elsif ($version =~ /(\d+)\.(\d+)\w+\d+/) { @@{$self}{qw(version major minor patch)} = ($version, $1, $2, 0); @ 1.6 log @allow DBD::Pg to build correctly against PostgreSQL 7.4 @ text @@ 1.5 log @upgrading package: perl-dbi 20031027 -> 20031121 @ text @d163 13 @ 1.4 log @fix postgresql include path @ text @d1 6 a6 5 --- DBD-Pg-1.22/dbdimp.c.orig Thu Mar 27 04:14:19 2003 +++ DBD-Pg-1.22/dbdimp.c Sat May 17 13:26:56 2003 @@@@ -97,6 +97,36 @@@@ free(err); } d8 1 a8 2 + +int d24 1 a24 1 + /* start new transaction. AutoCommit must be FALSE, ref. ~8 lines up */ d36 7 a42 8 + static int pgtype_bind_ok (dbtype) int dbtype; @@@@ -193,6 +223,7 @@@@ imp_dbh->init_commit = 1; /* initialize AutoCommit */ imp_dbh->pg_auto_escape = 1; /* initialize pg_auto_escape */ imp_dbh->pg_bool_tf = 0; /* initialize pg_bool_tf */ d44 25 a68 25 DBIc_IMPSET_on(imp_dbh); /* imp_dbh set up now */ DBIc_ACTIVE_on(imp_dbh); /* call disconnect before freeing */ @@@@ -284,7 +315,7 @@@@ if (NULL != imp_dbh->conn) { PGresult* result = 0; - ExecStatusType commitstatus, beginstatus; + ExecStatusType commitstatus; /* execute commit */ result = PQexec(imp_dbh->conn, "commit"); @@@@ -297,15 +328,8 @@@@ pg_error(dbh, commitstatus, PQerrorMessage(imp_dbh->conn)); } - /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ - result = PQexec(imp_dbh->conn, "begin"); - beginstatus = result ? PQresultStatus(result) : -1; - PQclear(result); - if (beginstatus != PGRES_COMMAND_OK) { - /* Maybe add some loud barf here? Raising some very high error? */ - pg_error(dbh, beginstatus, "begin failed\n"); - return 0; - } d71 8 a78 7 /* if the initial COMMIT failed, return 0 now */ if (commitstatus != PGRES_COMMAND_OK) { @@@@ -335,6 +359,10 @@@@ PGresult* result = 0; ExecStatusType status; d82 15 a96 16 + /* execute rollback */ result = PQexec(imp_dbh->conn, "rollback"); status = result ? PQresultStatus(result) : -1; @@@@ -346,14 +374,8 @@@@ return 0; } - /* start new transaction. AutoCommit must be FALSE, ref. 20 lines up */ - result = PQexec(imp_dbh->conn, "begin"); - status = result ? PQresultStatus(result) : -1; - PQclear(result); - if (status != PGRES_COMMAND_OK) { - pg_error(dbh, status, "begin failed\n"); - return 0; - } d99 8 a106 8 return 1; } @@@@ -377,7 +399,8 @@@@ if (NULL != imp_dbh->conn) { /* rollback if AutoCommit = off */ - if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE) { d108 18 a125 18 + && (DBIc_has(imp_dbh, DBIcf_AutoCommit) == FALSE)) { PGresult* result = 0; ExecStatusType status; result = PQexec(imp_dbh->conn, "rollback"); @@@@ -453,16 +476,7 @@@@ if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to on: commit\n"); } } else if ((oldval != FALSE && newval == FALSE) || (oldval == FALSE && newval == FALSE && imp_dbh->init_commit)) { if (NULL != imp_dbh->conn) { - /* start new transaction */ - PGresult* result = 0; - ExecStatusType status; - result = PQexec(imp_dbh->conn, "begin"); - status = result ? PQresultStatus(result) : -1; - PQclear(result); - if (status != PGRES_COMMAND_OK) { - pg_error(dbh, status, "begin failed\n"); - return 0; - } d127 7 a133 7 } if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to off: begin\n"); } } @@@@ -1182,6 +1196,9 @@@@ SV **svp; if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_execute\n"); } d136 7 a142 6 + return 0; /* here we get the statement from the statement handle where --- DBD-Pg-1.22/dbdimp.h.orig Tue Mar 25 23:17:00 2003 +++ DBD-Pg-1.22/dbdimp.h Sat May 17 13:29:12 2003 d144 1 a144 1 #ifdef SvUTF8_off d148 7 a154 17 }; /* Define sth implementor data structure */ --- DBD-ODBC-1.06/Makefile.PL.dist 2003-06-23 15:42:09.000000000 +0200 +++ DBD-ODBC-1.06/Makefile.PL 2003-06-23 15:42:23.000000000 +0200 @@@@ -424,7 +424,7 @@@@ changes_pm = ' . File::Spec->catfile($self->{INST_LIB}, 'DBD/ODBC', 'Changes.pm') . ' config :: $(changes_pm) - @@$(NOOP) + @@$(NOOP) $(changes_pm): Changes $(NOECHO) $(MKPATH) $(inst_libdbdodbc) --- DBD-Pg-1.22/Makefile.PL.dist 2003-07-01 08:31:41.000000000 +0200 +++ DBD-Pg-1.22/Makefile.PL 2003-07-01 08:31:57.000000000 +0200 @@@@ -36,7 +36,7 @@@@ @ 1.4.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @@ 1.3 log @add optional DBD::ODBC @ text @d162 11 @ 1.2 log @fix patch @ text @d151 11 @ 1.1 log @remove old workaround for DBD::Sprite 0.43 and include upgraded DBD::Pg patch from ISC OpenReg 1.0.2 @ text @d16 1 a16 1 + if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == TRUE) @