opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

#8 Beta database schema cleanup fix

Browse Source
This commit is contained in:
serge-rider
2020-05-01 21:07:31 +03:00
parent 94fedcb2da
commit 44ccbcf044
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBDatabase.java
+14 -6
View File
@@ -56,7 +56,7 @@ public class CBDatabase {
private static final Log log = Log.getLog(CBDatabase.class);
public static final String SCHEMA_CREATE_SQL_PATH = "db/cb-schema-create.sql";
private static final String CURRENT_SCHEMA_VERSION = "1.beta";
private static final String CURRENT_SCHEMA_VERSION = "2.beta";
private final CBApplication application;
private final CBDatabaseConfig databaseConfiguration;
@@ -159,7 +159,11 @@ public class CBDatabase {
}
private void createDatabaseSchema(Connection connection, boolean create) throws DBException {
log.debug("Create database schema");
if (create) {
log.debug("Create database schema");
} else {
log.debug("Cleanup old database schema");
}
InputStream ddlStream = getClass().getClassLoader().getResourceAsStream(SCHEMA_CREATE_SQL_PATH);
if (ddlStream == null) {
throw new DBException("Can't find schema file " + SCHEMA_CREATE_SQL_PATH);
@@ -171,7 +175,7 @@ public class CBDatabase {
ByteArrayOutputStream ddlBuffer = new ByteArrayOutputStream();
IOUtils.copyStream(ddlStream, ddlBuffer);
String ddl = new String(ddlBuffer.toByteArray(), StandardCharsets.UTF_8);
List<String> extraQueries = new ArrayList<>();
List<String> dropQueries = new ArrayList<>();
for (String line : ddl.split(";")) {
line = line.trim();
if (line.isEmpty()) {
@@ -180,7 +184,7 @@ public class CBDatabase {
if (!create) {
Matcher matcher = ctPattern.matcher(line);
if (matcher.find()) {
extraQueries.add("DROP TABLE " + matcher.group(1));
dropQueries.add("DROP TABLE " + matcher.group(1));
}
continue;
}
@@ -188,11 +192,15 @@ public class CBDatabase {
dbStat.execute(line);
}
}
if (!extraQueries.isEmpty()) {
for (String query : extraQueries) {
if (!dropQueries.isEmpty()) {
for (String query : dropQueries) {
try (Statement dbStat = connection.createStatement()) {
dbStat.execute(query);
}
catch (SQLException e) {
// Ignore error
log.debug(e.getMessage());
}
}
}
if (create) {