DbFile is now a DbQueryModelManager instead of DbTableModelManager.

diff --git a/doc/uml-db_layer.dia b/doc/uml-db_layer.dia
index e97b0fe..a37397d 100644 (file)
Binary files a/doc/uml-db_layer.dia and b/doc/uml-db_layer.dia differ

diff --git a/src/dataobjects/mediaimage.h b/src/dataobjects/mediaimage.h
index 712958f..d84027a 100644 (file)
--- a/src/dataobjects/mediaimage.h
+++ b/src/dataobjects/mediaimage.h
@@ -22,6 +22,7 @@
 
 #include "emufrontfileobject.h"
 
+/* MediaImage is a EmuFrontFile of type  FileType_MediaImage */
 class MediaImage : public EmuFrontFile
 {
 public:

diff --git a/src/db/dbfile.cpp b/src/db/dbfile.cpp
index d607ca5..b0079f6 100644 (file)
--- a/src/db/dbfile.cpp
+++ b/src/db/dbfile.cpp
@@ -20,10 +20,10 @@
 #include <QDebug>
 #include <QSqlRecord>
 #include <QSqlQuery>
-#include <QSqlTableModel>
+#include <QSqlRelationalTableModel>
 #include "dbfile.h"
 
-DbFile::DbFile(QObject *parent) : DbTableModelManager(parent)
+DbFile::DbFile(QObject *parent) : DbQueryModelManager(parent)
 {
     type = -1;
 }
@@ -42,7 +42,24 @@ bool DbFile::updateDataObjectToModel(const EmuFrontObject *ob)
 {
     const EmuFrontFile *plf = dynamic_cast<const EmuFrontFile*>(ob);
     bool ret = false;
-    QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
+
+    QSqlQuery query;
+    query.prepare(QString("UPDATE file SET"
+                          "name=:name, "
+                          "type=:type, "
+                          "checksum=:checksum, "
+                          "size=:size, "
+                          "updatetime:=updatetime "
+                          "WHERE id=:id"));
+    query.bindValue(":name", plf->getName());
+    query.bindValue(":type", plf->getType());
+    query.bindValue(":checksum", plf->getCheckSum());
+    query.bindValue(":size", plf->getSize());
+    query.bindValue(":updatetime", getCurrentTimeStamp());
+    ret = query.exec();
+    if (ret) resetModel();
+
+    /*QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
     tmodel->setFilter(QString("id = %1").arg(plf->getId()));
     tmodel->select();
     if (tmodel->rowCount() == 1)
@@ -56,14 +73,28 @@ bool DbFile::updateDataObjectToModel(const EmuFrontObject *ob)
         tmodel->setRecord(0, record);
         ret = tmodel->submitAll();
     }
-    resetModel();
+    resetModel();*/
     return ret;
 }
 
 bool DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
 {
-    const EmuFrontFile *plf = dynamic_cast<const EmuFrontFile*>(ob);
-    int row = 0;
+    const EmuFrontFile *fi = dynamic_cast<const EmuFrontFile*>(ob);
+    QSqlQuery q;
+    q.prepare("INSERT INTO file "
+              "(id, name, type, checksum, size, updatetime) "
+              "VALUES (NULL, :name, :type, :checksum, :size, :updatetime)");
+    q.bindValue(":name", fi->getName());
+    q.bindValue(":type", fi->getType());
+    q.bindValue(":checksum", fi->getCheckSum());
+    q.bindValue(":size", fi->getSize());
+    q.bindValue(":updatetime", DatabaseManager::getCurrentTimeStamp());
+    int id = -1;
+    if (q.exec())
+        id = q.lastInsertId().toInt();
+    return id;
+
+    /*int row = 0;
     QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
     tmodel->insertRows(row, 1);
     // the null value for index will be set implicitily
@@ -74,10 +105,10 @@ bool DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
     tmodel->setData(sqlTableModel->index(row, File_CheckSum), plf->getCheckSum());
     tmodel->setData(sqlTableModel->index(row, File_FileSize), plf->getSize());
     tmodel->setData(sqlTableModel->index(row, File_UpdateTime), getCurrentTimeStamp());
-    return tmodel->submitAll();
+    return tmodel->submitAll();*/
 }
 
-int DbFile::insertFile(const EmuFrontFile *mi)
+/*int DbFile::insertFile(const EmuFrontFile *mi)
 {
     qDebug() << "Inserting file " << mi->getName() << " to db.";
     QSqlQuery q;
@@ -94,7 +125,7 @@ int DbFile::insertFile(const EmuFrontFile *mi)
         id = q.lastInsertId().toInt();
    return id;
 
-}
+}*/
 
 int DbFile::countDataObjectRefs(int id) const
 {
@@ -106,8 +137,10 @@ int DbFile::countDataObjectRefs(int id) const
 // the delete must be confirmed in the UI
 bool DbFile::deleteDataObjectFromModel(QModelIndex *index)
 {
+    return false;
+
     /*QSqlDatabase::database().transaction();*/
-    QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
+    //QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
     /*QSqlRecord record = tmodel->record(index->row());
     int id = record.value(File_Id).toInt();
     int count = countDataObjectRefs(id);
@@ -121,23 +154,41 @@ bool DbFile::deleteDataObjectFromModel(QModelIndex *index)
             return false;
         }
     }*/
-    tmodel->removeRow(index->row());
-    tmodel->submitAll();
-    return QSqlDatabase::database().commit();
+    //tmodel->removeRow(index->row());
+    //tmodel->submitAll();
+    //return QSqlDatabase::database().commit();
+}
+
+QString DbFile::constructSelect(QString whereClause) const
+{
+    QString where = whereClause.isEmpty()
+                    ? "" : QString("WHERE ").append(whereClause);
+
+    return QString("SELECT file.id AS FileId, "
+                   "file.name AS Name, "
+                   "file.type AS FileType, "
+                   "file.checksum AS Checksum, "
+                   "file.size AS FileSize, "
+                   "file.updatetime AS UpdateTime "
+                   "FROM file "
+                   "%1 "
+                   "ORDER BY Name").arg(where);
+}
+
+QString DbFile::constructSelectById(int id) const
+{
+    return constructSelect(QString("file.id = %1").arg(id));
 }
 
 QSqlQueryModel* DbFile::getData()
 {
-    QSqlTableModel *model = new QSqlTableModel(this);
-    model->setTable(DB_TABLE_NAME_FILE);
-    model->setSort(File_Name, Qt::AscendingOrder);
+    QSqlQueryModel *model = new QSqlQueryModel(this);
+    model->setQuery(constructSelect());
     model->setHeaderData(File_Name, Qt::Horizontal, tr("Name"));
     model->setHeaderData(File_FileType, Qt::Horizontal, tr("Type"));
     model->setHeaderData(File_CheckSum, Qt::Horizontal, tr("Checksum"));
     model->setHeaderData(File_FileSize, Qt::Horizontal, tr("Size"));
     model->setHeaderData(File_UpdateTime, Qt::Horizontal, tr("Updated"));
-    if (type >= 0) model->setFilter(QString("type=%1").arg(type));
-    model->select();
     return model;
 }
 

diff --git a/src/db/dbfile.h b/src/db/dbfile.h
index 488e7b1..32276f2 100644 (file)
--- a/src/db/dbfile.h
+++ b/src/db/dbfile.h
@@ -20,10 +20,10 @@
 #ifndef DBFILE_H
 #define DBFILE_H
 
-#include "dbtablemodelmanager.h"
+#include "dbquerymodelmanager.h"
 #include "../dataobjects/emufrontfile.h"
 
-class DbFile : public DbTableModelManager
+class DbFile : public DbQueryModelManager
 {
 public:
     DbFile(QObject*);
@@ -44,6 +44,8 @@ public:
 
 protected:
     virtual EmuFrontObject* recordToDataObject(const QSqlRecord*);
+    virtual QString constructSelectById(int id) const;
+    virtual QString constructSelect(QString whereClause = "") const;
     int type;
 
 private:

diff --git a/src/db/dbmediaimage.cpp b/src/db/dbmediaimage.cpp
index a56620c..a7e3c35 100644 (file)
--- a/src/db/dbmediaimage.cpp
+++ b/src/db/dbmediaimage.cpp
@@ -79,7 +79,7 @@ QSqlQueryModel* DbMediaImage::getData()
 
 int DbMediaImage::insertMediaImage(const MediaImage *mi)
 {
-    return DbFile::insertFile(mi);
+    return DbFile::insertDataObjectToModel(mi);
 }
 
 QList<int> DbMediaImage::storeMediaImages(QList<MediaImage *> images)

diff --git a/src/db/dbmediaimage.h b/src/db/dbmediaimage.h
index f17abfd..6d54c51 100644 (file)
--- a/src/db/dbmediaimage.h
+++ b/src/db/dbmediaimage.h
@@ -23,6 +23,7 @@
 #include "dbfile.h"
 #include "../dataobjects/mediaimage.h"
 
+/* TODO: I suppose this class is not even needed anymore! */
 class DbMediaImage : public DbFile
 {
 public: