Modify CDatabase

Author: KangLin

Src/Database/Database.cpp

@@ -97,9 +97,17 @@ bool CDatabase::OpenDatabase(const CParameterDatabase *pPara,
 bool CDatabase::OpenSQLiteDatabase(const CParameterDatabase *pPara,
                                    const QString &szConnectionName)
 {
-    QString databasePath;
-    if(pPara)
-        databasePath = pPara->GetDatabaseName();
+    QString szFile;
+    if(pPara) {
+        szFile = pPara->GetDatabaseName();
+    }
+    return OpenSQLiteDatabase(szFile, szConnectionName);
+}
+
+bool CDatabase::OpenSQLiteDatabase(
+    const QString& szFile, const QString& szConnectionName)
+{
+    QString databasePath = szFile;
     if (databasePath.isEmpty()) {
         // 使用默认路径
         QString dataDir = RabbitCommon::CDir::Instance()->GetDirUserDatabase();
@@ -355,6 +363,16 @@ bool CDatabase::ImportFromJsonFile(const QString &szFile)
     return bRet;
 }
 
+bool CDatabase::ImportFromJson(const QJsonObject &obj)
+{
+    return true;
+}
+
+bool CDatabase::ExportToJson(QJsonObject &obj)
+{
+    return true;
+}
+
 CDatabaseIcon::CDatabaseIcon(QObject *parent)
     : CDatabase(parent)
 {

Src/Database/Database.h

@@ -39,14 +39,21 @@ class PLUGIN_EXPORT CDatabase : public QObject
      *        - true: successfully
      *        - false: failed
      */
-    [[nodiscard]] virtual bool OpenDatabase(const CParameterDatabase* pPara = nullptr,
-                              const QString& szConnectName = QString());
-    [[nodiscard]] virtual bool OpenMySqlDatabase(const CParameterDatabase* pPara,
-                                   const QString& szConnectName = QString());
-    [[nodiscard]] virtual bool OpenODBCDatabase(const CParameterDatabase* pPara,
-                                  const QString& szConnectName = QString());
-    [[nodiscard]] virtual bool OpenSQLiteDatabase(const CParameterDatabase* pPara = nullptr,
-                                    const QString &szConnectionName = QString());
+    [[nodiscard]] virtual bool OpenDatabase(
+        const CParameterDatabase* pPara = nullptr,
+        const QString& szConnectName = QString());
+    [[nodiscard]] virtual bool OpenMySqlDatabase(
+        const CParameterDatabase* pPara,
+        const QString& szConnectName = QString());
+    [[nodiscard]] virtual bool OpenODBCDatabase(
+        const CParameterDatabase* pPara,
+        const QString& szConnectName = QString());
+    [[nodiscard]] virtual bool OpenSQLiteDatabase(
+        const CParameterDatabase* pPara,
+        const QString &szConnectionName = QString());
+    [[nodiscard]] virtual bool OpenSQLiteDatabase(
+        const QString& szFile,
+        const QString& szConnectionName = QString());
     [[nodiscard]] virtual bool IsOpen() const;
     virtual void CloseDatabase();
 
@@ -60,8 +67,8 @@ class PLUGIN_EXPORT CDatabase : public QObject
 
     [[nodiscard]] virtual bool ExportToJsonFile(const QString& szFile);
     [[nodiscard]] virtual bool ImportFromJsonFile(const QString& szFile);
-    [[nodiscard]] virtual bool ExportToJson(QJsonObject& obj) = 0;
-    [[nodiscard]] virtual bool ImportFromJson(const QJsonObject& obj) = 0;
+    [[nodiscard]] virtual bool ExportToJson(QJsonObject& obj);
+    [[nodiscard]] virtual bool ImportFromJson(const QJsonObject& obj);
 
 Q_SIGNALS:
     void sigChanged();