From 7bfd567154b9fd468e5df53901c3d8c383cc25f8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 18 May 2014 08:53:33 -0400 Subject: v5 v6: db, remove ruby-dbi, for: pg ruby-pg, sqlite ruby-sqlite3 (already uses) * ruby-pg require for postgresql * ruby-sqlite3 require for sqlite3 (done previously: already using ruby-sqlite3 rather than ruby-dbi) * ruby-dbi remove calls (in any common files & sisu pg and sisu sqlite3) * separate pg and sqlite db actions --- data/doc/sisu/CHANGELOG_v5 | 3 +++ data/doc/sisu/CHANGELOG_v6 | 3 +++ data/doc/sisu/sisu.org | 23 ++++++++++------------- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 55f6d35c..1e958203 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -40,6 +40,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.6.orig.tar.xz * db, * use symbols to identify sql engine + * remove require 'dbi' (ruby-dbi) + * for pg: require 'pg' (use ruby-pg directly) + * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case] %% 5.3.5.orig.tar.xz (2014-05-12:19/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.5 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 75e63335..0c533432 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -30,6 +30,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.6.orig.tar.xz * db, * use symbols to identify sql engine + * remove require 'dbi' (ruby-dbi) + * for pg: require 'pg' (use ruby-pg directly) + * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly) [already the case] %% 6.0.5.orig.tar.xz (2014-05-12:19/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.5 diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org index d87f8cc5..0e4b0bf6 100644 --- a/data/doc/sisu/sisu.org +++ b/data/doc/sisu/sisu.org @@ -1195,7 +1195,7 @@ http://lists.sisudoc.org/pipermail/sisu/2014-May/000818.html SiSU does not depend on an sql database to be useful and most users do not use the database (population and resulting search) possibilities. -***** TODO [#B] sisu-sqlite +***** DONE [#B] sisu-sqlite 5.3.4 uses ruby-sqlite3 directly. There has been a dependency within debian/control on ruby-dbi for sisu-sqlite, this can safely be removed, without affecting its operation. @@ -1204,25 +1204,22 @@ http://lists.sisudoc.org/pipermail/sisu/2014-May/000818.html >Solution Proposed: remove debian/control dependency on ruby-dbi Solution Implemented: - (pending) + * sisu-sqlite uses 'sqlite3' ruby-sqlite3 (any superflous dbi loading dropped) + * code tests passed (create tables, populate db etc. work fine) + (closes) -***** TODO [#B] sisu-postgresql +***** DONE [#B] sisu-postgresql sisu-postgresql 5.3.4 uses ruby-pg through ruby-dbi. >Solution Proposed: >* attempt now to fix by migrating to use ruby-pg directly > * remove dependency on ruby-dbi in debian/control > * rewrite code within sisu to work directly with ruby-pg - >failing to do this within the autoremoval time: - > * remove dependency on ruby-dbi in debian/control - > * replace ruby-dbi with ruby-pg - > this breaks the postgresql functionality of sisu - > * file a serious bug against sisu-postgresql (which is contained - > within sisu package) and take more time to repair. and/or * - > request an extension of time on auto-removal Solution Implemented: - (pending) + * sisu-postgresql uses 'pg' ruby-pg (ruby-dbi dropped) + * code tests passed (create tables, populate db etc. work fine) + (closes) ***** TODO [#B] sample cgi search forms there is a sample cgi search form facility within sisu that uses @@ -1249,8 +1246,8 @@ http://lists.sisudoc.org/pipermail/sisu/2014-May/000818.html debian/control, remove dependency on ruby-dbi, contained in sisu-postgresql and sisu-sqlite Current status - * sisu-sqlite works fine, depends on ruby-sqlite3 - * sisu-postgresql is broken till fixed to work with ruby-pg (or ruby-dbi fixed) + * sisu-sqlite ok, uses 'sqlite3' (superflous dbi loading dropped) + * sisu-postgresql ok, uses 'pg' (dbi dropped) * sample cgi search froms (cgi database query forms) are broken till they work off ruby-pg & ruby-sqlite3 respectively instead of ruby-dbi -- cgit v1.2.3