- Fixed bug in the Model class. The sql in the init method was missing the id so the query to find objects in a hasMany relationship was failing

pborissow · pborissow · commit 70dcd1d0ada6 · 2019-06-04T19:26:09.000Z
- Updated the static init methods used to initialize models to throw a SQLException
 - Minor update to the Console.log() method. Double values are now formatted and rounded to the the 8th decimal place

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1214 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/sql/Model.java b/src/javaxt/sql/Model.java
@@ -137,11 +137,14 @@ protected final void init(long id, String...fieldNames) throws SQLException {
 
 
         StringBuilder sql = new StringBuilder("select ");
+        boolean addID = true;
         for (int i=0; i<fieldNames.length; i++){
             if (i>0) sql.append(", ");
             String fieldName = fieldNames[i];
+            if (fieldName.equalsIgnoreCase("id")) addID = false;
             sql.append(escape(fieldName));
         }
+        if (addID) sql.append(", id");
         sql.append(" from ");
         sql.append(tableName);
         sql.append(" where id=");
@@ -743,8 +746,8 @@ protected static Connection getConnection(Class c) throws SQLException {
   //**************************************************************************
   //** init
   //**************************************************************************
-  /** Used to associate a model with a database connection pool. This allows
-   *  queries and other database metadata to be cached.
+  /** Used to initialize a Model and associate it with a database connection
+   *  pool. This allows queries and other database metadata to be cached.
     <pre>
         for (Jar.Entry entry : jar.getEntries()){
             String name = entry.getName();
@@ -758,7 +761,7 @@ protected static Connection getConnection(Class c) throws SQLException {
         }
     </pre>
    */
-    public static void init(Class c, ConnectionPool connectionPool){
+    public static void init(Class c, ConnectionPool connectionPool) throws SQLException {
 
         String className = c.getName();
 
@@ -796,19 +799,21 @@ public static void init(Class c, ConnectionPool connectionPool){
         }
         catch(Exception e){
             if (conn!=null) conn.close();
-            e.printStackTrace();
+            SQLException ex = new SQLException("Failed to initialize Model: " + className);
+            ex.setStackTrace(e.getStackTrace());
+            throw ex;
         }
     }
 
 
   //**************************************************************************
   //** init
   //**************************************************************************
-  /** Used to associate all the models found in a JAR file with a database
-   *  connection pool. This allows queries and other database metadata to be
-   *  cached.
+  /** Used to initialize all the Models found in a jar file and associate them
+   *  with a database connection pool. This allows queries and other database
+   *  metadata to be cached.
    */
-    public static void init(javaxt.io.Jar jar, ConnectionPool connectionPool){
+    public static void init(javaxt.io.Jar jar, ConnectionPool connectionPool) throws SQLException {
         for (Class c : jar.getClasses()){
             if (javaxt.sql.Model.class.isAssignableFrom(c)){
                 init(c, connectionPool);
diff --git a/src/javaxt/utils/Console.java b/src/javaxt/utils/Console.java
@@ -2,6 +2,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.DecimalFormat;
 
 //******************************************************************************
 //**  Console
@@ -14,7 +15,8 @@
 public class Console {
 
     private String me = this.getClass().getName();
-    private String indent = "                       "; // 25 spaces
+    private static final String indent = "                       "; // 25 spaces
+    private static final DecimalFormat df = new DecimalFormat("#.##");
 
 
   //**************************************************************************
@@ -33,7 +35,15 @@ public void log(Object obj){
             source += " ";
         }
         String str = null;
-        if (obj!=null) str = obj.toString();
+        if (obj!=null){
+            if (obj instanceof Double){
+                df.setMaximumFractionDigits(8);
+                str = df.format((Double) obj);
+            }
+            else{
+                str = obj.toString();
+            }
+        }
         System.out.println(source + str);
     }
 
