From fb3029ed250a632151e5c14ec284c033b9607d2f Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 16 Jul 2007 08:07:28 +0000 Subject: [PATCH] * Handle java.sql.Types.BOOLEAN. Fixes bug 529, patch submitted by Maksim Lin --- src/helma/objectmodel/db/NodeManager.java | 2 ++ src/helma/objectmodel/db/UpdateableSubnodeList.java | 1 + src/helma/scripting/rhino/extensions/DatabaseObject.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java index 6a6a05cb..60166be1 100644 --- a/src/helma/objectmodel/db/NodeManager.java +++ b/src/helma/objectmodel/db/NodeManager.java @@ -1724,6 +1724,7 @@ public final class NodeManager { switch (columns[i].getType()) { case Types.BIT: + case Types.BOOLEAN: newprop.setBooleanValue(rs.getBoolean(columnNumber)); break; @@ -2045,6 +2046,7 @@ public final class NodeManager { } else { switch (columnType) { case Types.BIT: + case Types.BOOLEAN: case Types.TINYINT: case Types.BIGINT: case Types.SMALLINT: diff --git a/src/helma/objectmodel/db/UpdateableSubnodeList.java b/src/helma/objectmodel/db/UpdateableSubnodeList.java index 0eeb6819..b7ec9bb3 100644 --- a/src/helma/objectmodel/db/UpdateableSubnodeList.java +++ b/src/helma/objectmodel/db/UpdateableSubnodeList.java @@ -171,6 +171,7 @@ public class UpdateableSubnodeList extends OrderedSubnodeList { return; case Types.BIT: + case Types.BOOLEAN: case Types.TINYINT: case Types.BIGINT: case Types.SMALLINT: diff --git a/src/helma/scripting/rhino/extensions/DatabaseObject.java b/src/helma/scripting/rhino/extensions/DatabaseObject.java index 03cd8516..6baab598 100644 --- a/src/helma/scripting/rhino/extensions/DatabaseObject.java +++ b/src/helma/scripting/rhino/extensions/DatabaseObject.java @@ -491,7 +491,8 @@ public class DatabaseObject { int type = resultSetMetaData.getColumnType(index); switch (type) { case Types.BIT: - return new Boolean(resultSet.getBoolean(index)); + case Types.BOOLEAN: + return resultSet.getBoolean(index) ? Boolean.TRUE : Boolean.FALSE; case Types.TINYINT: case Types.BIGINT: