diff options
Diffstat (limited to 'lib/sisu/v0/db_select.rb')
-rw-r--r-- | lib/sisu/v0/db_select.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v0/db_select.rb index 675a89e4..87a3a5af 100644 --- a/lib/sisu/v0/db_select.rb +++ b/lib/sisu/v0/db_select.rb @@ -65,18 +65,18 @@ module SiSU_DB_select #@conn.execute("BEGIN;") #@sdb=Create.new(@conn) @file=sql_maintenance_file + @db=SiSU_Env::Info_db.new @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_no=SiSU_DB_DBI::Drop.new(@opt,@conn,@db,@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 end def sql_maintenance_file file=if @opt.inspect =~/M/ x=if @opt.fns and not @opt.fns.empty? @env=SiSU_Env::Info_env.new(@opt.fns) if @opt.fns - puts "\n#{@env.path.sqlite}/#{@opt.fns}.sql" + puts "\n#{@env.path.sqlite}/#{@opt.fns}.sql" if @sql_type =~/sqlite/ and @opt.cmd =~/M/ @db=SiSU_Env::Info_db.new @job="sqlite3 #{@db.sqlite.db} < #{@env.path.sqlite}/#{@opt.fns}.sql" File.new("#{@env.path.sqlite}/#{@opt.fns}.sql",'w+') @@ -185,11 +185,7 @@ module SiSU_DB_select end end begin - #if @sql_type =~/sqlite/ - # #p @conn.methods.sort - # @conn.commit - # ##@conn.disconnect - #end + #@conn.commit if @sql_type =~/sqlite/ rescue; @sdb.output_dir? end end |