Skip to content

Commit

Permalink
Add updating from h2 version 198 and also set tables to be in sql mode
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondDagger590 committed Jan 17, 2022
1 parent 328f30f commit aff7cb8
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.gradle.kts
Expand Up @@ -8,7 +8,7 @@ plugins {
}

//RECODE.RELEASE.PATCH.DEVELOPMENT
version = "1.1.0.6"
version = "1.1.0.7"
group = "com.cyr1en"

buildscript {
Expand Down Expand Up @@ -62,9 +62,9 @@ tasks {
publishing {
publications {
create<MavenPublication>("maven") {
groupId = "com.cry1en"
groupId = "com.cyr1en"
artifactId = "flatdb"
version = "1.1.0.6"
version = "1.1.0.7"

from(components.getByName("java"))
}
Expand Down
20 changes: 19 additions & 1 deletion src/main/java/com/cyr1en/flatdb/DatabaseBuilder.java
Expand Up @@ -29,12 +29,14 @@
import com.cyr1en.flatdb.types.TypeMap;
import com.cyr1en.flatdb.util.FastStrings;
import lombok.Getter;
import org.h2.tools.Upgrade;

import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand All @@ -44,15 +46,17 @@ public class DatabaseBuilder {
@Getter private String driverName;
@Getter private String databasePrefix;
@Getter private List<Class> tables;
@Getter private boolean upgrade;

private String connectionURL;

public DatabaseBuilder() {
path = "";
driverName = "";
connectionURL = "jdbc:%s:%s";
connectionURL = "jdbc:%s:%s;mode=MySQL";
databasePrefix = "flatdb_";
tables = new ArrayList<>();
upgrade = false;
tryDefaultDrivers();
}

Expand Down Expand Up @@ -88,6 +92,11 @@ public DatabaseBuilder addCustomType(Class<?> javaClass, SQLTypePair sqlTypePair
return this;
}

public DatabaseBuilder setUpgradeVersion(boolean upgrade){
this.upgrade = upgrade;
return this;
}

private void tryDriverName(String driverName) {
try {
Class.forName(driverName).newInstance();
Expand All @@ -104,6 +113,15 @@ public String getConnectionURL() {
public Database build() throws SQLException {
if(FastStrings.isBlank(driverName)) throw new SQLException("The driver name was left empty!");
connectionURL = getConnectionURL();

if(upgrade){
try{
Upgrade.upgrade(connectionURL, new Properties(), 198);
}catch(Exception e){
e.printStackTrace();
}
}

return new FlatDatabase(this);
}
}
1 change: 1 addition & 0 deletions src/main/java/com/cyr1en/flatdb/FlatDatabase.java
Expand Up @@ -25,6 +25,7 @@
package com.cyr1en.flatdb;

import lombok.Getter;
import org.h2.tools.Upgrade;
import org.intellij.lang.annotations.Language;

import java.sql.*;
Expand Down

0 comments on commit aff7cb8

Please sign in to comment.