fix: check MariaDB json in result set metadata

JanssenProject · Jan 26, 2022 · 96b6772 · 96b6772
1 parent edf5a8d
commit 96b6772
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlConnectionProvider.java b/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlConnectionProvider.java
@@ -435,5 +435,9 @@ public DatabaseMetaData getDatabaseMetaData() {
         	throw new ConnectionException("Failed to get database metadata", ex);
         }
 	}
-
+
+	public boolean isMariaDb() {
+		return mariaDb;
+	}
+
 }
diff --git a/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java b/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java
@@ -83,6 +83,8 @@ public class SqlOperationServiceImpl implements SqlOperationService {
 
 	private boolean disableAttributeMapping = false;
 
+	private boolean mariaDb = false;
+
 	private PersistenceExtension persistenceExtension;
 
 	private SQLQueryFactory sqlQueryFactory;
@@ -104,6 +106,7 @@ public SqlOperationServiceImpl(Properties props, SqlConnectionProvider connectio
 	private void init() {
 		this.sqlQueryFactory = connectionProvider.getSqlQueryFactory();
 		this.schemaName = connectionProvider.getSchemaName();
+		this.mariaDb = connectionProvider.isMariaDb();
 	}
 
     @Override
@@ -874,6 +877,10 @@ private boolean isJsonColumn(String tableName, String columnTypeName) {
 			return false;
 		}
 
+		if (mariaDb && "longtext".equals(columnTypeName)) {
+			return true;
+		}
+
 //		String engineType = connectionProvider.getEngineType(tableName);
 //		if ((engineType != null) && engineType.equalsIgnoreCase("mariadb")) {
 //			return "longtext".equals(columnTypeName);