From 6811ac91f21a434fc7d967c11e1b20f33918c6ea Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 19 Mar 2012 22:07:29 -0400
Subject: v3: 3.2 branch is main (v3dv --> v3); dev (v3dv) branch directories
 removed

* v3dv (3.2) "merged" into v3 (previously 3.1) (& removed)
  * conf/sisu/v3dv --> conf/sisu/v3
  * data/sisu/v3dv --> data/sisu/v3
  * lib/sisu/v3dv  --> lib/sisu/v3
  * bin/sisu* (v3dv references changed to v3)
  * (--dev modifier (superfluous for the time being) runs main v3 branch)
---
 lib/sisu/v3/dbi.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/lib/sisu/v3/dbi.rb b/lib/sisu/v3/dbi.rb
index 008ac5d4..f11d9e81 100644
--- a/lib/sisu/v3/dbi.rb
+++ b/lib/sisu/v3/dbi.rb
@@ -63,15 +63,15 @@ module  SiSU_DBI
   require_relative 'param'                              # param.rb
     include SiSU_Param
   require_relative 'db_dbi'                             # db_dbi.rb
-    include SiSU_DB_DBI
+    include SiSU_DbDBI
   require_relative 'shared_html_lite'                   # shared_html_lite.rb
-    include SiSU_Format_Shared
-  class SiSU_SQL
+    include SiSU_FormatShared
+  class SQL
     def initialize(opt)
       SiSU_Env::Load.new('dbi',true).prog
       @opt=opt
-      @db=SiSU_Env::Info_db.new
-      if @opt.cmd =~/d/i \
+      @db=SiSU_Env::InfoDb.new
+      if @opt.cmd =~/[Dd]/ \
       or  @opt.mod.inspect =~/--(pg(?:sql)?|(?:sq)?lite)/
         @sql_type=if @opt.cmd=~/D/ \
         or @opt.mod.inspect =~/--pg(?:sql)?/
@@ -108,7 +108,7 @@ module  SiSU_DBI
           puts %{manually create the database: "#{@db.db}" if it does not yet exist}
           #sudo su -p postgres;  createdb #{@db.db}; #[createuser?]
         end
-        SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases
+        SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases
         @conn=DBI.connect(@db.dbi,@db.user,@db.db)
       ensure
       end
@@ -128,9 +128,9 @@ module  SiSU_DBI
       end
       SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/
       begin
-        SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases
+        SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases
       rescue
-        SiSU_Errors::Info_error.new($!,$@,@cf,@opt.fns).error
+        SiSU_Errors::InfoError.new($!,$@,@cf,@opt.fns).error
       ensure
       end
       begin
-- 
cgit v1.2.3