feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds-1.59'

Browse Source 
Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252
This commit is contained in:
Tim Jenssen
2020-06-11 12:34:54 +02:00
parent 8114a58847 ad4c5e0258
commit 3acdb7891b
33 changed files with 456 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/sqlite/createtablesqlstatementbuilder.cpp
View File

@@ -192,6 +192,8 @@ public:
columnDefinitionString.append(defaultValue.value.toStringView());
columnDefinitionString.append("'");
break;
default:
break;
}
}

113
src/libs/sqlite/lastchangedrowid.h
View File

@@ -33,6 +33,7 @@
namespace Sqlite {
template<unsigned int TableCount = 0>
class LastChangedRowId
{
public:
@@ -40,86 +41,82 @@ public:
: database(database)
{
callback = [=](ChangeType, char const *, char const *, long long rowId) {
this->lastRowId = rowId;
};
database.setUpdateHook(callback);
database.setUpdateHook(this, callbackOnlyRowId);
}
LastChangedRowId(DatabaseInterface &database, Utils::SmallStringView databaseName)
: database(database)
, databaseName(databaseName)
{
callback = [=](ChangeType, char const *database, char const *, long long rowId) {
if (databaseName == database)
this->lastRowId = rowId;
};
database.setUpdateHook(callback);
database.setUpdateHook(this, callbackWithDatabase);
}
template<typename... Tables>
LastChangedRowId(DatabaseInterface &database,
Utils::SmallStringView databaseName,
Utils::SmallStringView tableName)
Tables... tableNames)
: database(database)
, databaseName(databaseName)
, tableNames({tableNames...})
{
callback = [=](ChangeType, char const *database, char const *table, long long rowId) {
if (databaseName == database && tableName == table)
this->lastRowId = rowId;
};
database.setUpdateHook(callback);
}
LastChangedRowId(DatabaseInterface &database,
Utils::SmallStringView databaseName,
Utils::SmallStringView tableName,
Utils::SmallStringView tableName2)
: database(database)
{
callback = [=](ChangeType, char const *database, char const *table, long long rowId) {
if (databaseName == database && (tableName == table || tableName2 == table))
this->lastRowId = rowId;
};
database.setUpdateHook(callback);
}
LastChangedRowId(DatabaseInterface &database,
Utils::SmallStringView databaseName,
Utils::SmallStringView tableName,
Utils::SmallStringView tableName2,
Utils::SmallStringView tableName3)
: database(database)
{
callback = [=](ChangeType, char const *database, char const *table, long long rowId) {
if (databaseName == database
&& (tableName == table || tableName2 == table || tableName3 == table))
this->lastRowId = rowId;
};
database.setUpdateHook(callback);
database.setUpdateHook(this, callbackWithTables);
}
~LastChangedRowId() { database.resetUpdateHook(); }
long long takeLastRowId()
void operator()(long long rowId) { lastRowId = rowId; }
static void callbackOnlyRowId(void *object, int, char const *, char const *, long long rowId)
{
long long rowId = lastRowId;
lastRowId = -1;
return rowId;
(*static_cast<LastChangedRowId *>(object))(rowId);
}
bool lastRowIdIsValid() { return lastRowId >= 0; }
bool containsTable(Utils::SmallStringView table)
{
return std::find(tableNames.begin(), tableNames.end(), table) != tableNames.end();
}
void operator()(Utils::SmallStringView database, long long rowId)
{
if (databaseName == database)
lastRowId = rowId;
}
static void callbackWithDatabase(
void *object, int, char const *database, char const *, long long rowId)
{
(*static_cast<LastChangedRowId *>(object))(Utils::SmallStringView{database}, rowId);
}
void operator()(Utils::SmallStringView database, Utils::SmallStringView table, long long rowId)
{
if (databaseName == database && containsTable(table))
lastRowId = rowId;
}
static void callbackWithTables(
void *object, int, char const *database, char const *table, long long rowId)
{
(*static_cast<LastChangedRowId *>(
object))(Utils::SmallStringView{database}, Utils::SmallStringView{table}, rowId);
}
long long takeLastRowId()
{
long long lastId = lastRowId;
lastRowId = -1;
return lastId;
}
bool lastRowIdIsValid() const { return lastRowId >= 0; }
public:
DatabaseInterface &database;
DatabaseInterface::UpdateCallback callback;
long long lastRowId = -1;
Utils::SmallStringView databaseName;
std::array<Utils::SmallStringView, TableCount> tableNames;
};
} // namespace Sqlite

3
src/libs/sqlite/sqlitebasestatement.cpp
View File

@@ -214,6 +214,9 @@ void BaseStatement::bind(int index, const Value &value)
case ValueType::String:
bind(index, value.toStringView());
break;
case ValueType::Null:
bind(index, NullValue{});
break;
}
}

17
src/libs/sqlite/sqlitedatabase.h
View File

@@ -89,7 +89,7 @@ public:
void setOpenMode(OpenMode openMode);
OpenMode openMode() const;
void execute(Utils::SmallStringView sqlStatement);
void execute(Utils::SmallStringView sqlStatement) override;
DatabaseBackend &backend();
@@ -116,15 +116,20 @@ public:
m_databaseBackend.walCheckpointFull();
}
void setUpdateHook(DatabaseBackend::UpdateCallback &callback)
void setUpdateHook(void *object,
void (*callback)(void *object,
int,
char const *database,
char const *,
long long rowId)) override
{
m_databaseBackend.setUpdateHook(callback);
m_databaseBackend.setUpdateHook(object, callback);
}
void resetUpdateHook() { m_databaseBackend.resetUpdateHook(); }
void resetUpdateHook() override { m_databaseBackend.resetUpdateHook(); }
void setAttachedTables(const Utils::SmallStringVector &tables);
void applyAndUpdateSessions();
void setAttachedTables(const Utils::SmallStringVector &tables) override;
void applyAndUpdateSessions() override;
private:
void deferredBegin() override;

19
src/libs/sqlite/sqlitedatabasebackend.cpp
View File

@@ -400,22 +400,11 @@ void DatabaseBackend::walCheckpointFull()
}
}
namespace {
void updateCallback(
void *callback, int type, char const *database, char const *table, sqlite3_int64 row)
void DatabaseBackend::setUpdateHook(
void *object,
void (*callback)(void *object, int, char const *database, char const *, long long rowId))
{
auto &function = *reinterpret_cast<DatabaseBackend::UpdateCallback *>(callback);
function(static_cast<ChangeType>(type), database, table, row);
}
} // namespace
void DatabaseBackend::setUpdateHook(UpdateCallback &callback)
{
if (callback)
sqlite3_update_hook(m_databaseHandle, updateCallback, &callback);
else
sqlite3_update_hook(m_databaseHandle, nullptr, nullptr);
sqlite3_update_hook(m_databaseHandle, callback, object);
}
void DatabaseBackend::resetUpdateHook()

7
src/libs/sqlite/sqlitedatabasebackend.h
View File

@@ -41,9 +41,6 @@ class Database;
class SQLITE_EXPORT DatabaseBackend
{
public:
using UpdateCallback
= std::function<void(ChangeType type, char const *, char const *, long long)>;
DatabaseBackend(Database &database);
~DatabaseBackend();
@@ -88,7 +85,9 @@ public:
void walCheckpointFull();
void setUpdateHook(UpdateCallback &callback);
void setUpdateHook(
void *object,
void (*callback)(void *object, int, char const *database, char const *, long long rowId));
void resetUpdateHook();
protected:

10
src/libs/sqlite/sqlitedatabaseinterface.h
View File

@@ -29,18 +29,16 @@
#include "sqliteglobal.h"
#include <functional>
namespace Sqlite {
class DatabaseInterface
{
public:
using UpdateCallback
= std::function<void(ChangeType type, char const *, char const *, long long)>;
virtual void walCheckpointFull() = 0;
virtual void execute(Utils::SmallStringView sqlStatement) = 0;
virtual void setUpdateHook(UpdateCallback &callback) = 0;
virtual void setUpdateHook(
void *object,
void (*)(void *object, int, char const *database, char const *, long long rowId))
= 0;
virtual void resetUpdateHook() = 0;
virtual void applyAndUpdateSessions() = 0;
virtual void setAttachedTables(const Utils::SmallStringVector &tables) = 0;

4
src/libs/sqlite/sqlitevalue.h
View File

@@ -102,6 +102,8 @@ public:
return QVariant(toFloat());
case ValueType::String:
return QVariant(QString(toStringView()));
case ValueType::Null:
break;
}
return {};
@@ -281,6 +283,8 @@ public:
return first.toFloat() == second.toFloat();
case ValueType::String:
return first.toStringView() == second.toStringView();
case ValueType::Null:
return false;
}
return false;