diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-04-21 01:56:22 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-04-21 01:56:22 -0400 |
commit | 5e3e532f52e50506764d562d227d813d1371fa7c (patch) | |
tree | e13abd38eb077b5b987b48fbf413dd15f84327dc /lib/sisu/v3/db_select.rb | |
parent | debian/changelog (3.2.3-1) (diff) | |
parent | v3: rescue reporting (diff) |
Merge tag 'sisu_3.2.4' into debian/sid
Diffstat (limited to 'lib/sisu/v3/db_select.rb')
-rw-r--r-- | lib/sisu/v3/db_select.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v3/db_select.rb b/lib/sisu/v3/db_select.rb index 52fbe8ba..ec6c91dc 100644 --- a/lib/sisu/v3/db_select.rb +++ b/lib/sisu/v3/db_select.rb @@ -62,15 +62,15 @@ module SiSU_DbSelect def initialize(opt,conn='',sql_type='pg') @opt,@conn,@sql_type=opt,conn,sql_type @db=SiSU_Env::InfoDb.new - @file=sql_maintenance_file - @sdb=SiSU_DbDBI::Create.new(@opt,@conn,@file,@sql_type) # db_dbi.rb - @sdb_index=SiSU_DbDBI::Index.new(@opt,@conn,@file,@sql_type) # db_dbi.rb + @file_maint=sql_maintenance_file + @sdb=SiSU_DbDBI::Create.new(@opt,@conn,@file_maint,@sql_type) # db_dbi.rb + @sdb_index=SiSU_DbDBI::Index.new(@opt,@conn,@file_maint,@sql_type) # db_dbi.rb @sdb_no=SiSU_DbDBI::Drop.new(@opt,@conn,@db,@sql_type) # db_dbi.rb if @opt.mod.inspect =~/update|import/ - @sdb_import=SiSU_DbDBI::Import.new(@opt,@conn,@file,@sql_type) - @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file,@sql_type) + @sdb_import=SiSU_DbDBI::Import.new(@opt,@conn,@file_maint,@sql_type) + @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file_maint,@sql_type) elsif @opt.mod.inspect =~/remove/ - @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file,@sql_type) + @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file_maint,@sql_type) end end def db_exist? |