Re-enable checkstyle and fix code-style

Author: mbellade

ci/build.sh

@@ -76,10 +76,12 @@ elif [ "$RDBMS" == "informix" ]; then
   goal="-Pdb=informix"
 fi
 
-# Disable checkstyle
-#if [ -n "$goal" ]; then
-goal="$goal -x checkstyleMain -DPOPULATE_REMOTE=true"
-#fi
+# Only run checkstyle in the H2 build,
+# so that CI jobs give a more complete report
+# and developers can fix code style and non-H2 DB tests in parallel.
+if [ -n "$goal" ]; then
+  goal="$goal -x checkstyleMain -DPOPULATE_REMOTE=true"
+fi
 
 function logAndExec() {
   echo 1>&2 "Executing:" "${@}"

hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java

@@ -312,15 +312,17 @@ public String[] getSqlDropStrings(UserDefinedArrayType userDefinedType, Metadata
 	private String buildDropTypeSqlString(String arrayTypeName) {
 		if ( dialect.supportsIfExistsBeforeTypeName() ) {
 			return "drop type if exists " + arrayTypeName + " force";
-		} else {
+		}
+		else {
 			return "drop type " + arrayTypeName + " force";
 		}
 	}
 
 	private String buildDropFunctionSqlString(String functionTypeName) {
 		if ( supportsIfExistsBeforeFunctionName() ) {
 			return "drop function if exists " + functionTypeName;
-		} else {
+		}
+		else {
 			return "drop function " + functionTypeName;
 		}
 	}