Improve tables exists check

caoli5288 · Apr 6, 2016 · 63bf755 · 63bf755
1 parent 30f6319
commit 63bf755
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.mengcraft</groupId>
     <artifactId>simpleorm</artifactId>
-    <version>0.2</version>
+    <version>0.2.1</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/com/mengcraft/simpleorm/EbeanHandler.java b/src/main/java/com/mengcraft/simpleorm/EbeanHandler.java
@@ -86,8 +86,8 @@ public void uninstall() {
             throw new RuntimeException("Not initialized!");
         }
         try {
-            SpiEbeanServer serv = (SpiEbeanServer) server;
-            DdlGenerator gen = serv.getDdlGenerator();
+            SpiEbeanServer spi = SpiEbeanServer.class.cast(server);
+            DdlGenerator gen = spi.getDdlGenerator();
             gen.runScript(true, gen.generateDropDdl());
         } catch (Exception e) {
             proxy.getLogger().info(e.getMessage());
@@ -105,15 +105,15 @@ public void install(boolean ignore) {
         }
         try {
             for (Class<?> line : list) {
-                server.find(line).findRowCount();
+                server.find(line).setMaxRows(1).findRowCount();
             }
             proxy.getLogger().info("Tables already exists!");
         } catch (Exception e) {
             proxy.getLogger().info(e.getMessage());
             proxy.getLogger().info("Start create tables, wait...");
-            DdlGenerator gen = ((SpiEbeanServer) server).getDdlGenerator();
+            DdlGenerator gen = SpiEbeanServer.class.cast(server).getDdlGenerator();
             gen.runScript(ignore, gen.generateCreateDdl());
-            proxy.getLogger().info("Create Tables done!");
+            proxy.getLogger().info("Create tables done!");
         }
     }
 

diff --git a/src/main/java/com/mengcraft/simpleorm/EbeanManager.java b/src/main/java/com/mengcraft/simpleorm/EbeanManager.java
@@ -1,6 +1,5 @@
 package com.mengcraft.simpleorm;
 
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.ArrayList;
@@ -18,7 +17,7 @@ private EbeanManager() {
         this.map = new HashMap<>();
     }
 
-    public EbeanHandler getHandler(Plugin proxy) {
+    public EbeanHandler getHandler(JavaPlugin proxy) {
         EbeanHandler out = map.get(proxy.getName());
         if (out == null || out.getProxy() != proxy) {
             map.put(proxy.getName(), out = a(proxy));
@@ -45,7 +44,7 @@ public boolean hasHandler(JavaPlugin proxy) {
         return map.get(proxy.getName()) != null;
     }
 
-    private EbeanHandler a(Plugin proxy) {
+    private EbeanHandler a(JavaPlugin proxy) {
         EbeanHandler handler = new EbeanHandler(proxy);
 
         String driver = proxy.getConfig().getString("dataSource.driver");