Cleaning up.

[emufront] / src / db / dbfile.cpp

diff --git a/src/db/dbfile.cpp b/src/db/dbfile.cpp
index d607ca5..7bf64e3 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,42 +42,44 @@ bool DbFile::updateDataObjectToModel(const EmuFrontObject *ob)
 {
     const EmuFrontFile *plf = dynamic_cast<const EmuFrontFile*>(ob);
     bool ret = false;
-    QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
-    tmodel->setFilter(QString("id = %1").arg(plf->getId()));
-    tmodel->select();
-    if (tmodel->rowCount() == 1)
-    {
-        QSqlRecord record = tmodel->record(0);
-        record.setValue("name", plf->getName());
-        record.setValue("type", plf->getType());
-        record.setValue("checksum", plf->getCheckSum());
-        record.setValue("size", plf->getSize());
-        record.setValue("updatetime", getCurrentTimeStamp());
-        tmodel->setRecord(0, record);
-        ret = tmodel->submitAll();
-    }
-    resetModel();
+
+    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();
     return ret;
 }
 
-bool DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
+int DbFile::insertDataObjectToModel(const EmuFrontObject *ob)
 {
-    const EmuFrontFile *plf = dynamic_cast<const EmuFrontFile*>(ob);
-    int row = 0;
-    QSqlTableModel *tmodel = dynamic_cast<QSqlTableModel*>(sqlTableModel);
-    tmodel->insertRows(row, 1);
-    // the null value for index will be set implicitily
-    // when we don't assign any value to cell 0 in the sql table model
-    //sqlTableModel->setData(sqlTableModel->index(row, 0), NULL);
-    tmodel->setData(sqlTableModel->index(row, File_Name), plf->getName());
-    tmodel->setData(sqlTableModel->index(row, File_FileType), plf->getType());
-    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();
+    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 DbFile::insertFile(const EmuFrontFile *mi)
+/*int DbFile::insertFile(const EmuFrontFile *mi)
 {
     qDebug() << "Inserting file " << mi->getName() << " to db.";
     QSqlQuery q;
@@ -94,7 +96,7 @@ int DbFile::insertFile(const EmuFrontFile *mi)
         id = q.lastInsertId().toInt();
    return id;
 
-}
+}*/
 
 int DbFile::countDataObjectRefs(int id) const
 {
@@ -106,8 +108,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 +125,46 @@ 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::constructFilterById(int id) const
+{
+    return QString("file.id = %1").arg(id);
+}
+
+QString DbFile::constructSelectById(int id) const
+{
+    return constructSelect(constructFilterById(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;
 }