Plugins::WebBrowser: modify database

Author: KangLin

Plugins/WebBrowser/Bookmark/BookmarkDatabase.cpp

@@ -15,13 +15,16 @@
 
 static Q_LOGGING_CATEGORY(log, "WebBrowser.Bookmark.DB")
 static CBookmarkDatabase* g_pDatabase = nullptr;
-CBookmarkDatabase* CBookmarkDatabase::Instance(const QSqlDatabase &database)
+CBookmarkDatabase* CBookmarkDatabase::Instance(CParameterDatabase *para)
 {
     if(!g_pDatabase) {
         g_pDatabase = new CBookmarkDatabase();
         if(g_pDatabase) {
-            g_pDatabase->SetDatabase(database);
-            g_pDatabase->OnInitializeDatabase();
+            bool bRet = g_pDatabase->OpenDatabase(para, "bookmark_connection");
+            if(!bRet) {
+                delete g_pDatabase;
+                g_pDatabase = nullptr;
+            }
         }
     }
     return g_pDatabase;
@@ -56,9 +59,9 @@ CBookmarkDatabase::~CBookmarkDatabase()
 
 bool CBookmarkDatabase::OnInitializeDatabase()
 {
-    m_UrlDB.SetDatabase(GetDatabase());
+    m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
     m_UrlDB.OnInitializeDatabase();
-    m_TreeDB.SetDatabase(GetDatabase());
+    m_TreeDB.SetDatabase(GetDatabase(), m_pPara);
     m_TreeDB.OnInitializeDatabase();
 
     if(m_TreeDB.GetNodeCount() == 0) {

Plugins/WebBrowser/Bookmark/BookmarkDatabase.h

@@ -63,7 +63,7 @@ class CBookmarkDatabase : public CDatabase
 {
     Q_OBJECT
 public:
-    static CBookmarkDatabase* Instance(const QSqlDatabase& database);
+    static CBookmarkDatabase* Instance(CParameterDatabase *para);
     static CBookmarkDatabase* Instance();
 
     // 书签操作

Plugins/WebBrowser/DatabaseUrl.cpp

@@ -17,7 +17,7 @@ bool CDatabaseUrl::OnInitializeDatabase()
     bool success = false;
     success = CDatabase::OnInitializeDatabase();
     if(!success) return success;
-    m_iconDB.SetDatabase(GetDatabase());
+    m_iconDB.SetDatabase(GetDatabase(), m_pPara);
     success = m_iconDB.OnInitializeDatabase();
     return success;
 }
@@ -309,7 +309,7 @@ bool CDatabaseUrl::OnInitializeSqliteDatabase()
     // 创建历史记录表
     bool success = query.exec(
         "CREATE TABLE IF NOT EXISTS url ("
-        "    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+        "    id INTEGER PRIMARY KEY AUTO_INCREMENT,"
         "    url TEXT UNIQUE NOT NULL,"
         "    title TEXT,"
         "    icon INTEGER DEFAULT 0,"
@@ -347,7 +347,7 @@ bool CDatabaseUrl::OnInitializeMySqlDatabase()
         "    title TEXT,"
         "    icon INTEGER DEFAULT 0,"
         "    visit_time DATETIME DEFAULT CURRENT_TIMESTAMP,"
-        "    INDEX idx_url_url (url)"
+        "    UNIQUE KEY idx_url_url (url(255))"
         ")"
         );
 

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -79,14 +79,6 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     qDebug(log) << Q_FUNC_INFO;
     bool check = false;
 
-    m_pHistoryDatabase = CHistoryDatabase::Instance();
-
-    QString szDbBookmarks = GetProfile()->persistentStoragePath();
-    if(!(szDbBookmarks.right(1) == '/' || szDbBookmarks.right(1) == '\\'))
-        szDbBookmarks += QDir::separator();
-    szDbBookmarks += "Bookmarks.db";
-    m_pBookmarkDatabase = CBookmarkDatabase::Instance(m_pHistoryDatabase->GetDatabase());
-
     setWindowIcon(QIcon::fromTheme("web-browser"));
 
     QVBoxLayout* pLayout = new QVBoxLayout(this);
@@ -812,10 +804,15 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
 int CFrmWebBrowser::Start()
 {
     int nRet = 0;
+
+    m_pHistoryDatabase = CHistoryDatabase::Instance(&m_pPara->m_Database);
+    m_pBookmarkDatabase = CBookmarkDatabase::Instance(&m_pPara->m_Database);
+
     if(m_pTab && m_pTab->count() == 0) {
         // Add new web view
         m_pAddPage->trigger();
     }
+
     return nRet;
 }
 

Plugins/WebBrowser/History/HistoryDatabase.cpp

@@ -73,7 +73,7 @@ bool CHistoryDatabase::OnInitializeDatabase()
     bool success = false;
     success = CDatabase::OnInitializeDatabase();
     if(!success) return false;
-    m_UrlDB.SetDatabase(GetDatabase());
+    m_UrlDB.SetDatabase(GetDatabase(), m_pPara);
     m_UrlDB.OnInitializeDatabase();
     return success;
 }
@@ -796,7 +796,9 @@ bool CHistoryDatabase::OnInitializeMySqlDatabase()
         );
 
     if (!success) {
-        qCritical(log) << "Failed to create table:" << query.lastError().text();
+        qCritical(log) << "Failed to create history table:"
+                       << query.lastError().text()
+                       << "Sql:" << query.executedQuery();
         return false;
     }
 

Src/Database.cpp

@@ -760,7 +760,7 @@ bool CDatabaseFile::OnInitializeMySqlDatabase()
         ")";
     bool success = query.exec(szSql);
     if (!success) {
-        qCritical(log) << "Failed to create file table:"
+        qCritical(log) << "Failed to create" << m_szTableName << "table:"
                        << m_szTableName << query.lastError().text()
                        << "Sql:" << query.executedQuery();
         return false;

Src/Database.h

@@ -12,11 +12,12 @@
 class PLUGIN_EXPORT CDatabase : public QObject
 {
     Q_OBJECT
+
 public:
     explicit CDatabase(QObject *parent = nullptr);
     virtual ~CDatabase();
 
-    void SetDatabase(QSqlDatabase db, CParameterDatabase* pPara = nullptr);
+    void SetDatabase(QSqlDatabase db, CParameterDatabase* pPara);
     QSqlDatabase GetDatabase() const;
 
     /*!