pk generator progress and sequence test progress
This commit is contained in:
@@ -10,8 +10,7 @@
|
||||
|
||||
namespace matador::test {
|
||||
SequenceFixture::SequenceFixture()
|
||||
: db(connection::dns)
|
||||
, repo(db.dialect().default_schema_name()) {
|
||||
: db(connection::dns) {
|
||||
REQUIRE(db.open());
|
||||
}
|
||||
|
||||
@@ -20,7 +19,6 @@ SequenceFixture::~SequenceFixture() {
|
||||
drop_sequence_if_exists(sequences_to_drop.top());
|
||||
sequences_to_drop.pop();
|
||||
}
|
||||
REQUIRE(repo.drop(db));
|
||||
REQUIRE(db.close());
|
||||
}
|
||||
|
||||
@@ -37,5 +35,16 @@ void SequenceFixture::check_sequence_not_exists(const std::string& sequence_name
|
||||
}
|
||||
|
||||
void SequenceFixture::drop_sequence_if_exists(const std::string& sequence_name) const {
|
||||
const auto result = db.sequence_exists(sequence_name).and_then([&sequence_name, this](const bool exists) {
|
||||
if (exists) {
|
||||
auto res = query::query::drop()
|
||||
.sequence(sequence_name)
|
||||
.execute(db);
|
||||
REQUIRE(res);
|
||||
this->check_sequence_not_exists(sequence_name);
|
||||
}
|
||||
return utils::ok(true);
|
||||
});
|
||||
REQUIRE(result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user