From 96049bf591123333b8a17780544a7951146ef03b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 26 Oct 2007 22:41:42 +0100
Subject: db rearranging, create, drop, import (and a renaming: db_dbi from
 shared_db)

---
 lib/sisu/v0/dbi.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/sisu/v0/dbi.rb')

diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v0/dbi.rb
index 17568ce6..d9f73989 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v0/dbi.rb
@@ -61,8 +61,8 @@ module  SiSU_DBI
   include SiSU_Screen
   require "#{SiSU_lib}/param"
   include SiSU_Param
-  require "#{SiSU_lib}/shared_db"
-  include SiSU_DB
+  require "#{SiSU_lib}/db_dbi"
+  include SiSU_DB_DBI
   require "#{SiSU_lib}/shared_html_lite"
   include SiSU_Format_Shared
   class SiSU_SQL
@@ -90,14 +90,14 @@ module  SiSU_DBI
     end
     def read_psql
       begin
-        db,user,dbi=@db.db_psql,@db.user,@db.dbi_psql
+        db,user,dbi=@db.psql.db,@db.psql.user,@db.psql.dbi
         @conn=DBI.connect(dbi,user,db)
       rescue
         if @opt.mod.inspect=~/--(createall|create)/
           puts %{manually create the database: "#{db}" if it does not yet exist}
           #sudo su -p postgres;  createdb #{db}; #[createuser?]
         end
-        SiSU_DB::Case.new(@opt,@conn,@sql_type).cases
+        SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases
         @conn=DBI.connect(dbi,user,db)
       ensure
       end
@@ -105,7 +105,7 @@ module  SiSU_DBI
     def read_sqlite
       begin
         sql_type='sqlite'
-        dbi=@db.dbi_sqlite
+        dbi=@db.sqlite.dbi
         @conn=DBI.connect(dbi)
       rescue
       ensure
@@ -119,7 +119,7 @@ module  SiSU_DBI
       tell=SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#@sql_type) #{@opt.mod}")
       tell.dbi_title unless @opt.cmd =~/q/
       begin
-        SiSU_DB::Case.new(@opt,@conn,@sql_type).cases
+        SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases
       rescue;        SiSU_Errors::Info_error.new($!,$@,@cf,@opt.fns).error
       ensure
       end
-- 
cgit v1.2.3