aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/db_select.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-04-16 10:12:46 -0400
committerRalph Amissah <ralph@amissah.com>2010-04-16 10:15:13 -0400
commitaa47d1db8596aa65746db05d369441d1def62aa4 (patch)
treec1f1ab145389abd7e30b083f05e6adbcfcfc4dbe /lib/sisu/v2/db_select.rb
parentdb, shared_html_lite, link back to footnote/endnote reference, fix (diff)
db sql table and column structure changes, name prefix "sisu_v2a_" resulting sisu version bump 2.1.0, plus other lesser fixes
[Note: it is necessary to create new database and tables and to populate them] * db (sql) database table name and column structure changes, new pgsql db name prefix "sisu_v2a_" (version bump), continue to review (db_columns, db_create, db_import, db_sqltxt) * db remove and update fix, match filename for removal with = (not LIKE or ~) * db sqlite, issue with --recreate, bugfix (db_drop)
Diffstat (limited to 'lib/sisu/v2/db_select.rb')
-rw-r--r--lib/sisu/v2/db_select.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/sisu/v2/db_select.rb b/lib/sisu/v2/db_select.rb
index 33441b45..1ac9195f 100644
--- a/lib/sisu/v2/db_select.rb
+++ b/lib/sisu/v2/db_select.rb
@@ -69,6 +69,8 @@ module SiSU_DB_select
if @opt.mod.inspect =~/update|import/
@sdb_import=SiSU_DB_DBI::Import.new(@opt,@conn,@file,@sql_type)
@sdb_remove_doc=SiSU_DB_DBI::Remove.new(@opt,@conn,@file)
+ elsif @opt.mod.inspect =~/remove/
+ @sdb_remove_doc=SiSU_DB_DBI::Remove.new(@opt,@conn,@file)
end
end
def sql_maintenance_file
@@ -98,8 +100,8 @@ module SiSU_DB_select
when /^--(?:init(?:ialize)?|create(?:all)?)$/
@sdb.output_dir?
begin
- @sdb.create_table.metadata
- @sdb.create_table.documents
+ @sdb.create_table.metadata_and_text
+ @sdb.create_table.doc_objects
@sdb.create_table.endnotes
@sdb.create_table.endnotes_asterisk
@sdb.create_table.endnotes_plus
@@ -110,8 +112,8 @@ module SiSU_DB_select
when /^--createtable(s)?$/
@sdb.output_dir?
begin
- @sdb.create_table.metadata
- @sdb.create_table.documents
+ @sdb.create_table.metadata_and_text
+ @sdb.create_table.doc_objects
@sdb.create_table.endnotes
@sdb.create_table.endnotes_asterisk
@sdb.create_table.endnotes_plus
@@ -123,8 +125,8 @@ module SiSU_DB_select
@sdb.output_dir?
begin
@sdb_no.drop.tables
- @sdb.create_table.metadata
- @sdb.create_table.documents
+ @sdb.create_table.metadata_and_text
+ @sdb.create_table.doc_objects
@sdb.create_table.endnotes
@sdb.create_table.endnotes_asterisk
@sdb.create_table.endnotes_plus
@@ -135,13 +137,13 @@ module SiSU_DB_select
when /^--cr(eate)?lex$/
@sdb.output_dir?
begin
- @sdb.create_table.documents
+ @sdb.create_table.doc_objects
rescue; @sdb.output_dir?
end
when /^--cr(eate)?metadata$/
@sdb.output_dir?
begin
- @sdb.create_table.metadata
+ @sdb.create_table.metadata_and_text
rescue; @sdb.output_dir?
end
when /^--import$/