fix: AutoCompleteList with quoted schemas or table names

- Fixes #428

h2/pom.xml

@@ -37,8 +37,6 @@
   </developers>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.release>11</maven.compiler.release>
     <asm.version>9.5</asm.version>
     <jts.version>1.19.0</jts.version>
@@ -206,7 +204,6 @@
   </profiles>
 
   <build>
-    <finalName>${project.artifactId}-${project.version}-${git.commit.id.describe-short}</finalName>
     <sourceDirectory>src/main</sourceDirectory>
     <testSourceDirectory>src/test</testSourceDirectory>
     <!-- Resources do not follow maven project layout. We need to manually copy them -->
@@ -244,7 +241,7 @@
     </testResource>
     </testResources>
     <plugins>
-    <plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.1.2</version>
@@ -292,34 +289,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.3</version>
-        <executions>
-          <execution>
-            <id>get-the-git-infos</id>
-            <goals>
-              <goal>revision</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-          <prefix>git</prefix>
-          <verbose>false</verbose>
-          <generateGitPropertiesFile>true</generateGitPropertiesFile>
-          <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-          <format>json</format>
-          <gitDescribe>
-            <skip>false</skip>
-            <always>false</always>
-            <dirty></dirty>
-            <abbrev>9</abbrev>
-          </gitDescribe>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 

h2/src/main/org/h2/bnf/context/DbContextRule.java

@@ -78,12 +78,18 @@ public boolean autoComplete(Sentence sentence) {
             DbSchema bestSchema = null;
             for (DbSchema schema: schemas) {
                 String name = StringUtils.toUpperEnglish(schema.name);
+                String quotedName = "\"" + schema.quotedName + "\"";
                 if (up.startsWith(name)) {
                     if (best == null || name.length() > best.length()) {
                         best = name;
                         bestSchema = schema;
                     }
-                } else if (s.length() == 0 || name.startsWith(up)) {
+                } else if (query.startsWith(quotedName)) {
+                    if (best == null || name.length() > best.length()) {
+                        best = quotedName;
+                        bestSchema = schema;
+                    }
+                } else if (s.isEmpty() || name.startsWith(up) || quotedName.startsWith(query) ) {
                     if (s.length() < name.length()) {
                         sentence.add(name, name.substring(s.length()), type);
                         sentence.add(schema.quotedName + ".",
@@ -109,6 +115,8 @@ public boolean autoComplete(Sentence sentence) {
             for (DbTableOrView table : tables) {
                 String compare = up;
                 String name = StringUtils.toUpperEnglish(table.getName());
+                String quotedName = "\"" + StringUtils.toUpperEnglish(table.getName()) + "\"";
+
                 if (table.getQuotedName().length() > name.length()) {
                     name = table.getQuotedName();
                     compare = query;
@@ -118,7 +126,7 @@ public boolean autoComplete(Sentence sentence) {
                         best = name;
                         bestTable = table;
                     }
-                } else if (s.length() == 0 || name.startsWith(compare)) {
+                } else if (s.isEmpty() || name.startsWith(compare) || quotedName.startsWith(up)) {
                     if (s.length() < name.length()) {
                         sentence.add(table.getQuotedName(),
                                 table.getQuotedName().substring(s.length()),

h2/src/main/org/h2/value/ValueBlob.java

@@ -5,7 +5,6 @@
  */
 package org.h2.value;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -146,20 +145,9 @@ public String getString() {
     @Override
     byte[] getBytesInternal() {
         if (octetLength > Constants.MAX_STRING_LENGTH) {
-            //throw getBinaryTooLong(octetLength);
-
-            try (InputStream inputStream = lobData.getInputStream(octetLength);
-                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); ) {
-                IOUtils.copy(inputStream, byteArrayOutputStream);
-                byte[] bytes = byteArrayOutputStream.toByteArray();
-
-                return bytes;
-            } catch (IOException ex) {
-                throw DbException.convert(ex);
-            }
-
-        } else
-            return readBytes((int) octetLength);
+            throw getBinaryTooLong(octetLength);
+        }
+        return readBytes((int) octetLength);
     }
 
     @Override

h2/src/test/org/h2/test/TestBase.java

@@ -749,11 +749,24 @@ protected void assertSmaller(long a, long b) {
      * @throws AssertionError if the term was not found
      */
     protected void assertContains(String result, String contains) {
-        if (result.indexOf(contains) < 0) {
+        if (!result.contains(contains)) {
             fail(result + " does not contain: " + contains);
         }
     }
 
+    /**
+     * Check that a result does not contain the given substring.
+     *
+     * @param result the result value
+     * @param contains the term that should appear in the result
+     * @throws AssertionError if the term has been found
+     */
+    protected void assertNotContaining(String result, String contains) {
+        if (result.contains(contains)) {
+            fail(result + " contains: " + contains);
+        }
+    }
+
     /**
      * Check that a text starts with the expected characters..
      *
@@ -852,6 +865,18 @@ public void assertNull(Object obj) {
         }
     }
 
+    /**
+     * Check that the passed String is empty.
+     *
+     * @param s the object
+     * @throws AssertionError if the String is not empty
+     */
+    public void assertEmpty(String s) {
+        if (s != null && !s.isEmpty()) {
+            fail("Expected: empty String but got: " + s);
+        }
+    }
+
     /**
      * Check that the passed object is not null.
      *

h2/src/test/org/h2/test/server/TestWeb.java

@@ -71,14 +71,16 @@ public static void main(String... a) throws Exception {
 
     @Override
     public void test() throws Exception {
-        testServlet();
-        testWrongParameters();
-        testTools();
-        testAlreadyRunning();
-        testStartWebServerWithConnection();
-        testServer();
-        testWebApp();
-        testIfExists();
+//        testServlet();
+//        testWrongParameters();
+//        testTools();
+//        testAlreadyRunning();
+//        testStartWebServerWithConnection();
+//        testServer();
+//        testWebApp();
+//        testIfExists();
+
+        testSpecialAutoComplete();
     }
 
     private void testServlet() throws Exception {
@@ -561,6 +563,79 @@ private void testWebApp() throws Exception {
         }
     }
 
+    private void testSpecialAutoComplete() throws Exception {
+        Server server = new Server();
+        server.setOut(new PrintStream(new ByteArrayOutputStream()));
+        server.runTool("-ifNotExists", "-web", "-webPort", "8182",
+                       "-properties", "null", "-tcp", "-tcpPort", "9101");
+        try {
+            String url = "http://localhost:8182";
+            WebClient client;
+            String result;
+            client = new WebClient();
+            result = client.get(url);
+            client.readSessionId(result);
+            client.get(url, "login.jsp");
+
+            result = client.get(url, "login.do?driver=org.h2.Driver" +
+                                     "&url=jdbc:h2:mem:" + getTestName() +
+                                     "&user=sa&password=sa&name=_test_");
+            result = client.get(url, "header.jsp");
+
+            result = client.get(url, "query.do?sql=" +
+                                     "create schema test_schema;" +
+                                     "create table test_schema.test_table(id int primary key, name varchar);" +
+                                     "insert into test_schema.test_table values(1, 'Hello')");
+            result = client.get(url, "query.do?sql=create sequence test_schema.test_sequence");
+            result = client.get(url, "query.do?sql=" +
+                                     "create view test_schema.test_view as select * from test");
+            result = client.get(url, "tables.do");
+
+            result = client.get(url, "query.jsp");
+
+            // unquoted autoComplete
+            result = client.get(url, "autoCompleteList.do?query=select * from test_schema.test");
+            assertContains(StringUtils.urlDecode(result), "test_table");
+
+            // this shall succeed, because "TEST_SCHEMA" exists
+            result = client.get(url, "autoCompleteList.do?query=select * from TEST");
+            assertContains(StringUtils.urlDecode(result), "test_schema");
+
+            // this shall also succeed, because "TEST_SCHEMA" is similar
+            result = client.get(url, "autoCompleteList.do?query=select * from \"TEST");
+            assertContains(StringUtils.urlDecode(result), "test_schema");
+
+            // this shall succeed, because "TEST_SCHEMA" exists
+            result = client.get(url, "autoCompleteList.do?query=select * from \"TEST_SCHEMA\".test");
+            assertContains(StringUtils.urlDecode(result), "test_table");
+
+            // this shall succeed, because "TEST_SCHEMA" and "TEST_TABLE exist
+            result = client.get(url, "autoCompleteList.do?query=select * from \"TEST_SCHEMA\".\"TEST");
+            assertContains(StringUtils.urlDecode(result), "test_table");
+
+            // this shall also succeed, because we want to be lenient on table names
+            result = client.get(url, "autoCompleteList.do?query=select * from \"TEST_SCHEMA\".\"test");
+            assertContains(StringUtils.urlDecode(result), "test_table");
+
+            // this shall fail, because there is no "test_schema"
+            result = client.get(url, "autoCompleteList.do?query=select * from \"test_schema\".test");
+            assertNotContaining(StringUtils.urlDecode(result),"test_table");
+
+            // this shall not return any suggestion since there is no "test_schema"
+            result = client.get(url, "autoCompleteList.do?query=select * from \"test_schema\".");
+            assertEmpty(StringUtils.urlDecode(result));
+
+            // this shall not return anything, because there is no TEST_TABLE1
+            result = client.get(url, "autoCompleteList.do?query=select * from \"TEST_SCHEMA\".\"test_table1");
+            assertEmpty(StringUtils.urlDecode(result));
+
+            result = client.get(url, "logout.do");
+
+        } finally {
+            server.shutdown();
+        }
+    }
+
     private void testStartWebServerWithConnection() throws Exception {
         String old = System.getProperty(SysProperties.H2_BROWSER);
         try {