Changeset: ef9492865066 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef9492865066
Modified Files:
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (71 lines):
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -689,7 +689,7 @@ wkbFromText(wkb **w, str *wkt, int *tpe)
*w = NULL;
if (wkbFROMSTR(*wkt, &len, w) &&
(wkb_isnil(*w) || *tpe == wkbGeometryCollection ||
- (te = (((*w)->data[1]) & 0x0f)) == *tpe))
+ (te = *((*w)->data + 1) & 0x0f) == *tpe))
return MAL_SUCCEED;
if (!(*w))
*w = (wkb *) GDKmalloc(sizeof(wkb));
@@ -721,7 +721,7 @@ wkbHASH(wkb *w)
BUN h = 0;
for (i = 0; i < (w->len - 1); i += 2) {
- int a = w->data[i], b = w->data[i + 1];
+ int a = *(w->data + i), b = *(w->data + i + 1);
h = (h << 3) ^ (h >> 11) ^ (h >> 17) ^ (b << 8) ^ a;
}
return h;
diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011
--- a/java/ChangeLog.Dec2011
+++ b/java/ChangeLog.Dec2011
@@ -1,6 +1,10 @@
# ChangeLog file for java
# This file is updated with Maddlog
+* Mon Feb 20 2012 Fabian Groffen <[email protected]>
+- Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
+ error when called with catalog and schema argument.
+
* Tue Feb 14 2012 Fabian Groffen <[email protected]>
- Resolved a bug where JDBC and Control connections could terminate
abruptly with 'Connection closed' messages
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -1551,7 +1551,7 @@ public class MonetDatabaseMetaData exten
if (catalog != null)
query += "AND LOWER('" + cat + "') LIKE '" +
escapeQuotes(catalog).toLowerCase() + "' ";
if (schemaPattern != null)
- query += "AND LOWER(\"TABLE_SCHEM\") LIKE '" +
escapeQuotes(schemaPattern).toLowerCase() + "' ";
+ query += "AND LOWER(\"name\") LIKE '" +
escapeQuotes(schemaPattern).toLowerCase() + "' ";
query += "ORDER BY \"TABLE_SCHEM\"";
return(getStmt().executeQuery(query));
diff --git a/java/tests/Test_Dobjects.java b/java/tests/Test_Dobjects.java
--- a/java/tests/Test_Dobjects.java
+++ b/java/tests/Test_Dobjects.java
@@ -47,6 +47,7 @@ public class Test_Dobjects {
// inspect the catalog by use of dbmd functions
dumpResultSet(dbmd.getCatalogs());
dumpResultSet(dbmd.getSchemas());
+ dumpResultSet(dbmd.getSchemas(null, "sys"));
dumpResultSet(dbmd.getTables(null, null, null, null));
} catch (SQLException e) {
System.out.println("FAILED :( "+ e.getMessage());
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -56,6 +56,9 @@ Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
sys mTests_jdbc_tests mTests_jdbc_tests
tmp mTests_jdbc_tests mTests_jdbc_tests
+Resultset with 3 columns
+TABLE_SCHEM TABLE_CATALOG TABLE_CAT
+sys mTests_jdbc_tests mTests_jdbc_tests
Resultset with 10 columns
TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
mTests_jdbc_tests sys _columns SYSTEM TABLE null null
null null rowid SYSTEM
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
