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/sysenv.rb | 76 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 26 deletions(-)

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

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 7e94d8a3..0661aa13 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -2549,36 +2549,60 @@ p @zap
       @rc=@@rc ||=Get_init.instance.yamlrc
       @defaults=Info_env.new.defaults
     end
-    def user
-      @env.user
-    end
-    def db_psql
-      "SiSU_#@pwd_stub"
-    end
-    def db_mysql
-      'lm'
-    end
-    def db_sqlite
-      "#{@env.path.webserv}/#@pwd_stub/sisu_sqlite.db"
-    end
-    def port_psql #PGPORT
-      if defined? @rc['db']['postgresql']['port'] \
-      and @rc['db']['postgresql']['port'] =~/\d+/
-        @rc['db']['postgresql']['port']
-      else @defaults[:postgresql_port]
+    def engine
+      def default
+        if defined? @rc['db']['engine']['default'] \
+        and @rc['db']['engine']['default']=~/postgresql|sqlite/
+          @rc['db']['engine']['default']
+        else 'sqlite'
+        end
       end
+      self
     end
-    def port_mysql
-      '**'
-    end
-    def dbi_psql
-      "DBI:Pg:database=#{db_psql};port=#{port_psql}"
+    def psql
+      def user
+        if defined? @rc['db']['postgresql']['user'] \
+        and @rc['db']['postgresql']['user']=~/\S+/
+          @rc['db']['postgresql']['user']
+        else @env.user
+        end
+      end
+      def db #db_name
+        "SiSU_#@pwd_stub"
+      end
+      def port #PGPORT
+        if defined? @rc['db']['postgresql']['port'] \
+        and ( @rc['db']['postgresql']['port'] =~/\d+/ \
+        or @rc['db']['postgresql']['port'].class == Fixnum)
+          @rc['db']['postgresql']['port']
+        else @defaults[:postgresql_port]
+        end
+      end
+      def dbi
+        "DBI:Pg:database=#{psql.db};port=#{psql.port}"
+      end
+      self
     end
-    def dbi_mysql
-      "dbi:Mysql:database=#{db_mysql};port=#{port_mysql}"
+    def mysql
+      def db
+        #"SiSU_#@pwd_stub"
+      end
+      def port
+        '**'
+      end
+      def dbi
+        "dbi:Mysql:database=#{mysql.db};port=#{mysql.port}"
+      end
+      self
     end
-    def dbi_sqlite
-      "DBI:SQLite:#{db_sqlite}" #sqlite3 ?
+    def sqlite
+      def db
+        "#{@env.path.webserv}/#@pwd_stub/sisu_sqlite.db"
+      end
+      def dbi
+        "DBI:SQLite:#{sqlite.db}" #sqlite3 ?
+      end
+      self
     end
   end
   class Info_port < Info_env
-- 
cgit v1.2.3