More renaming: mappings_parents

Rename:
* drop table mappings_parents
* rename mappings_parents2 to mapping_parents
* drop the s after mapping on column names
* rename FK imapping_id to idescription_id
* rename ParentId(Role) to MappingParentId(Role)

Well, it still works (tm) :)

3 files changed, 10 insertions, 10 deletions

diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp
index b42bad3..ddfd5e2 100644
--- a/mappingtreemodel.cpp
+++ b/mappingtreemodel.cpp
@@ -20,7 +20,7 @@ MappingTreeModel::MappingTreeModel(QStringList &headers, QObject *parent) : SmTr
     getMappingTypes();
 
     //prepare Queries
-    mSParentsQ = "SELECT mappings_parents2.imappings_parents_id, mappings_parents2.imapping_id, mapping_description.tdescription_name, mapping_description.tscreated, mappings_parents2.iparent_id FROM mappings_parents2, mapping_description WHERE  mappings_parents2.iparent_id = :pid AND mapping_description.idescription_type = :type AND mappings_parents2.imapping_id = mapping_description.idescription_id ORDER BY mapping_description.tdescription_name";
+    mSParentsQ = "SELECT mapping_parents.imapping_parents_id, mapping_parents.idescription_id, mapping_description.tdescription_name, mapping_description.tscreated, mapping_parents.iparent_id FROM mapping_parents, mapping_description WHERE  mapping_parents.iparent_id = :pid AND mapping_description.idescription_type = :type AND mapping_parents.idescription_id = mapping_description.idescription_id ORDER BY mapping_description.tdescription_name";
     mUpdateTypeQ = new QSqlQuery(mDb);
     mUpdateTypeQ->prepare("UPDATE mappings_type SET tmappings_type_name = :value WHERE imappings_type_id = :id");
     mUpdateChildQ = new QSqlQuery(mDb);
@@ -34,11 +34,11 @@ MappingTreeModel::MappingTreeModel(QStringList &headers, QObject *parent) : SmTr
     mSelectDescriptionQ = new QSqlQuery(mDb);
     mSelectDescriptionQ->prepare("SELECT idescription_id, tdescription_name, tscreated FROM mapping_description WHERE tdescription_name = :name AND idescription_type = :type");
     mAddParentQ = new QSqlQuery(mDb);
-    mAddParentQ->prepare("INSERT INTO mappings_parents2 (imapping_id, iparent_id) VALUES(:id, :parentid)");
+    mAddParentQ->prepare("INSERT INTO mapping_parents (idescription_id, iparent_id) VALUES(:id, :parentid)");
     mUpdateParentQ = new QSqlQuery(mDb);
-    mUpdateParentQ->prepare("UPDATE mappings_parents2 SET iparent_id = :id where imappings_parents_id = :sid");
+    mUpdateParentQ->prepare("UPDATE mapping_parents SET iparent_id = :id where imapping_parents_id = :sid");
     mDeleteMappingParentQ = new QSqlQuery(mDb);
-    mDeleteMappingParentQ->prepare("DELETE FROM mappings_parents2 WHERE imappings_parents_id = :id");
+    mDeleteMappingParentQ->prepare("DELETE FROM mapping_parents WHERE imapping_parents_id = :id");
     mDescriptionQ = new QSqlQuery(mDb);
     mDescriptionQ->prepare("SELECT tdescription_name, idescription_id FROM mapping_description WHERE idescription_type = :type");
 }
@@ -123,8 +123,8 @@ QVariant MappingTreeModel::data(const QModelIndex &index, int role) const{
     if(role == DescIdRole){
         return item->data(DescId);
     }
-    if(role == ParentIdRole){
-        return item->data(ParentId);
+    if(role == MappingParentIdRole){
+        return item->data(MappingParentId);
     }
     return SmTreeModel::data(index, role);
 }
@@ -310,7 +310,7 @@ MappingData MappingTreeModel::mappingDataFromIndex(QModelIndex &idx) const{
         return retval;
     }
     retval.mappingId = idx.data(MappingTreeModel::MappingIdRole).toInt();
-    retval.parentId = idx.data(MappingTreeModel::ParentIdRole).toInt();
+    retval.parentId = idx.data(MappingTreeModel::MappingParentIdRole).toInt();
     retval.myId = idx.data(MappingTreeModel::DescIdRole).toInt();
     retval.name = idx.data(MappingTreeModel::NameRole).toString();
     retval.path << path(idx);
diff --git a/mappingtreemodel.h b/mappingtreemodel.h
index cc8b3ab..ad4ff85 100644
--- a/mappingtreemodel.h
+++ b/mappingtreemodel.h
@@ -21,8 +21,8 @@ class SmTreeItem;
 class MappingTreeModel : public SmTreeModel {
     Q_OBJECT
     public:
-        enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, DescAddedRole = Qt::UserRole + 3, DescIdRole = Qt::UserRole + 4, ParentIdRole = Qt::UserRole + 5 };
-        enum Fields { Name = 0, MappingId = 1, DescAdded = 2, DescId = 3, ParentId = 4 };
+        enum Roles { NameRole = Qt::UserRole + 1, MappingIdRole = Qt::UserRole + 2, DescAddedRole = Qt::UserRole + 3, DescIdRole = Qt::UserRole + 4, MappingParentIdRole = Qt::UserRole + 5 };
+        enum Fields { Name = 0, MappingId = 1, DescAdded = 2, DescId = 3, MappingParentId = 4 };
         enum { NumFields = 5 };
         MappingTreeModel(QStringList &headers, QObject *parent = 0);
         ~MappingTreeModel();
diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index ae73258..e7768d6 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -174,7 +174,7 @@ QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds)
         MappingData curData;
         //curData.id = curIdx.data(MappingTreeModel::MyIdRole).toInt();
         curData.mappingId = curIdx.data(MappingTreeModel::MappingIdRole).toInt();
-        curData.parentId = curIdx.data(MappingTreeModel::ParentIdRole).toInt();
+        curData.parentId = curIdx.data(MappingTreeModel::MappingParentIdRole).toInt();
         curData.name = curIdx.data(MappingTreeModel::NameRole).toString();
         curData.path << mMappingTreeModel->path(curIdx); //.join("/");
         retval << curData;