Merge pull request #57 from hatunet/dev

closed #48 : Escape character should be added to PGSQL queries
easybest · Dec 23, 2016 · 6cfd863 · 6cfd863
2 parents a674308 + 8708d5d
commit 6cfd863
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/org/springframework/data/mybatis/repository/dialect/Dialect.java b/src/main/java/org/springframework/data/mybatis/repository/dialect/Dialect.java
@@ -108,6 +108,9 @@ public final String quote(String name) {
         }
     }
 
+    public String wrapTableName(String tableName) {
+        return tableName;
+    }
 
     public boolean supportsSequences() {
         return false;

diff --git a/src/main/java/org/springframework/data/mybatis/repository/dialect/PostgreSQLDialect.java b/src/main/java/org/springframework/data/mybatis/repository/dialect/PostgreSQLDialect.java
@@ -52,6 +52,11 @@ public PostgreSQLDialect() {
         super();
     }
 
+    @Override
+    public String wrapTableName(String tableName) {
+        return "\"" + tableName + "\"";
+    }
+
     @Override
     public String getDatabaseId() {
         return "postgresql";

diff --git a/...main/java/org/springframework/data/mybatis/repository/support/MybatisMapperGenerator.java b/...main/java/org/springframework/data/mybatis/repository/support/MybatisMapperGenerator.java
@@ -253,7 +253,7 @@ public void doWithPersistentProperty(PersistentProperty<?> pp) {
 
     public String buildFrom(boolean basic) {
         StringBuilder builder = new StringBuilder();
-        builder.append(persistentEntity.getTableName()).append(" ").append(quota(persistentEntity.getEntityName()));
+        builder.append(dialect.wrapTableName(persistentEntity.getTableName())).append(" ").append(quota(persistentEntity.getEntityName()));
         if (!basic) {
             builder.append(buildLeftOuterJoin());
         }
@@ -268,7 +268,7 @@ private String buildLeftOuterJoin() {
             public void doWithAssociation(Association<? extends PersistentProperty<?>> ass) {
                 if ((ass instanceof MybatisManyToOneAssociation)) {
                     final MybatisManyToOneAssociation association = (MybatisManyToOneAssociation) ass;
-                    builder.append(" left outer join ").append(association.getObversePersistentEntity().getTableName()).append(" ").append(quota(persistentEntity.getEntityName() + "." + association.getInverse().getName()))
+                    builder.append(" left outer join ").append(dialect.wrapTableName(association.getObversePersistentEntity().getTableName())).append(" ").append(quota(persistentEntity.getEntityName() + "." + association.getInverse().getName()))
                             .append(" on ").append(quota(persistentEntity.getEntityName())).append(".").append(association.getJoinColumnName())
                             .append("=").append(quota(persistentEntity.getEntityName() + "." + association.getInverse().getName())).append(".").append(association.getJoinReferencedColumnName());
                 }

diff --git a/...ringframework/data/mybatis/repository/support/MybatisSimpleRepositoryMapperGenerator.java b/...ringframework/data/mybatis/repository/support/MybatisSimpleRepositoryMapperGenerator.java
@@ -115,7 +115,7 @@ private String render() throws IOException {
         builder.append("<mapper namespace=\"" + domainClass.getName() + "\">");
 
         if (!isFragmentExist("TABLE_NAME")) {
-            builder.append("<sql id=\"TABLE_NAME\">" + persistentEntity.getTableName() + "</sql>");
+            builder.append("<sql id=\"TABLE_NAME\">" + dialect.wrapTableName(persistentEntity.getTableName()) + "</sql>");
         }
         if (dialect.supportsSequences()) {
             if (!isFragmentExist("SEQUENCE")) {
@@ -182,7 +182,7 @@ private void buildUpdateSQL(final StringBuilder builder) {
             return;
         }
         builder.append("<update id=\"_update\" parameterType=\"" + domainClass.getName() + "\" lang=\"XML\">");
-        builder.append("update ").append(persistentEntity.getTableName());
+        builder.append("update ").append(dialect.wrapTableName(persistentEntity.getTableName()));
         builder.append("<set>");
 
         persistentEntity.doWithProperties(new SimplePropertyHandler() {
@@ -356,7 +356,7 @@ private void buildFindByPager(StringBuilder builder) {
     }
 
     private void buildDeleteAll(StringBuilder builder) {
-        builder.append("<delete id=\"_deleteAll\">truncate table " + persistentEntity.getTableName() + " </delete>");
+        builder.append("<delete id=\"_deleteAll\">truncate table " +dialect.wrapTableName( persistentEntity.getTableName() )+ " </delete>");
     }
 
     private void buildDeleteById(final StringBuilder builder) {
@@ -558,7 +558,7 @@ private void buildInsertSQL(final StringBuilder builder) {
             IdentityColumnSupport identityColumnSupport = dialect.getIdentityColumnSupport();
             if (idProperty.getIdGenerationType() == IDENTITY || (idProperty.getIdGenerationType() == AUTO && identityColumnSupport.supportsIdentityColumns())) {
                 builder.append("<selectKey keyProperty=\"" + idProperty.getName() + "\" resultType=\"" + idProperty.getActualType().getName() + "\" order=\"AFTER\">");
-                builder.append(dialect.getIdentityColumnSupport().getIdentitySelectString(persistentEntity.getTableName(), idProperty.getColumnName(), idProperty.getJdbcType().TYPE_CODE));
+                builder.append(dialect.getIdentityColumnSupport().getIdentitySelectString(dialect.wrapTableName(persistentEntity.getTableName()), idProperty.getColumnName(), idProperty.getJdbcType().TYPE_CODE));
                 builder.append("</selectKey>");
             } else if (idProperty.getIdGenerationType() == SEQUENCE || (idProperty.getIdGenerationType() == AUTO && dialect.supportsSequences())) {
                 builder.append("<selectKey keyProperty=\"" + idProperty.getName() + "\" resultType=\"" + idProperty.getActualType().getName() + "\" order=\"BEFORE\">");
@@ -568,7 +568,7 @@ private void buildInsertSQL(final StringBuilder builder) {
         }
         builder.append("<![CDATA[");
 
-        builder.append("insert into ").append(persistentEntity.getTableName()).append("(");
+        builder.append("insert into ").append(dialect.wrapTableName(persistentEntity.getTableName())).append("(");
 
 
         persistentEntity.doWithProperties(new SimplePropertyHandler() {