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 2008-02-02 10:57:18 +0100 @@ -10,34 +10,6 @@ } use Config; use strict; -eval { - 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; +my $libs = `@l_prefix@/bin/pkg-config sqlite3 --libs`; +$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.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); 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 2008-02-02 10:57:18 +0100 @@ -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-cego/Makefile.PL --- DBD-cego/Makefile.PL.orig 2007-06-25 20:38:07 +0200 +++ DBD-cego/Makefile.PL 2008-02-02 10:57:18 +0100 @@ -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.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 @@ -19,6 +19,7 @@ * Header files we use */ #include /* installed by the DBI module */ +#include #include /* Comes with MySQL-devel */ #include /* Comes MySQL */ 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 @@ -343,3 +343,4 @@ } # end. + 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, 'Class::MakeMethods' => 0, 'IO::Dir' => 0, - 'Log::Log4perl' => 0, 'Parse::RecDescent' => 1.94, 'Pod::Usage' => 0, 'Class::Accessor::Fast' => 0, @@ -44,13 +43,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.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 @@ -5,8 +5,6 @@ use Data::Dumper; local $Data::Dumper::Maxdepth = 3; -use Log::Log4perl qw(:easy); -Log::Log4perl->easy_init($ERROR); 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++; } }