[test] Add tests for MySQL and PostgreSQL (darrachequesne#32)

Author: darrachequesne

.travis.yml

@@ -5,3 +5,18 @@ jdk:
  - oraclejdk7
  - openjdk7
  - openjdk6
+services:
+ - mysql
+ - pgsql
+matrix:
+ include:
+ - jdk: oraclejdk8
+ env: DB=mysql
+ - jdk: oraclejdk8
+ env: DB=pgsql
+
+script: mvn test -Dspring.profiles.active=$DB
+
+before_script:
+ - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE test;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS test;' -uroot; fi"

pom.xml

@@ -70,6 +70,9 @@
 <javax.el.api.version>2.2.5</javax.el.api.version>
 <slf4j.version>1.7.10</slf4j.version>
 <querydsl.version>3.7.1</querydsl.version>
+<h2.version>1.3.166</h2.version>
+<mysql.version>5.1.39</mysql.version>
+<postgresql.version>9.4.1209.jre7</postgresql.version>
 </properties>
 
 <dependencies>
@@ -180,7 +183,21 @@
 <dependency>
 <groupId>com.h2database</groupId>
 <artifactId>h2</artifactId>
-<version>1.3.166</version>
+<version>${h2.version}</version>
+<scope>test</scope>
+</dependency>
+
+<dependency>
+<groupId>mysql</groupId>
+<artifactId>mysql-connector-java</artifactId>
+<version>${mysql.version}</version>
+<scope>test</scope>
+</dependency>
+
+<dependency>
+<groupId>org.postgresql</groupId>
+<artifactId>postgresql</artifactId>
+<version>${postgresql.version}</version>
 <scope>test</scope>
 </dependency>
 

src/main/java/org/springframework/data/jpa/datatables/repository/SpecificationFactory.java

@@ -41,6 +41,8 @@ public DataTablesSpecification(DataTablesInput input) {
  @Override
  public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
  Predicate predicate = cb.conjunction();
+ Expression<Boolean> booleanExpression;
+ Expression<String> stringExpression;
 
  // check for each searchable column whether a filter value exists
  for (ColumnParameter column : input.getColumns()) {
@@ -49,7 +51,6 @@ public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuild
  if (!isColumnSearchable) {
  continue;
  }
- Expression<String> expression = getExpression(root, column.getData());
 
  if (filterValue.contains(OR_SEPARATOR)) {
  // the filter contains multiple values, add a 'WHERE .. IN' clause
@@ -59,18 +60,22 @@ public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuild
  for (int i = 0; i < values.length; i++) {
  booleanValues[i] = Boolean.valueOf(values[i]);
  }
- predicate = cb.and(predicate, expression.as(Boolean.class).in(booleanValues));
+ booleanExpression = getExpression(root, column.getData(), Boolean.class);
+ predicate = cb.and(predicate, booleanExpression.in(booleanValues));
  } else {
- predicate = cb.and(predicate, expression.in(Arrays.asList(values)));
+ stringExpression = getExpression(root, column.getData(), String.class);
+ predicate = cb.and(predicate, stringExpression.in(Arrays.asList(values)));
  }
  } else {
  // the filter contains only one value, add a 'WHERE .. LIKE' clause
  if (isBoolean(filterValue)) {
- predicate = cb.and(predicate,
- cb.equal(expression.as(Boolean.class), Boolean.valueOf(filterValue)));
+ booleanExpression = getExpression(root, column.getData(), Boolean.class);
+ predicate =
+ cb.and(predicate, cb.equal(booleanExpression, Boolean.valueOf(filterValue)));
  } else {
+ stringExpression = getExpression(root, column.getData(), String.class);
  predicate = cb.and(predicate,
- cb.like(cb.lower(expression), getLikeFilterValue(filterValue), ESCAPE_CHAR));
+ cb.like(cb.lower(stringExpression), getLikeFilterValue(filterValue), ESCAPE_CHAR));
  }
  }
  }
@@ -82,7 +87,7 @@ public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuild
  // add a 'WHERE .. LIKE' clause on each searchable column
  for (ColumnParameter column : input.getColumns()) {
  if (column.getSearchable()) {
- Expression<String> expression = getExpression(root, column.getData());
+ Expression<String> expression = getExpression(root, column.getData(), String.class);
 
  matchOneColumnPredicate = cb.or(matchOneColumnPredicate,
  cb.like(cb.lower(expression), getLikeFilterValue(globalFilterValue), ESCAPE_CHAR));
@@ -119,23 +124,23 @@ public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuild
  }
  }
 
- private static Expression<String> getExpression(Root<?> root, String columnData) {
+ private static <S> Expression<S> getExpression(Root<?> root, String columnData, Class<S> clazz) {
  if (!columnData.contains(ATTRIBUTE_SEPARATOR)) {
  // columnData is like "attribute" so nothing particular to do
- return root.get(columnData).as(String.class);
+ return root.get(columnData).as(clazz);
  }
  // columnData is like "joinedEntity.attribute" so add a join clause
  String[] values = columnData.split(ESCAPED_ATTRIBUTE_SEPARATOR);
  if (root.getModel().getAttribute(values[0])
  .getPersistentAttributeType() == PersistentAttributeType.EMBEDDED) {
  // with @Embedded attribute
- return root.get(values[0]).get(values[1]).as(String.class);
+ return root.get(values[0]).get(values[1]).as(clazz);
  }
  From<?, ?> from = root;
  for (int i = 0; i < values.length - 1; i++) {
  from = from.join(values[i], JoinType.LEFT);
  }
- return from.get(values[values.length - 1]).as(String.class);
+ return from.get(values[values.length - 1]).as(clazz);
  }
 
 }

src/test/java/org/springframework/data/jpa/datatables/Config.java

@@ -11,14 +11,15 @@
 import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.jpa.datatables.repository.DataTablesRepositoryFactoryBean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
@@ -32,26 +33,49 @@
 public class Config {
 
  @Bean
- public DataSource dataSource() throws SQLException {
+ @Profile({"default", "h2"})
+ public DataSource dataSource_H2() throws SQLException {
  return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build();
  }
 
+ @Bean
+ @Profile("mysql")
+ public DataSource dataSource_MySQL() throws SQLException {
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("com.mysql.jdbc.Driver");
+ dataSource.setUrl("jdbc:mysql://127.0.0.1/test");
+ dataSource.setUsername("root");
+ dataSource.setPassword("");
+ return dataSource;
+ }
+
+ @Bean
+ @Profile("pgsql")
+ public DataSource dataSource_PostgreSQL() throws SQLException {
+ DriverManagerDataSource dataSource = new DriverManagerDataSource();
+ dataSource.setDriverClassName("org.postgresql.Driver");
+ dataSource.setUrl("jdbc:postgresql://127.0.0.1/test");
+ dataSource.setUsername("postgres");
+ dataSource.setPassword("");
+ return dataSource;
+ }
+
  @Bean
  public PlatformTransactionManager transactionManager() throws SQLException {
  return new JpaTransactionManager();
  }
 
  @Bean
- public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLException {
+ public AbstractEntityManagerFactoryBean entityManagerFactory(DataSource dataSource)
+ throws SQLException {
 
  HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
- jpaVendorAdapter.setDatabase(Database.H2);
  jpaVendorAdapter.setGenerateDdl(true);
 
  LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean();
  bean.setJpaVendorAdapter(jpaVendorAdapter);
  bean.setPackagesToScan(Config.class.getPackage().getName());
- bean.setDataSource(dataSource());
+ bean.setDataSource(dataSource);
 
  Properties jpaProperties = new Properties();
  jpaProperties.setProperty(Environment.HBM2DDL_AUTO, "create-drop");
@@ -64,8 +88,9 @@ public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLExcepti
  }
 
  @Bean
- public SessionFactory sessionFactory() throws SQLException {
- return ((HibernateEntityManagerFactory) entityManagerFactory().getObject()).getSessionFactory();
+ public SessionFactory sessionFactory(AbstractEntityManagerFactoryBean entityManagerFactory)
+ throws SQLException {
+ return ((HibernateEntityManagerFactory) entityManagerFactory.getObject()).getSessionFactory();
  }
 
 }

src/test/java/org/springframework/data/jpa/datatables/model/Bill.java

@@ -3,8 +3,10 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "bill")
 public class Bill {
 
  @Id

src/test/java/org/springframework/data/jpa/datatables/model/Game.java

@@ -4,8 +4,10 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "game")
 public class Game {
 
  @Id

src/test/java/org/springframework/data/jpa/datatables/model/Home.java

@@ -6,8 +6,10 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "home")
 public class Home {
 
  @Id

src/test/java/org/springframework/data/jpa/datatables/model/User.java

@@ -7,8 +7,10 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
+@Table(name = "users")
 public class User {
 
  @Id

src/test/resources/init.sql

@@ -52,7 +52,7 @@ INSERT INTO home (id, town) VALUES
  (3, 'town2'),
  (4, 'town3');
 
-INSERT INTO user (id, username, role, status, id_home, visible) VALUES
+INSERT INTO users (id, username, role, status, id_home, visible) VALUES
  (1, 'john0', 'ADMIN', 'ACTIVE', null, true),
  (2, 'john1', 'AUTHOR', 'BLOCKED', null, false),
  (3, 'john2', 'USER', 'ACTIVE', null, true),