Parcourir la source

Adding database cleanup unified support

Fixes #2
Zoey76 il y a 6 ans
Parent
commit
ce93d11293

+ 4 - 2
src/main/java/com/l2jserver/cli/dao/AbstractDatabaseDAO.java

@@ -55,8 +55,6 @@ public abstract class AbstractDatabaseDAO extends AbstractDAO {
 		runSQLFiles(sqlPath.listFiles(new SQLFilter()));
 	}
 	
-	public abstract void updates(DatabaseInstallType mode, File sqlPath);
-	
 	protected void updates(DatabaseInstallType mode, String cleanup, File sqlPath) {
 		final var userPreferences = Preferences.userRoot();
 		final var updatePath = new File(sqlPath, "updates");
@@ -98,6 +96,10 @@ public abstract class AbstractDatabaseDAO extends AbstractDAO {
 		}
 	}
 	
+	public void updates(DatabaseInstallType mode, File sqlPath) {
+		updates(mode, "cleanup/cleanup.sql", sqlPath);
+	}
+	
 	private void runSQLFiles(File... sqlFiles) {
 		for (var sqlFile : sqlFiles) {
 			try {

+ 0 - 9
src/main/java/com/l2jserver/cli/dao/GameServerDatabaseDAO.java

@@ -20,10 +20,6 @@ package com.l2jserver.cli.dao;
 
 import static com.l2jserver.cli.config.Configs.gameServer;
 
-import java.io.File;
-
-import com.l2jserver.cli.model.DatabaseInstallType;
-
 /**
  * Game Server Database DAO.
  * @author Zoey76
@@ -33,9 +29,4 @@ public class GameServerDatabaseDAO extends AbstractDatabaseDAO {
 	public GameServerDatabaseDAO() {
 		super(gameServer().db().host(), gameServer().db().port(), gameServer().db().name(), gameServer().db().user(), gameServer().db().password());
 	}
-	
-	@Override
-	public void updates(DatabaseInstallType mode, File sqlPath) {
-		this.updates(mode, "sql/cleanup/gs_cleanup.sql", sqlPath);
-	}
 }

+ 0 - 9
src/main/java/com/l2jserver/cli/dao/LoginServerDatabaseDAO.java

@@ -20,10 +20,6 @@ package com.l2jserver.cli.dao;
 
 import static com.l2jserver.cli.config.Configs.loginServer;
 
-import java.io.File;
-
-import com.l2jserver.cli.model.DatabaseInstallType;
-
 /**
  * Login Server Database DAO.
  * @author Zoey76
@@ -33,9 +29,4 @@ public class LoginServerDatabaseDAO extends AbstractDatabaseDAO {
 	public LoginServerDatabaseDAO() {
 		super(loginServer().db().host(), loginServer().db().port(), loginServer().db().name(), loginServer().db().user(), loginServer().db().password());
 	}
-	
-	@Override
-	public void updates(DatabaseInstallType mode, File sqlPath) {
-		this.updates(mode, "sql/cleanup/ls_cleanup.sql", sqlPath);
-	}
 }