.gear-rules | 2 + .../2be6db106a1f9bc49db32b14f820a8a468027349 | 13 +++ .gear-tags/list | 1 + MANIFEST | 61 --------------- Makefile.PL | 3 + dbdimp.c | 8 +- dbdimp.h | 2 +- perl-DBD-SQLite.spec | 78 ++++++++++++++++++++ 8 files changed, 102 insertions(+), 66 deletions(-) diff --git a/.gear-rules b/.gear-rules new file mode 100644 index 0000000..390cf00 --- /dev/null +++ b/.gear-rules @@ -0,0 +1,2 @@ +tar: @version@:. name=DBD-SQLite-@version@ +diff: @version@:. . name=perl-DBD-SQLite-@version@-@release@.patch diff --git a/.gear-tags/2be6db106a1f9bc49db32b14f820a8a468027349 b/.gear-tags/2be6db106a1f9bc49db32b14f820a8a468027349 new file mode 100644 index 0000000..a33d7a3 --- /dev/null +++ b/.gear-tags/2be6db106a1f9bc49db32b14f820a8a468027349 @@ -0,0 +1,13 @@ +object 9855ef953b55e1174e9011891655b9bfb21ba42c +type commit +tag 1.13 +tagger Alexey Tourbin 1161466613 +0400 + +1.13 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQBFOpL3fBKgtDjnu0YRAiKpAJ94hjNy5CLnDAQl/ukwJg/A/dZHkgCeJDbb +6LnD2Yo0sqES7aBvxP6piaU= +=Saly +-----END PGP SIGNATURE----- diff --git a/.gear-tags/list b/.gear-tags/list new file mode 100644 index 0000000..7bc3b58 --- /dev/null +++ b/.gear-tags/list @@ -0,0 +1 @@ +2be6db106a1f9bc49db32b14f820a8a468027349 1.13 diff --git a/MANIFEST b/MANIFEST index 22003ee..f22017c 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,60 +1,15 @@ -alter.c -analyze.c -attach.c -auth.c -btree.c -btree.h -build.c -callback.c Changes -complete.c -date.c dbdimp.c dbdimp.h -delete.c -expr.c -func.c getsqlite.pl -hash.c -hash.h -insert.c -keywordhash.h -legacy.c lib/DBD/SQLite.pm -loadext.c -main.c Makefile.PL MANIFEST MANIFEST.SKIP META.yml Module meta-data (added by MakeMaker) -opcodes.c -opcodes.h -os.c -os.h -os_common.h -os_os2.c -os_os2.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 -prepare.c -printf.c -random.c README -select.c SQLite.xs -sqlite3.h -sqlite3ext.h -sqliteInt.h SQLiteXS.h t/00basic.t t/01logon.t @@ -86,19 +41,3 @@ t/ak-dbd.t 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 -vdbefifo.c -vdbeInt.h -vdbemem.c -vtab.c -where.c diff --git a/Makefile.PL b/Makefile.PL index 91f3b1d..1891d72 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -10,6 +10,8 @@ if ($@) { } use Config; use strict; + +=pod eval { require DBD::SQLite; if ($DBD::SQLite::VERSION < 1.0) { @@ -38,6 +40,7 @@ EOT } } }; +=cut # (ALT) don't look for existing installations # 2005/6/19, by rjray@blackperl.com # diff --git a/dbdimp.c b/dbdimp.c index 5390ba3..4b107a9 100644 --- a/dbdimp.c +++ b/dbdimp.c @@ -394,12 +394,12 @@ sqlite_st_execute (SV *sth, imp_sth_t *imp_sth) sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth)); if (DBIc_NUM_FIELDS(imp_sth) == 0) { - while ((retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) { - if (retval == SQLITE_ROW) { + while ((imp_sth->retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) { + if (imp_sth->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, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); return -5; } /* warn("Finalize\n"); */ @@ -440,7 +440,7 @@ sqlite_bind_ph (SV *sth, imp_sth_t *imp_sth, int is_inout, IV maxlen) { int pos; - if (!SvIOK(param)) { + if (!SvIOKp(param)) { int len; char *paramstring; paramstring = SvPV(param, len); diff --git a/dbdimp.h b/dbdimp.h index 44d6fa7..d1a915c 100644 --- a/dbdimp.h +++ b/dbdimp.h @@ -4,7 +4,7 @@ #define _DBDIMP_H 1 #include "SQLiteXS.h" -#include "sqliteInt.h" +#include /* 30 second timeout by default */ #define SQL_TIMEOUT 30000 diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec new file mode 100644 index 0000000..135dad5 --- /dev/null +++ b/perl-DBD-SQLite.spec @@ -0,0 +1,78 @@ +%define dist DBD-SQLite +Name: perl-%dist +Version: 1.13 +Release: alt3 + +Summary: SQLite driver for DBI interface in Perl +License: GPL or Artistic +Group: Development/Perl + +URL: %CPAN %dist +Source: %dist-%version.tar +Patch: %name-%version-%release.patch + +# last_insert_id will only work on DBI 1.43 +Requires: perl-DBI >= 1.43 +BuildPreReq: perl-DBI-devel >= 1.43 + +# for CCFLAGS=-fvisibility=hidden +BuildPreReq: perl-devel >= 1:5.8.8-alt5 + +# Automatically added by buildreq on Mon Aug 06 2007 +BuildRequires: libsqlite3-devel perl-DBI-devel perl-devel + +%description +DBD::SQLite is a DBI driver for SQLite database. +SQLite is a small C library that implements a self-contained, +embeddable, zero-configuration SQL database engine. + +%prep +%setup -q -n %dist-%version +%patch -p1 + +%build +%perl_vendor_build LIBS=-lsqlite3 CCFLAGS=-fvisibility=hidden + +%install +%perl_vendor_install + +%files +%doc Changes README +%dir %perl_vendor_archlib/DBD + %perl_vendor_archlib/DBD/SQLite.pm +%dir %perl_vendor_autolib/DBD +%dir %perl_vendor_autolib/DBD/SQLite + %perl_vendor_autolib/DBD/SQLite/SQLite.so + +%changelog +* Mon Aug 06 2007 Alexey Tourbin 1.13-alt3 +- applied deiban fix for "Unknown named parameter" (deb #422209) + +* Sun Oct 22 2006 Alexey Tourbin 1.13-alt2 +- imported sources into git and built with gear +- backported fix for pragmas on empty db causing "Not an error" errors +- there's still a problem with Class::DBI, but I think I should also + fix Class::DBI for this time + +* Sat Sep 09 2006 Alexey Tourbin 1.13-alt1 +- 1.12 -> 1.13 + +* Mon Apr 17 2006 Alexey Tourbin 1.12-alt1 +- 1.09 -> 1.12 + +* Fri Jun 24 2005 Alexey Tourbin 1.09-alt1 +- 1.08 -> 1.09 + +* Fri Mar 04 2005 Alexey Tourbin 1.08-alt1 +- 1.07 -> 1.08 + +* Sun Dec 19 2004 Alexey Tourbin 1.07-alt1 +- 1.05 -> 1.07 +- manual pages not packaged (use perldoc) + +* Thu Sep 16 2004 Alexey Tourbin 1.05-alt1 +- 1.03 -> 1.05 + +* Fri Aug 13 2004 Alexey Tourbin 1.03-alt1 +- initial revision +- remove sqlite3 sources and use system-wide libsqlite3