From 2f97cf3f9e13280da9d161d39b8d9b0d66555307 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 17 Dec 2008 20:57:46 -0500 Subject: SiSU's sqlite module still broken for the time being: inconsistent ruby dbi api for sqlite3, (unable to begin and commit transaction) provide explicit message problem noted already in v.0.66.2 (2008-04) and last in v.0.66.3 (2008-05) module (& rb dbi) apparently worked at end 2007 (v.0.62.4) and start of 2008 (v.0.64.0) ... (did not expect broken state to last, sorry) include maintenance mode info with -M flag --- lib/sisu/v0/db_select.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'lib/sisu/v0/db_select.rb') diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v0/db_select.rb index a596d4e3..675a89e4 100644 --- a/lib/sisu/v0/db_select.rb +++ b/lib/sisu/v0/db_select.rb @@ -65,9 +65,9 @@ module SiSU_DB_select #@conn.execute("BEGIN;") #@sdb=Create.new(@conn) @file=sql_maintenance_file - @sdb=SiSU_DB_DBI::Create.new(@opt,@conn,@file,@sql_type) - @sdb_index=SiSU_DB_DBI::Index.new(@opt,@conn,@file,@sql_type) - @sdb_no=SiSU_DB_DBI::Drop.new(@opt,@conn,@file,@sql_type) + @sdb=SiSU_DB_DBI::Create.new(@opt,@conn,@file,@sql_type) # db_dbi.rb + @sdb_index=SiSU_DB_DBI::Index.new(@opt,@conn,@file,@sql_type) # db_dbi.rb + @sdb_no=SiSU_DB_DBI::Drop.new(@opt,@conn,@file,@sql_type) # db_dbi.rb @sdb_import=SiSU_DB_DBI::Import.new(@opt,@conn,@file,@sql_type) if @opt.mod.inspect =~/update|import/ @sdb_remove_doc=SiSU_DB_DBI::Remove.new(@opt,@conn,@file) if @opt.mod.inspect =~/update|remove/ @db=SiSU_Env::Info_db.new @@ -155,13 +155,13 @@ module SiSU_DB_select else '???' end tell.puts_grey if @opt.cmd =~/v/ - when /^--remove$/ - @sdb_remove_doc.remove when /^--update$/ @sdb_remove_doc.remove @sdb_import.marshal_load tell=SiSU_Screen::Ansi.new(@opt.cmd,"pgaccess or psql #{@db.psql.db} database?") tell.puts_grey if @opt.cmd =~/v/ + when /^--remove$/ + @sdb_remove_doc.remove when /^--index$/ @sdb_index.create_indexes when /^droptable(s)?$/ @@ -185,7 +185,11 @@ module SiSU_DB_select end end begin - @conn.commit if @sql_type =~/sqlite/ + #if @sql_type =~/sqlite/ + # #p @conn.methods.sort + # @conn.commit + # ##@conn.disconnect + #end rescue; @sdb.output_dir? end end -- cgit v1.2.3