- Added new setSchemaName() method to the Model class

pborissow · pborissow · commit 8f0fa6c64d54 · 2020-03-25T12:36:59.000Z
- Minor update to the dir() method in the Directory class

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1277 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/io/Directory.java b/src/javaxt/io/Directory.java
@@ -1526,11 +1526,15 @@ private String[] dir(){
 
         java.util.ArrayList<String> files = new java.util.ArrayList<String>();
 
+        String dir = getPath();
+        //dir = this.toFile().getCanonicalPath() + PathSeparator;
+
+
       //Try listing files using the JNI
         boolean doDir = false;
         if (File.loadDLL()){
             try{
-                String list = File.GetFiles(getPath() + "*");
+                String list = File.GetFiles(dir + "*");
                 if (list!=null){
                     for (String name : list.split("\n")){
                         name = name.trim();
@@ -1551,11 +1555,9 @@ private String[] dir(){
       //If we're still here, list files using a command prompt
         if (doDir)
         try{
-            String path = this.getPath();
-            if (path.contains(" ")) path = "\"" + path + "\"";
 
           //Execute a windows shell command to get a directory listing
-            javaxt.io.Shell cmd = new javaxt.io.Shell("cmd.exe /c dir /OG " + path);
+            javaxt.io.Shell cmd = new javaxt.io.Shell("cmd.exe /c dir /OG " + (dir.contains(" ") ? "\"" + dir + "\"" : dir));
             java.util.List<String> output = cmd.getOutput();
             cmd.run();
 
@@ -1647,7 +1649,7 @@ else if (isSymLink || isJunction){
                                         file = new java.io.File(link);
                                     }
                                     else {
-                                        file = new java.io.File(path, name);
+                                        file = new java.io.File(dir, name);
                                     }
                                     if (file.isDirectory()) name += this.PathSeparator;
                                     files.add(name);
diff --git a/src/javaxt/sql/Model.java b/src/javaxt/sql/Model.java
@@ -16,7 +16,7 @@
 public abstract class Model {
 
     protected Long id;
-    protected final String tableName;
+    private String escapedTableName;
     private final String modelName;
     private final HashMap<String, String> fieldMap;
     private String[] keywords;
@@ -36,6 +36,9 @@ public abstract class Model {
     private static ConcurrentHashMap<String, Field[]>
     fields = new ConcurrentHashMap<String, Field[]>();
 
+    private static ConcurrentHashMap<String, String[]>
+    tables = new ConcurrentHashMap<String, String[]>();
+
 
   //**************************************************************************
   //** Constructor
@@ -60,11 +63,31 @@ protected Model(String tableName){
    *  You do not need to include the "id" field.
    */
     protected Model(String tableName, HashMap<String, String> fieldMap){
+
+      //Set modelName
+        Class c = this.getClass();
+        String className = c.getName();
+        modelName = c.getSimpleName();
+
+
+      //Set keywords
         synchronized(reservedKeywords){
-            keywords = reservedKeywords.get(this.getClass().getName());
+            keywords = reservedKeywords.get(className);
+        }
+
+
+      //Set tableInfo
+        synchronized(tables){
+            String[] tableInfo = tables.get(className);
+            if (tableInfo==null){
+                tableInfo = getTableInfo(tableName);
+                tables.put(className, tableInfo);
+            }
+            escapedTableName = tableInfo[0];
         }
-        this.tableName = escape(tableName);
-        this.modelName = this.getClass().getSimpleName();
+
+
+      //Set fieldMap
         this.fieldMap = fieldMap;
     }
 
@@ -145,7 +168,7 @@ protected final void init(long id, String...fieldNames) throws SQLException {
         }
         if (addID) sql.append(", id");
         sql.append(" from ");
-        sql.append(tableName);
+        sql.append(escapedTableName);
         sql.append(" where id=");
 
 
@@ -378,7 +401,7 @@ else if (packageName.startsWith("javaxt.json") ||
                     Connection conn = getConnection(this.getClass());
 
                     StringBuilder sql = new StringBuilder();
-                    sql.append("INSERT INTO " + tableName + " (");
+                    sql.append("INSERT INTO " + escapedTableName + " (");
                     it = fields.keySet().iterator();
                     while (it.hasNext()){
                         java.lang.reflect.Field f = it.next();
@@ -460,7 +483,7 @@ else if (packageName.startsWith("javaxt.geospatial.geometry") ||
                 if (driver==null) driver = new Driver("","","");
 
                 Recordset rs = new Recordset();
-                rs.open("select * from " + tableName + " where id=" + id, conn, false);
+                rs.open("select * from " + escapedTableName + " where id=" + id, conn, false);
                 if (rs.EOF){
                     rs.addNew();
                     rs.setValue("id", id);
@@ -508,7 +531,7 @@ public void delete() throws SQLException {
         Connection conn = null;
         try{
             conn = getConnection(this.getClass());
-            conn.execute("delete from " + tableName + " where id=" + id);
+            conn.execute("delete from " + escapedTableName + " where id=" + id);
             conn.close();
         }
         catch(SQLException e){
@@ -723,7 +746,7 @@ private static String getSQL(Class c, Object...args){
 
       //Get tableName
         String tableName = null;
-        try{ tableName = ((Model) c.newInstance()).tableName; }
+        try{ tableName = ((Model) c.newInstance()).escapedTableName; }
         catch(Exception e){}
 
         StringBuilder str = new StringBuilder("select ");
@@ -838,9 +861,9 @@ public static void init(Class c, ConnectionPool connectionPool) throws SQLExcept
 
 
           //Generate list of fields
-            String tableName = ((Model) c.newInstance()).tableName;
+            Model model = ((Model) c.newInstance());
             Recordset rs = new Recordset();
-            rs.open("select * from " + tableName + " where id is null", conn);
+            rs.open("select * from " + model.escapedTableName + " where id is null", conn);
             synchronized(fields){
                 fields.put(className, rs.getFields());
                 fields.notifyAll();
@@ -879,7 +902,61 @@ public static void init(javaxt.io.Jar jar, ConnectionPool connectionPool) throws
   /** Returns the name of the table backing a given Model
    */
     public static String getTableName(Model model){
-        return model.tableName;
+        return model.escapedTableName;
+    }
+
+
+  //**************************************************************************
+  //** setSchemaName
+  //**************************************************************************
+  /** Provides an option to override the default schema used by a model
+   */
+    public static void setSchemaName(String schemaName, Class c){
+        if (!javaxt.sql.Model.class.isAssignableFrom(c)) return;
+        String className = c.getName();
+        try{
+
+          //Instantiate model to initialize table info
+            Model model = ((Model) c.newInstance());
+
+
+          //Update table info
+            synchronized(tables){
+                String[] tableInfo = tables.get(className);
+                String tableName = tableInfo[1];
+                if (schemaName!=null) tableName = schemaName + "." + tableName;
+                tableInfo = model.getTableInfo(tableName);
+                tables.put(className, tableInfo);
+            }
+        }
+        catch(Exception e){
+            Exception ex = new Exception("Failed to update schema for Model: " + className);
+            ex.setStackTrace(e.getStackTrace());
+            throw new RuntimeException(ex);
+        }
+    }
+
+
+  //**************************************************************************
+  //** getTableInfo
+  //**************************************************************************
+  /** Used to parse a given string and extract table info (e.g. schema name,
+   *  table name, etc).
+   */
+    private String[] getTableInfo(String tableName){
+        String schemaName;
+        String escapedTableName;
+        int idx = tableName.indexOf(".");
+        if (idx>-1){
+            schemaName = tableName.substring(0, idx);
+            tableName = tableName.substring(idx+1);
+            escapedTableName = escape(schemaName) + "." + tableName;
+        }
+        else{
+            schemaName = null;
+            escapedTableName = escape(tableName);
+        }
+        return new String[]{escapedTableName, tableName, schemaName};
     }
 
 
