LPD-66162 SF

Author: brianchandotcom

modules/apps/portal/portal-upgrade-test/src/testIntegration/java/com/liferay/portal/upgrade/data/cleanup/test/DatabaseTableAndColumnCaseDataCleanupPreupgradeProcessTest.java

@@ -73,20 +73,21 @@ public void tearDown() throws Exception {
 
 	@Test
 	public void testUpgrade() throws Exception {
-		ServiceComponent serviceComponent =
-			_serviceComponentLocalService.createServiceComponent(
-				RandomTestUtil.nextLong());
-
 		DBInspector dbInspector = new DBInspector(_connection);
 
-		String invalidTableName = "testTABLE";
 		String invalidColumnName = "testCOLUMN";
+		String invalidTableName = "testTABLE";
 
-		String testTableName = "TestTable";
-		String testColumnName = "testColumn";
+		ServiceComponent serviceComponent =
+			_serviceComponentLocalService.createServiceComponent(
+				RandomTestUtil.nextLong());
 
 		serviceComponent.setMvccVersion(0);
 		serviceComponent.setBuildNamespace("com.liferay.test.service.impl");
+
+		String testColumnName = "testColumn";
+		String testTableName = "TestTable";
+
 		serviceComponent.setData(
 			StringBundler.concat(
 				"<![CDATA[create table ", testTableName, " (	 \n",
@@ -100,7 +101,22 @@ public void testUpgrade() throws Exception {
 					getName(),
 				LoggerTestUtil.INFO)) {
 
-			_addTestTable(invalidTableName, invalidColumnName);
+			DBType dbType = DBManagerUtil.getDBType();
+
+			if (dbType == DBType.SQLSERVER) {
+				DBPartitionUtil.forEachCompanyId(
+					companyId -> _db.runSQL(
+						StringBundler.concat(
+							"create table [", invalidTableName, "] ([",
+							invalidColumnName, "] LONG)")));
+			}
+			else {
+				DBPartitionUtil.forEachCompanyId(
+					companyId -> _db.runSQL(
+						StringBundler.concat(
+							"create table `", invalidTableName, "` (`",
+							invalidColumnName, "` LONG)")));
+			}
 
 			upgrade();
 
@@ -145,36 +161,12 @@ public void testUpgrade() throws Exception {
 			DBPartitionUtil.forEachCompanyId(
 				companyId -> _db.runSQL(
 					"DROP_TABLE_IF_EXISTS(" + invalidTableName + ")"));
-
-			DBPartitionUtil.forEachCompanyId(
-				companyId -> _db.runSQL(
-					"DROP_TABLE_IF_EXISTS(" + testTableName + "_temp)"));
-
 			DBPartitionUtil.forEachCompanyId(
 				companyId -> _db.runSQL(
 					"DROP_TABLE_IF_EXISTS(" + testTableName + ")"));
-		}
-	}
-
-	private void _addTestTable(
-			String invalidTableName, String invalidColumnName)
-		throws Exception {
-
-		DBType dbType = DBManagerUtil.getDBType();
-
-		if (dbType == DBType.SQLSERVER) {
-			DBPartitionUtil.forEachCompanyId(
-				companyId -> _db.runSQL(
-					StringBundler.concat(
-						"create table [", invalidTableName, "] ([",
-						invalidColumnName, "] LONG)")));
-		}
-		else {
 			DBPartitionUtil.forEachCompanyId(
 				companyId -> _db.runSQL(
-					StringBundler.concat(
-						"create table `", invalidTableName, "` (`",
-						invalidColumnName, "` LONG)")));
+					"DROP_TABLE_IF_EXISTS(" + testTableName + "_temp)"));
 		}
 	}
 

portal-impl/src/com/liferay/portal/upgrade/data/cleanup/DatabaseTableAndColumnCaseDataCleanupPreupgradeProcess.java

@@ -93,9 +93,8 @@ protected void doUpgrade() throws Exception {
 			DBResourceUtil.getServiceComponentModuleColumnDefinitionsMap(
 				connection));
 
-		DatabaseMetaData databaseMetaData = connection.getMetaData();
-
 		Map<String, Map<String, String>> columnsMap = new TreeMap<>();
+		DatabaseMetaData databaseMetaData = connection.getMetaData();
 
 		for (String tableName : expectedTableNames) {
 			try (ResultSet resultSet = databaseMetaData.getColumns(
@@ -124,14 +123,14 @@ protected void doUpgrade() throws Exception {
 			Map<String, String> columnNames = columnsMap.get(tableName);
 
 			_validateColumnNamesCasing(
-				dbInspector, dbInspector.normalizeName(tableName),
-				columnDefinitions, columnNames);
+				dbInspector, columnDefinitions, columnNames,
+				dbInspector.normalizeName(tableName));
 		}
 	}
 
 	private void _validateColumnNamesCasing(
-			DBInspector dbInspector, String tableName,
-			List<String> columnDefinitions, Map<String, String> columnNames)
+			DBInspector dbInspector, List<String> columnDefinitions,
+			Map<String, String> columnNames, String tableName)
 		throws Exception {
 
 		if ((columnNames == null) || columnNames.isEmpty()) {

portal-kernel/src/com/liferay/portal/kernel/service/persistence/packageinfo

@@ -1 +1 @@
-version 32.0.0
+version 32.1.0