aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5/dbi_discrete.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-22 21:39:25 -0400
committerRalph Amissah <ralph@amissah.com>2014-07-22 21:39:25 -0400
commitf36e8bf79f92b0be3d87788e6a48605f031698da (patch)
tree5b2c783fd8b08d2208dcff7a09fea6ebd67a1b5b /lib/sisu/v5/dbi_discrete.rb
parentv5 v6: db, pg import, fix (diff)
v5 v6: db, pqsl, sqlite, reorganise triggers
Diffstat (limited to 'lib/sisu/v5/dbi_discrete.rb')
-rw-r--r--lib/sisu/v5/dbi_discrete.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index cb0116b3..a2aa3d09 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -81,8 +81,7 @@ module SiSU_DBI_Discrete #% database building
@opt=opt
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
@md=@particulars.md
- if @opt.cmd =~/[d]/ \
- or @opt.mod.inspect =~/--((?:sq)?lite)/
+ if @opt.act[:sqlite][:set]==:on
@sql_type=:sqlite
maintenance_check(@opt,__FILE__,__LINE__) if @opt.act[:maintenance][:set]==:on
end
@@ -96,8 +95,8 @@ module SiSU_DBI_Discrete #% database building
create_and_populate
end
def maintenance_check(opt,file,line)
- p opt.mod
- p opt.cmd
+ #p opt.mod
+ #p opt.cmd
p "at #{file} #{line}"
end
def prepare
@@ -143,9 +142,9 @@ module SiSU_DBI_Discrete #% database building
sdb_import=SiSU_DbDBI::Import.new(@opt,conn,@file_maint,:sqlite)
sdb_import.marshal_load
tell=SiSU_Screen::Ansi.new(
- @opt.act[:color_state][:set],
- "sqlite3 #{db.sqlite.db} database?"
- )
+ @opt.act[:color_state][:set],
+ "sqlite3 #{db.sqlite.db} database?"
+ )
tell.puts_grey if @opt.act[:verbose][:set]==:on
rescue
SiSU_Errors::Rescued.new($!,$@,'-d').location do