Fix postgres key columns equality tests for serial type

arkanovicz · Aug 1, 2022 · 52c6c60 · 52c6c60
1 parent 75e54db
commit 52c6c60
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/modality-api-client/pom.xml b/modality-api-client/pom.xml
@@ -22,7 +22,7 @@ under the License.
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-api-client</artifactId>

diff --git a/modality-core/pom.xml b/modality-core/pom.xml
@@ -24,7 +24,7 @@
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-core</artifactId>

diff --git a/modality-core/src/main/java/com/republicate/modality/impl/BaseEntity.java b/modality-core/src/main/java/com/republicate/modality/impl/BaseEntity.java
@@ -329,9 +329,9 @@ private void addKeyMapToAttribute(Attribute attribute)
  String sqlPKColName = sqlPrimaryKey.get(i);
  attribute.addQueryPart(quoteIdentifier(sqlPKColName) + " = ");
  attribute.addParameter(translateColumnName(sqlPKColName));
- if (model.getDriverInfos().isStrictColumnTypes() && model.getDriverInfos().hasColumnMarkers())
+ Column col = getColumn(sqlPKColName);
+ if (model.getDriverInfos().isStrictColumnTypes() && model.getDriverInfos().hasColumnMarkers() && !"serial".equals(col.typeName))
  {
- Column col = getColumn(sqlPKColName);
  attribute.addQueryPart("::" + col.typeName);
  }
  }

diff --git a/modality-examples/modality-example-bookshelf/pom.xml b/modality-examples/modality-example-bookshelf/pom.xml
@@ -22,7 +22,7 @@ under the License.
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality-examples</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-example-bookshelf</artifactId>

diff --git a/modality-examples/pom.xml b/modality-examples/pom.xml
@@ -22,7 +22,7 @@ under the License.
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-examples</artifactId>

diff --git a/modality-webapp-auth/pom.xml b/modality-webapp-auth/pom.xml
@@ -22,7 +22,7 @@ under the License.
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-webapp-auth</artifactId>

diff --git a/modality-webapp/pom.xml b/modality-webapp/pom.xml
@@ -22,7 +22,7 @@ under the License.
  <parent>
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>modality-webapp</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ under the License.
 
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
 
  <packaging>pom</packaging>
  <name>${project.groupId}:${project.artifactId}</name>

diff --git a/velocity-tools-model/pom.xml b/velocity-tools-model/pom.xml
@@ -23,7 +23,7 @@ under the License.
  <groupId>com.republicate.modality</groupId>
  <artifactId>modality</artifactId>
 
- <version>2.1.3</version>
+ <version>2.1.4</version>
  </parent>
 
  <artifactId>velocity-tools-model</artifactId>