Merge pull request #255 from Toparvion/fix-h2-sql-error

Fix H2 SQL error in JDBC mode

Author: vfedoriv

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java

@@ -15,6 +15,16 @@
  */
 package org.springframework.samples.petclinic.repository.jdbc;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
 import org.springframework.context.annotation.Profile;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -30,11 +40,6 @@
 import org.springframework.samples.petclinic.repository.VisitRepository;
 import org.springframework.stereotype.Repository;
 
-import javax.sql.DataSource;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
 /**
  * A simple JDBC-based implementation of the {@link VisitRepository} interface.
  *
@@ -114,7 +119,7 @@ public Visit findById(int id) throws DataAccessException {
     public Collection<Visit> findAll() throws DataAccessException {
         Map<String, Object> params = new HashMap<>();
         return this.namedParameterJdbcTemplate.query(
-            "SELECT id as visit_id, pets.id as pets_id, visit_date, description FROM visits LEFT JOIN pets ON visits.pet_id = pets.id",
+            "SELECT visits.id as visit_id, pets.id as pets_id, visit_date, description FROM visits LEFT JOIN pets ON visits.pet_id = pets.id",
             params, new JdbcVisitRowMapperExt());
     }
 

src/main/resources/application.properties

@@ -28,8 +28,8 @@ server.servlet.context-path=/petclinic/
 spring.sql.init.platform=h2
 # Ensures schema & data reload on every restart (good for local dev)
 spring.sql.init.mode=always
-spring.sql.init.schema-locations=classpath*:db/${platform}/schema.sql
-spring.sql.init.data-locations=classpath*:db/${platform}/data.sql
+spring.sql.init.schema-locations=classpath*:db/${spring.sql.init.platform}/schema.sql
+spring.sql.init.data-locations=classpath*:db/${spring.sql.init.platform}/data.sql
 
 spring.messages.basename=messages/messages
 spring.jpa.open-in-view=false

src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceH2JdbcTests.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      http://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.
+ */
+package org.springframework.samples.petclinic.service.clinicService;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+
+/**
+ * <p> Integration test using the JDBC and H2 profiles.
+ *
+ * @author Thomas Risberg
+ * @author Michael Isvy
+ * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
+ */
+@SpringBootTest
+@ActiveProfiles({"h2", "jdbc"})
+@TestPropertySource(properties = {
+    "spring.sql.init.platform=h2",
+    "spring.h2.console.enabled=false"
+})
+class ClinicServiceH2JdbcTests extends AbstractClinicServiceTests {
+
+}

…linicService/ClinicServiceJdbcTests.java …cService/ClinicServiceHsqlJdbcTests.javasrc/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java renamed to src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceHsqlJdbcTests.java src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java renamed to src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceHsqlJdbcTests.java

@@ -17,16 +17,18 @@
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 
 /**
- * <p> Integration test using the jdbc profile.
+ * <p> Integration test using the JDBC and HSQLDB profiles.
  *
  * @author Thomas Risberg
  * @author Michael Isvy
  * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
  */
 @SpringBootTest
-@ActiveProfiles({"jdbc", "hsqldb"})
-class ClinicServiceJdbcTests extends AbstractClinicServiceTests {
+@ActiveProfiles({"hsqldb", "jdbc"})
+@TestPropertySource(properties = {"spring.sql.init.platform=hsqldb"})
+class ClinicServiceHsqlJdbcTests extends AbstractClinicServiceTests {
 
 }

src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceH2JdbcTests.java

@@ -0,0 +1,15 @@
+package org.springframework.samples.petclinic.service.userService;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+
+@SpringBootTest
+@ActiveProfiles({"h2", "jdbc"})
+@TestPropertySource(properties = {
+    "spring.sql.init.platform=h2",
+    "spring.h2.console.enabled=false"
+})
+class UserServiceH2JdbcTests extends AbstractUserServiceTests {
+
+}

…ce/userService/UserServiceJdbcTests.java …serService/UserServiceHsqlJdbcTests.javasrc/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java renamed to src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceHsqlJdbcTests.java src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java renamed to src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceHsqlJdbcTests.java

@@ -4,7 +4,7 @@
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
-@ActiveProfiles({"jdbc", "hsqldb"})
-class UserServiceJdbcTests extends AbstractUserServiceTests {
+@ActiveProfiles({"hsqldb", "jdbc"})
+class UserServiceHsqlJdbcTests extends AbstractUserServiceTests {
 
 }

src/test/resources/application.properties

@@ -25,8 +25,8 @@ server.servlet.context-path=/petclinic/
 spring.jpa.open-in-view=false
 
 # database init
-spring.sql.init.schema-locations=classpath*:db/hsqldb/schema.sql
-spring.sql.init.data-locations=classpath*:db/hsqldb/data.sql
+spring.sql.init.schema-locations=classpath*:db/${spring.sql.init.platform}/schema.sql
+spring.sql.init.data-locations=classpath*:db/${spring.sql.init.platform}/data.sql
 
 spring.messages.basename=messages/messages
 logging.level.org.springframework=INFO