Changeset: cb34dceea691 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb34dceea691
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (57 lines):
diff -r fcd4d75a3c50 -r cb34dceea691 java/src/nl/cwi/monetdb/jdbc/MonetClob.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetClob.java Wed Jul 21 15:05:40
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetClob.java Wed Jul 21 15:06:43
2010 +0200
@@ -182,4 +182,15 @@
public void truncate(long len) {
// this command is a no-op
}
+
+ /**
+ * Returns the String behind this Clob. This is a MonetClob
+ * extension that does not violate nor is described in the Clob
+ * interface.
+ *
+ * @return the String this Clob wraps.
+ */
+ public String toString() {
+ return(buf.toString());
+ }
}
diff -r fcd4d75a3c50 -r cb34dceea691 java/tests/Test_Rmetadata.java
--- a/java/tests/Test_Rmetadata.java Wed Jul 21 15:05:40 2010 +0200
+++ b/java/tests/Test_Rmetadata.java Wed Jul 21 15:06:43 2010 +0200
@@ -84,10 +84,11 @@
}
private static String isInstance(Object obj, String type) {
- if (obj == null) return("(null)");
+ if (obj == null)
+ return("(null)");
try {
Class c = Class.forName(type);
- if (obj.getClass() == c) {
+ if (c.isInstance(obj)) {
return(obj.getClass().getName() + " is an
instance of " + type);
} else {
return(obj.getClass().getName() + " is NOT an
instance of " + type);
diff -r fcd4d75a3c50 -r cb34dceea691
sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out Wed Jul 21
15:05:40 2010 +0200
+++ b/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out Wed Jul 21
15:06:43 2010 +0200
@@ -107,7 +107,7 @@
signed false
writable false
5. mTests_src_jdbc_tests
- classname java.lang.String
+ classname java.sql.Clob
displaysize 11
label myclob
name myclob
@@ -135,7 +135,7 @@
6. java.lang.Double is an instance of java.lang.Double
6. java.lang.Boolean is an instance of java.lang.Boolean
6. java.lang.String is an instance of java.lang.String
-6. java.lang.String is an instance of java.lang.String
+6. nl.cwi.monetdb.jdbc.MonetClob is an instance of java.sql.Clob
# 09:09:21 >
# 09:09:21 > Done.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
