订单流程添加修改
This commit is contained in:
+27
-11
@@ -1,6 +1,8 @@
|
||||
#include "databasemanager.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QSqlError>
|
||||
#include <QThread>
|
||||
|
||||
DatabaseManager &DatabaseManager::instance()
|
||||
{
|
||||
@@ -28,11 +30,12 @@ DbConfig DatabaseManager::config() const
|
||||
|
||||
bool DatabaseManager::open(QString *error)
|
||||
{
|
||||
const QString name = connectionName();
|
||||
QSqlDatabase db;
|
||||
if (QSqlDatabase::contains(m_config.connectionName)) {
|
||||
db = QSqlDatabase::database(m_config.connectionName);
|
||||
if (QSqlDatabase::contains(name)) {
|
||||
db = QSqlDatabase::database(name);
|
||||
} else {
|
||||
db = QSqlDatabase::addDatabase(m_config.driverName, m_config.connectionName);
|
||||
db = QSqlDatabase::addDatabase(m_config.driverName, name);
|
||||
}
|
||||
|
||||
if (db.isOpen()) {
|
||||
@@ -59,35 +62,37 @@ bool DatabaseManager::open(QString *error)
|
||||
|
||||
void DatabaseManager::close()
|
||||
{
|
||||
const QString connectionName = m_config.connectionName;
|
||||
if (!QSqlDatabase::contains(connectionName)) {
|
||||
const QString name = connectionName();
|
||||
if (!QSqlDatabase::contains(name)) {
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
QSqlDatabase db = QSqlDatabase::database(connectionName, false);
|
||||
QSqlDatabase db = QSqlDatabase::database(name, false);
|
||||
if (db.isValid() && db.isOpen()) {
|
||||
db.close();
|
||||
}
|
||||
}
|
||||
|
||||
QSqlDatabase::removeDatabase(connectionName);
|
||||
QSqlDatabase::removeDatabase(name);
|
||||
}
|
||||
|
||||
bool DatabaseManager::isOpen() const
|
||||
{
|
||||
if (!QSqlDatabase::contains(m_config.connectionName)) {
|
||||
const QString name = connectionName();
|
||||
if (!QSqlDatabase::contains(name)) {
|
||||
return false;
|
||||
}
|
||||
return QSqlDatabase::database(m_config.connectionName, false).isOpen();
|
||||
return QSqlDatabase::database(name, false).isOpen();
|
||||
}
|
||||
|
||||
QSqlDatabase DatabaseManager::database() const
|
||||
{
|
||||
if (!QSqlDatabase::contains(m_config.connectionName)) {
|
||||
const QString name = connectionName();
|
||||
if (!QSqlDatabase::contains(name)) {
|
||||
return QSqlDatabase();
|
||||
}
|
||||
return QSqlDatabase::database(m_config.connectionName);
|
||||
return QSqlDatabase::database(name);
|
||||
}
|
||||
|
||||
QString DatabaseManager::lastErrorText() const
|
||||
@@ -136,3 +141,14 @@ bool DatabaseManager::rollback(QString *error)
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
QString DatabaseManager::connectionName() const
|
||||
{
|
||||
if (QThread::currentThread() == QCoreApplication::instance()->thread()) {
|
||||
return m_config.connectionName;
|
||||
}
|
||||
|
||||
return QString("%1_%2")
|
||||
.arg(m_config.connectionName)
|
||||
.arg(reinterpret_cast<quintptr>(QThread::currentThreadId()), 0, 16);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user