Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PERSISTENCE: added some real checks, not just test the execution 

we now ensure that the meta data in the database is the same as the model we created last
master
Martin Gerhardy 2017-11-24 07:33:26 +01:00
parent 11ce962f67
commit bd6ec68682
4 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/persistence/tests/DatabaseSchemaUpdateTest.cpp
View File

@ -16,6 +16,41 @@ private:
protected:
bool _supported = true;
persistence::DBHandler _dbHandler;
bool isDifferent(const db::MetainfoModel& schemaColumn, const Field& field) const {
if ((uint32_t)schemaColumn.constraintmask() != field.contraintMask) {
return true;
}
if (schemaColumn.columndefault() != field.defaultVal) {
return true;
}
if (toFieldType(schemaColumn.datatype()) != field.type) {
return true;
}
if (schemaColumn.maximumlength() != field.length) {
return true;
}
return false;
}
void checkIsCurrent(Model&& model) const {
std::vector<db::MetainfoModel> schemaModels;
schemaModels.reserve(model.fields().size() * 2);
const db::DBConditionMetainfoModelSchemaname c1(model.schema());
const db::DBConditionMetainfoModelTablename c2(model.tableName());
const DBConditionMultiple condition(true, { &c1, &c2 });
_dbHandler.select(db::MetainfoModel(), condition, [&] (db::MetainfoModel&& model) {
schemaModels.emplace_back(std::move(model));
});
std::unordered_map<std::string, const db::MetainfoModel*> map;
map.reserve(schemaModels.size());
for (const auto& c : schemaModels) {
map.insert(std::make_pair(c.columnname(), &c));
const Field& f = model.getField(c.columnname());
ASSERT_FALSE(isDifferent(c, f)) << "Field " << f.name << " differs with db meta info";
}
}
public:
void SetUp() override {
Super::SetUp();
@ -38,7 +73,9 @@ TEST_F(DatabaseSchemaUpdateTest, testAddNewColumns) {
return;
}
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate2Model()));
checkIsCurrent(db::TestUpdate2Model());
}
TEST_F(DatabaseSchemaUpdateTest, testRemoveColumns) {
@ -46,7 +83,9 @@ TEST_F(DatabaseSchemaUpdateTest, testRemoveColumns) {
return;
}
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate2Model()));
checkIsCurrent(db::TestUpdate2Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
}
TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveMultipleStuffColumns) {
@ -54,8 +93,11 @@ TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveMultipleStuffColumns) {
return;
}
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate3Model()));
checkIsCurrent(db::TestUpdate3Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
}
TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveSingleStepsColumns) {
@ -63,9 +105,13 @@ TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveSingleStepsColumns) {
return;
}
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate2Model()));
checkIsCurrent(db::TestUpdate2Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate3Model()));
checkIsCurrent(db::TestUpdate3Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
}
TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveSingleStepsReversedColumns) {
@ -73,9 +119,17 @@ TEST_F(DatabaseSchemaUpdateTest, testAddAndRemoveSingleStepsReversedColumns) {
return;
}
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate3Model()));
checkIsCurrent(db::TestUpdate3Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate2Model()));
checkIsCurrent(db::TestUpdate2Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate1Model()));
checkIsCurrent(db::TestUpdate1Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate3Model()));
checkIsCurrent(db::TestUpdate3Model());
ASSERT_TRUE(_dbHandler.createOrUpdateTable(db::TestUpdate4Model()));
checkIsCurrent(db::TestUpdate4Model());
}
}

2
src/modules/persistence/tests/SQLGeneratorTest.cpp
View File

@ -31,7 +31,7 @@ TEST_F(SQLGeneratorTest, testTruncate) {
}
TEST_F(SQLGeneratorTest, testCreateWithoutMeta) {
ASSERT_EQ(R"(CREATE TABLE IF NOT EXISTS "public"."testupdate" ("id" BIGINT PRIMARY KEY);)",
ASSERT_EQ(R"(CREATE SCHEMA IF NOT EXISTS "public";CREATE TABLE IF NOT EXISTS "public"."testupdate" ("id" BIGINT PRIMARY KEY);)",
createCreateTableStatement(db::TestUpdate1Model(), false));
}

27
src/modules/persistence/tests/tests.tbl
View File

@ -93,3 +93,30 @@ table testupdate {
(name, email) unique
}
}
# Changes datatype, maxlength and added a key/index
table testupdate {
namespace persistence
classname "TestUpdate4Model"
field id {
type int
operator set
}
field email {
type string
notnull
operator set
}
field name {
type string
length 16
operator set
}
constraints {
id autoincrement 1000000
id primarykey
name index
email unique // TODO: doesn't get added
(name, email) unique
}
}

2
src/tools/databasetool/README.md
View File

@ -46,7 +46,7 @@ table <TABLENAME> {
}
constraints {
<FIELDNAME> unique
<FIELDNAME> key
<FIELDNAME> index
<FIELDNAME> primarykey
<FIELDNAME2> primarykey
<FIELDNAME> autoincrement