PostgreSql parser for H2 db queries

Signed-off-by: BoykoAlex <alex.boyko@broadcom.com>

Author: BoykoAlex

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/JdtDataQuerySemanticTokensProvider.java

@@ -122,6 +122,8 @@ private SemanticTokensDataProvider getSqlSemanticTokensProvider(IJavaProject pro
 			return sqlTokenProviders.get(SqlType.MYSQL);
 		} else if (SpringProjectUtil.hasDependencyStartingWith(project, "postgresql", null)) {
 			return sqlTokenProviders.get(SqlType.POSTGRESQL);
+		} else if (SpringProjectUtil.hasDependencyStartingWith(project, "h2", null)) {
+			return sqlTokenProviders.get(SqlType.POSTGRESQL);
 		}
 		return sqlTokenProviders.get(SqlType.MYSQL);
 	}

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryJdtAstReconciler.java

@@ -131,6 +131,8 @@ private Optional<Reconciler> getSqlReconciler(IJavaProject project) {
 			return Optional.of(sqlReconcilers.get(SqlType.MYSQL));
 		} else if (SpringProjectUtil.hasDependencyStartingWith(project, "postgresql", null)) {
 			return Optional.of(sqlReconcilers.get(SqlType.POSTGRESQL));
+		} else if (SpringProjectUtil.hasDependencyStartingWith(project, "h2", null)) {
+			return Optional.of(sqlReconcilers.get(SqlType.POSTGRESQL));
 		}
 		return Optional.empty();
 	}

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/JdtDataQuerySemanticTokensProviderTest.java

@@ -519,4 +519,35 @@ static class P {
 				new ExpectedSemanticToken("st", "variable")
 		);
 	}
+	
+	@Test
+	void jdbcSqlQueryNormalAnnotationH2() throws Exception {
+		jp = projects.mavenProject("boot-h2/");
+		harness.useProject(jp);
+		
+		String source = """
+		package my.package
+		
+		import org.springframework.data.jdbc.repository.query.Query;
+		import org.springframework.data.repository.query.Param;
+		
+		public interface EmployeeRepository {
+		
+			@Query(value = "SELECT * from fn_module_candidates")
+			void findByLastName(@Param("lastName") String lastName);
+		}
+		""";
+        
+        String uri = Paths.get(jp.getLocationUri()).resolve("src/main/resource/my/package/EmployeeRepository.java").toUri().toASCIIString();
+		Editor editor = harness.newEditor(LanguageId.JAVA, source, uri);
+		
+		editor.assertSemanticTokensFull(
+				new ExpectedSemanticToken("SELECT", "keyword"),
+				new ExpectedSemanticToken("*", "operator"),
+				new ExpectedSemanticToken("from", "keyword"),
+				new ExpectedSemanticToken("fn_module_candidates", "variable")
+		);
+	}
+	
+
 }

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/jpa/queries/QueryReconcilerTest.java

@@ -353,6 +353,32 @@ public interface OwnerRepository extends CrudRepository<Object, Integer> {
 		editor.assertProblems("SELECTX|MySQL: mismatched input 'SELECTX' expecting {'ALTER',");
 	}
 
+	@Test
+	void jdbcQueryNormalAnnotationErrorReportedH2() throws Exception {
+		directory = new File(ProjectsHarness.class.getResource("/test-projects/boot-h2/").toURI());
+		String projectDir = directory.toURI().toString();
+		// trigger project creation
+		projectFinder.find(new TextDocumentIdentifier(projectDir)).get();
+
+		String source = """
+				package example.demo;
+
+				import org.springframework.data.jdbc.repository.query.Query;
+				import org.springframework.data.repository.CrudRepository;
+
+				public interface OwnerRepository extends CrudRepository<Object, Integer> {
+
+					@Query(value = "SELECTX * FROM owner WHERE last_name = :lastName")
+					List<Object> findByLastName(String lastName);
+
+				}
+				""";
+		String docUri = directory.toPath().resolve("src/main/java/example/demo/OwnerRepository.java").toUri()
+				.toString();
+		Editor editor = harness.newEditor(LanguageId.JAVA, source, docUri);
+		editor.assertProblems("SELECTX|PostgreSQL: mismatched input 'SELECTX' expecting {");
+	}
+	
 	@Test
 	void jdbcOnlyProjectNoReconcilingWithoutDbConnector() throws Exception {
 		directory = new File(ProjectsHarness.class.getResource("/test-projects/aot-data-repositories-jdbc/").toURI());

headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-h2/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip