More renaming and database cleanup

Rename:
* drop table pics_mappings
* rename pics_mappings2 to pics_mappings (no column renames)

Cleanup:
* drop tables and sequences: pics_attributes*
* drop tables and sequences: pics_actors*
* drop tables and sequences: pics_themes*

Still works!

2 files changed, 5 insertions, 5 deletions

diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index c0bf76e..6c1d1fc 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -40,7 +40,7 @@ void NewPicsDialog::setupDlg(){
     mAddFileQ = new QSqlQuery(mDb);
     mAddFileQ->prepare("INSERT INTO pics (tfilename, cmd5sum, isize, tformat) VALUES(:fn, :md5, :size, :format)");
     mAddMappingQ = new QSqlQuery(mDb);
-    mAddMappingQ->prepare("INSERT INTO pics_mappings2 (ipics_id, imappings_parents_id) VALUES(:picid, :mapid)");
+    mAddMappingQ->prepare("INSERT INTO pics_mappings(ipics_id, imappings_parents_id) VALUES(:picid, :mapid)");
 
     //files widget
     mFilesWidget = new QWidget;
diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index e7768d6..4114eb5 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -21,14 +21,14 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr
 
     //setup database
     mDb = QSqlDatabase::database("treedb");
-    mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum FROM pics, pics_mappings2 WHERE pics_mappings2.imappings_parents_id IN (%1) AND pics_mappings2.ipics_id = pics.ipicsid ORDER BY pics.tfilename");
-    mMappingsQS = QString("SELECT DISTINCT(pics_mappings2.imappings_parents_id) FROM pics_mappings2, pics WHERE pics_mappings2.ipics_id IN (%1)");
+    mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum FROM pics, pics_mappings WHERE pics_mappings.imappings_parents_id IN (%1) AND pics_mappings.ipics_id = pics.ipicsid ORDER BY pics.tfilename");
+    mMappingsQS = QString("SELECT DISTINCT(pics_mappings.imappings_parents_id) FROM pics_mappings, pics WHERE pics_mappings.ipics_id IN (%1)");
     mDeleteFileQ = new QSqlQuery(mDb);
     mDeleteFileQ->prepare("DELETE FROM pics WHERE ipicsid = :id");
     mDeleteMappingsQ = new QSqlQuery(mDb);
-    mDeleteMappingsQ->prepare("DELETE FROM pics_mappings2 WHERE ipics_id = :id");
+    mDeleteMappingsQ->prepare("DELETE FROM pics_mappings WHERE ipics_id = :id");
     mAddMappingsQ = new QSqlQuery(mDb);
-    mAddMappingsQ->prepare("INSERT INTO pics_mappings2(ipics_id, imappings_parents_id) VALUES(:pid, :id)");
+    mAddMappingsQ->prepare("INSERT INTO pics_mappings(ipics_id, imappings_parents_id) VALUES(:pid, :id)");
 
 }