Move method to StringUtils to avoid classloading problems on Android.

h2/src/main/org/h2/fulltext/FullText.java

@@ -36,7 +36,6 @@ import org.h2.jdbc.JdbcConnection;
 import org.h2.message.DbException;
 import org.h2.tools.SimpleResultSet;
 import org.h2.util.IOUtils;
-import org.h2.util.JdbcUtils;
 import org.h2.util.New;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
@@ -847,8 +846,8 @@ public class FullText {
             ArrayList<String> keyList = New.arrayList();
             DatabaseMetaData meta = conn.getMetaData();
             ResultSet rs = meta.getColumns(null,
-                    JdbcUtils.escapeMetaDataPattern(schemaName),
-                    JdbcUtils.escapeMetaDataPattern(tableName),
+                    StringUtils.escapeMetaDataPattern(schemaName),
+                    StringUtils.escapeMetaDataPattern(tableName),
                     null);
             ArrayList<String> columnList = New.arrayList();
             while (rs.next()) {
@@ -861,15 +860,15 @@ public class FullText {
             index.columns = new String[columnList.size()];
             columnList.toArray(index.columns);
             rs = meta.getColumns(null,
-                    JdbcUtils.escapeMetaDataPattern(schemaName),
-                    JdbcUtils.escapeMetaDataPattern(tableName),
+                    StringUtils.escapeMetaDataPattern(schemaName),
+                    StringUtils.escapeMetaDataPattern(tableName),
                     null);
             for (int i = 0; rs.next(); i++) {
                 columnTypes[i] = rs.getInt("DATA_TYPE");
             }
             if (keyList.size() == 0) {
                 rs = meta.getPrimaryKeys(null,
-                        JdbcUtils.escapeMetaDataPattern(schemaName),
+                        StringUtils.escapeMetaDataPattern(schemaName),
                         tableName);
                 while (rs.next()) {
                     keyList.add(rs.getString("COLUMN_NAME"));

h2/src/main/org/h2/fulltext/FullTextLucene.java

@@ -33,7 +33,6 @@ import org.h2.expression.ExpressionColumn;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.store.fs.FileUtils;
 import org.h2.tools.SimpleResultSet;
-import org.h2.util.JdbcUtils;
 import org.h2.util.New;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
@@ -531,8 +530,8 @@ public class FullTextLucene extends FullText {
             ArrayList<String> keyList = New.arrayList();
             DatabaseMetaData meta = conn.getMetaData();
             ResultSet rs = meta.getColumns(null,
-                    JdbcUtils.escapeMetaDataPattern(schemaName),
-                    JdbcUtils.escapeMetaDataPattern(tableName),
+                    StringUtils.escapeMetaDataPattern(schemaName),
+                    StringUtils.escapeMetaDataPattern(tableName),
                     null);
             ArrayList<String> columnList = New.arrayList();
             while (rs.next()) {
@@ -542,15 +541,15 @@ public class FullTextLucene extends FullText {
             columns = new String[columnList.size()];
             columnList.toArray(columns);
             rs = meta.getColumns(null,
-                    JdbcUtils.escapeMetaDataPattern(schemaName),
-                    JdbcUtils.escapeMetaDataPattern(tableName),
+                    StringUtils.escapeMetaDataPattern(schemaName),
+                    StringUtils.escapeMetaDataPattern(tableName),
                     null);
             for (int i = 0; rs.next(); i++) {
                 columnTypes[i] = rs.getInt("DATA_TYPE");
             }
             if (keyList.size() == 0) {
                 rs = meta.getPrimaryKeys(null,
-                        JdbcUtils.escapeMetaDataPattern(schemaName),
+                        StringUtils.escapeMetaDataPattern(schemaName),
                         tableName);
                 while (rs.next()) {
                     keyList.add(rs.getString("COLUMN_NAME"));

h2/src/main/org/h2/result/UpdatableRow.java

@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import org.h2.constant.ErrorCode;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.message.DbException;
-import org.h2.util.JdbcUtils;
 import org.h2.util.New;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
@@ -66,8 +65,8 @@ public class UpdatableRow {
         }
         final DatabaseMetaData meta = conn.getMetaData();
         ResultSet rs = meta.getTables(null,
-                JdbcUtils.escapeMetaDataPattern(schemaName),
-                JdbcUtils.escapeMetaDataPattern(tableName),
+                StringUtils.escapeMetaDataPattern(schemaName),
+                StringUtils.escapeMetaDataPattern(tableName),
                 new String[] { "TABLE" });
         if (!rs.next()) {
             return;
@@ -83,7 +82,7 @@ public class UpdatableRow {
         boolean toUpper = !table.equals(tableName) && table.equalsIgnoreCase(tableName);
         key = New.arrayList();
         rs = meta.getPrimaryKeys(null,
-                JdbcUtils.escapeMetaDataPattern(schemaName),
+                StringUtils.escapeMetaDataPattern(schemaName),
                 tableName);
         while (rs.next()) {
             String c = rs.getString("COLUMN_NAME");
@@ -95,7 +94,7 @@ public class UpdatableRow {
         }
         key.clear();
         rs = meta.getIndexInfo(null,
-                JdbcUtils.escapeMetaDataPattern(schemaName),
+                StringUtils.escapeMetaDataPattern(schemaName),
                 tableName, true, true);
         while (rs.next()) {
             int pos = rs.getShort("ORDINAL_POSITION");

h2/src/main/org/h2/util/JdbcUtils.java

@@ -118,19 +118,6 @@ public class JdbcUtils {
         return getConnection(driver, url, prop);
     }
 
-    /**
-     * Escape table or schema patterns used for DatabaseMetaData functions.
-     *
-     * @param pattern the pattern
-     * @return the escaped pattern
-     */
-    public static String escapeMetaDataPattern(String pattern) {
-        if (pattern == null || pattern.length() == 0) {
-            return pattern;
-        }
-        return StringUtils.replaceAll(pattern, "\\", "\\\\");
-    }
-
     /**
      * Open a new database connection with the given settings.
      *

h2/src/main/org/h2/util/StringUtils.java

@@ -1078,4 +1078,17 @@ public class StringUtils {
         }
     }
 
+    /**
+     * Escape table or schema patterns used for DatabaseMetaData functions.
+     *
+     * @param pattern the pattern
+     * @return the escaped pattern
+     */
+    public static String escapeMetaDataPattern(String pattern) {
+        if (pattern == null || pattern.length() == 0) {
+            return pattern;
+        }
+        return replaceAll(pattern, "\\", "\\\\");
+    }
+
 }