aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/dbi.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2008-12-22 01:08:06 -0500
committerRalph Amissah <ralph@amissah.com>2008-12-24 00:34:18 -0500
commit71223cf6cd035b3e395f6d4c3e4c41b79ed29510 (patch)
tree58fe17f8c2340792924b0eb2eeea51a8e9805e53 /lib/sisu/v0/dbi.rb
parentSiSU's sqlite module still broken for the time being: inconsistent ruby dbi api (diff)
sqlite3 fix, populate do using rb sqlite3 driver directly (rb dbi problematic
at present) sqlite fix, change ruby driver used to populate sisu sqlite3 db to rb sqlite3 for the time being. Use rb sqlite3 driver directly rather (than more convenient when working) rb dbi interface to populate content. Used to bypass problems with rb dbi sqlite3 interface noted in sisu 0.66.2 (2008-04-25) and 0.66.3 (2008-05-11) that have have persisted (apparently worked at end 2007 (v.0.62.4) and start of 2008 (v.0.64.0) * sqlite dropall, fix * fix to auto-generated sqlite cgi script sample, only works if at least one existing populated sisu sqlite database is found during the generation process
Diffstat (limited to 'lib/sisu/v0/dbi.rb')
-rw-r--r--lib/sisu/v0/dbi.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v0/dbi.rb
index 9576fa74..14b3e059 100644
--- a/lib/sisu/v0/dbi.rb
+++ b/lib/sisu/v0/dbi.rb
@@ -105,8 +105,7 @@ module SiSU_DBI
end
def read_psql
begin
- db,user,dbi,pass=@db.psql.db,@db.psql.user,@db.psql.dbi,@db.psql.password
- @conn=DBI.connect(dbi,user,pass)
+ @conn=@db.psql.conn_dbi
rescue
if @opt.mod.inspect=~/--(createall|create)/
puts %{manually create the database: "#{db}" if it does not yet exist}
@@ -120,8 +119,8 @@ module SiSU_DBI
def read_sqlite
begin
sql_type='sqlite'
- dbi=@db.sqlite.dbi
- @conn=DBI.connect(dbi)
+ @conn=@db.sqlite.conn_sqlite3
+ #@conn=@db.sqlite.conn_dbi #issue with dbi sqlite api, when fixed revert to using, KEEP
rescue
ensure
end