[empire-db] branch master updated: EMPIREDB-290: minor fix for previous commit

[do...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new c5325ec  EMPIREDB-290: minor fix for previous commit
c5325ec is described below

commit c5325ec6b4fe4b36a8c2dbe7a7c578b1ea211556
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Mon Jul 8 19:58:27 2019 +0200

    EMPIREDB-290: minor fix for previous commit
---
 empire-db/src/main/java/org/apache/empire/db/DBRowSet.java |  3 +++
 empire-db/src/main/java/org/apache/empire/db/DBTable.java  | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
index 199f762..0ddd595 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
@@ -357,6 +357,9 @@ public abstract class DBRowSet extends DBExpr
     public boolean isKeyColumn(DBColumn column)
     {
         DBColumn[] keyColumns = getKeyColumns();
+        if (keyColumns==null)
+            return false;
+        // search
         for (int i=0; i<keyColumns.length; i++)
         {
             if (keyColumns[i]==column)
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBTable.java b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
index bec0d1c..e30a356 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBTable.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
@@ -244,7 +244,11 @@ public class DBTable extends DBRowSet implements Cloneable
      * @return the created DBTableColumn object
      */
     public final DBTableColumn addColumn(String columnName, DataType type, double size, boolean required, Object defValue)
-    { 
+    {
+        if (defValue instanceof Class<?>)
+        {
+            log.warn("Column {}: a class object of type \"{}\" has been passed as default value. Please check!", columnName, ((Class<?>)defValue).getName());
+        }
         DataMode dm = (required ? DataMode.NotNull : DataMode.Nullable);
         return this.addColumn(columnName, type, size, dm, defValue);
     }
@@ -275,7 +279,7 @@ public class DBTable extends DBRowSet implements Cloneable
      * @param enumType  the class of the enum type
      * @return the created DBTableColumn object
      */
-    public final DBTableColumn addColumn(String columnName, DataType type, int size, boolean required, Class<?> enumType)
+    public final DBTableColumn addColumn(String columnName, DataType type, double size, boolean required, Class<?> enumType)
     {
         if (!enumType.isEnum())
         {   // Class must be an enum type
@@ -298,7 +302,7 @@ public class DBTable extends DBRowSet implements Cloneable
      * @param enumType  defValue the default value
      * @return the created DBTableColumn object
      */
-    public final DBTableColumn addColumn(String columnName, DataType type, int size, boolean required, Enum<?> defValue)
+    public final DBTableColumn addColumn(String columnName, DataType type, double size, boolean required, Enum<?> defValue)
     { 
         DataMode dm = (required ? DataMode.NotNull : DataMode.Nullable);
         DBTableColumn col = this.addColumn(columnName, type, size, dm, defValue);