Merge pull request #879 from EmosewaMC/main

Fdb NULL fixes
This commit is contained in:
Gie "Max" Vanommeslaeghe 2022-12-08 13:51:55 +01:00 committed by GitHub
commit 430c6da4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,9 +49,9 @@ bool FdbToSqlite::Convert::ConvertDatabase() {
} }
int32_t FdbToSqlite::Convert::ReadInt32() { int32_t FdbToSqlite::Convert::ReadInt32() {
uint32_t numberOfTables{}; int32_t nextInt{};
BinaryIO::BinaryRead(fdb, numberOfTables); BinaryIO::BinaryRead(fdb, nextInt);
return numberOfTables; return nextInt;
} }
int64_t FdbToSqlite::Convert::ReadInt64() { int64_t FdbToSqlite::Convert::ReadInt64() {
@ -193,7 +193,7 @@ void FdbToSqlite::Convert::ReadRowValues(int32_t& numberOfColumns, std::string&
case eSqliteDataType::NONE: case eSqliteDataType::NONE:
BinaryIO::BinaryRead(fdb, emptyValue); BinaryIO::BinaryRead(fdb, emptyValue);
assert(emptyValue == 0); assert(emptyValue == 0);
insertedRow << "\"\""; insertedRow << "NULL";
break; break;
case eSqliteDataType::INT32: case eSqliteDataType::INT32: