Lps 107396

modules/apps/portal/portal-dao-test/src/testIntegration/java/com/liferay/portal/dao/db/test/DBInspectorTest.java

@@ -215,7 +215,7 @@ public void testHasTableLowerCase() throws Exception {
 
 	@Test
 	public void testHasTableNonexisting() throws Exception {
-		Assert.assertTrue(!_dbInspector.hasTable(_TABLE_NAME_NONEXISTING));
+		Assert.assertFalse(_dbInspector.hasTable(_TABLE_NAME_NONEXISTING));
 	}
 
 	@Test
@@ -228,6 +228,17 @@ public void testHasTableUpperCase() throws Exception {
 			_dbInspector.hasTable(StringUtil.toUpperCase(_TABLE_NAME)));
 	}
 
+	@Test
+	public void testIsNotNullColumnNullable() throws Exception {
+		Assert.assertTrue(_dbInspector.isNullable(_TABLE_NAME, "nilColumn"));
+	}
+
+	@Test
+	public void testIsNullableColumnNullable() throws Exception {
+		Assert.assertFalse(
+			_dbInspector.isNullable(_TABLE_NAME, "notNilColumn"));
+	}
+
 	private static final String _COLUMN_NAME = "id";
 
 	private static final String _COLUMN_NAME_NONEXISTING = "nonexistingColumn";

modules/apps/portal/portal-dao-test/src/testIntegration/java/com/liferay/portal/dao/db/test/DBTest.java

@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.dao.db.test;
+
+import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
+import com.liferay.petra.string.StringBundler;
+import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.dao.db.DB;
+import com.liferay.portal.kernel.dao.db.DBInspector;
+import com.liferay.portal.kernel.dao.db.DBManagerUtil;
+import com.liferay.portal.kernel.dao.jdbc.DataAccess;
+import com.liferay.portal.kernel.test.rule.AggregateTestRule;
+import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+
+import java.sql.Connection;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Alberto Chaparro
+ */
+@RunWith(Arquillian.class)
+public class DBTest {
+
+	@ClassRule
+	@Rule
+	public static final AggregateTestRule aggregateTestRule =
+		new LiferayIntegrationTestRule();
+
+	@Before
+	public void setUp() throws Exception {
+		_connection = DataAccess.getConnection();
+
+		_dbInspector = new DBInspector(_connection);
+
+		_db = DBManagerUtil.getDB();
+
+		_db.runSQL(
+			StringBundler.concat(
+				"create table ", _TABLE_NAME, "(id LONG not null primary key, ",
+				"notNilColumn VARCHAR(75) not null, nilColumn VARCHAR(75) ",
+				"null)"));
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		_db.runSQL("drop table " + _TABLE_NAME);
+
+		DataAccess.cleanUp(_connection);
+	}
+
+	@Test
+	public void testAlterColumnTypeAlterSize() throws Exception {
+		_db.runSQL(_getAlterColumType("notNilColumn", "VARCHAR(200) not null"));
+
+		Assert.assertTrue(
+			_dbInspector.hasColumnType(
+				_TABLE_NAME, "notNilColumn", "VARCHAR(200) not null"));
+	}
+
+	@Test
+	public void testAlterColumnTypeChangeToNotNull() throws Exception {
+		_db.runSQL(_getAlterColumType("nilColumn", "VARCHAR(75) not null"));
+
+		Assert.assertTrue(
+			_dbInspector.hasColumnType(
+				_TABLE_NAME, "nilColumn", "VARCHAR(75) not null"));
+	}
+
+	@Test
+	public void testAlterColumnTypeChangeToNull() throws Exception {
+		_db.runSQL(_getAlterColumType("notNilColumn", "VARCHAR(75) null"));
+
+		Assert.assertTrue(
+			_dbInspector.hasColumnType(
+				_TABLE_NAME, "notNilColumn", "VARCHAR(75) null"));
+	}
+
+	@Test
+	public void testAlterColumnTypeNoChangesNotNull() throws Exception {
+		_db.runSQL(_getAlterColumType("notNilColumn", "VARCHAR(75) not null"));
+
+		Assert.assertTrue(
+			_dbInspector.hasColumnType(
+				_TABLE_NAME, "notNilColumn", "VARCHAR(75) not null"));
+	}
+
+	@Test
+	public void testAlterColumnTypeNoChangesNull() throws Exception {
+		_db.runSQL(_getAlterColumType("nilColumn", "VARCHAR(75) null"));
+
+		Assert.assertTrue(
+			_dbInspector.hasColumnType(
+				_TABLE_NAME, "nilColumn", "VARCHAR(75) null"));
+	}
+
+	private String _getAlterColumType(String columnName, String newType) {
+		StringBundler sb = new StringBundler(6);
+
+		sb.append("alter_column_type ");
+		sb.append(_TABLE_NAME);
+		sb.append(StringPool.SPACE);
+		sb.append(columnName);
+		sb.append(StringPool.SPACE);
+		sb.append(newType);
+
+		return sb.toString();
+	}
+
+	private static final String _TABLE_NAME = "DBTest";
+
+	private Connection _connection;
+	private DB _db;
+	private DBInspector _dbInspector;
+
+}

modules/dxp/apps/portal/portal-dao-db/src/main/java/com/liferay/portal/dao/db/DB2DB.java

@@ -21,6 +21,7 @@
 import com.liferay.portal.kernel.io.unsync.UnsyncBufferedReader;
 import com.liferay.portal.kernel.io.unsync.UnsyncStringReader;
 import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
 
 import java.io.IOException;
 
@@ -47,7 +48,7 @@ public DB2DB(int majorVersion, int minorVersion) {
 	}
 
 	@Override
-	public String buildSQL(String template) throws IOException {
+	public String buildSQL(String template) throws IOException, SQLException {
 		template = replaceTemplate(template);
 
 		template = reword(template);
@@ -85,11 +86,6 @@ public String getRecreateSQL(String databaseName) {
 		return sb.toString();
 	}
 
-	@Override
-	public boolean isSupportsAlterColumnType() {
-		return _SUPPORTS_ALTER_COLUMN_TYPE;
-	}
-
 	@Override
 	public boolean isSupportsInlineDistinct() {
 		return _SUPPORTS_INLINE_DISTINCT;
@@ -223,7 +219,7 @@ else if (lowerCaseTemplate.startsWith(ALTER_COLUMN_TYPE)) {
 	}
 
 	@Override
-	protected String reword(String data) throws IOException {
+	protected String reword(String data) throws IOException, SQLException {
 		try (UnsyncBufferedReader unsyncBufferedReader =
 				new UnsyncBufferedReader(new UnsyncStringReader(data))) {
 
@@ -240,6 +236,35 @@ protected String reword(String data) throws IOException {
 							"@new-column@;",
 						REWORD_TEMPLATE, template);
 				}
+				else if (line.startsWith(ALTER_COLUMN_TYPE)) {
+					String[] template = buildColumnTypeTokens(line);
+
+					line = StringUtil.replace(
+						"alter table @table@ alter column @old-column@ set " +
+							"data type @type@;",
+						REWORD_TEMPLATE, template);
+
+					String nullable = template[template.length - 1];
+
+					if (!Validator.isBlank(nullable)) {
+						String nullableAlter;
+
+						if (nullable.equals("not null")) {
+							nullableAlter = StringUtil.replace(
+								"alter table @table@ alter column " +
+									"@old-column@ set not null;",
+								REWORD_TEMPLATE, template);
+						}
+						else {
+							nullableAlter = StringUtil.replace(
+								"alter table @table@ alter column " +
+									"@old-column@ drop not null;",
+								REWORD_TEMPLATE, template);
+						}
+
+						runSQL(nullableAlter);
+					}
+				}
 				else if (line.startsWith(ALTER_TABLE_NAME)) {
 					String[] template = buildTableNameTokens(line);
 
@@ -284,8 +309,6 @@ private String _removeNull(String content) {
 		Types.INTEGER, Types.BIGINT, Types.VARCHAR, Types.CLOB, Types.VARCHAR
 	};
 
-	private static final boolean _SUPPORTS_ALTER_COLUMN_TYPE = false;
-
 	private static final boolean _SUPPORTS_INLINE_DISTINCT = false;
 
 	private static final boolean _SUPPORTS_SCROLLABLE_RESULTS = false;

modules/dxp/apps/portal/portal-dao-db/src/main/java/com/liferay/portal/dao/db/OracleDB.java

@@ -16,13 +16,15 @@
 
 import com.liferay.petra.string.StringBundler;
 import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.dao.db.DBInspector;
 import com.liferay.portal.kernel.dao.db.DBType;
 import com.liferay.portal.kernel.dao.db.Index;
 import com.liferay.portal.kernel.dao.jdbc.DataAccess;
 import com.liferay.portal.kernel.io.unsync.UnsyncBufferedReader;
 import com.liferay.portal.kernel.io.unsync.UnsyncStringReader;
 import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
 
 import java.io.IOException;
 
@@ -49,7 +51,7 @@ public OracleDB(int majorVersion, int minorVersion) {
 	}
 
 	@Override
-	public String buildSQL(String template) throws IOException {
+	public String buildSQL(String template) throws IOException, SQLException {
 		template = replaceTemplate(template);
 		template = reword(template);
 		template = StringUtil.replace(
@@ -154,6 +156,16 @@ protected String[] getTemplate() {
 		return _ORACLE;
 	}
 
+	protected boolean isNullable(String tableName, String columnName)
+		throws SQLException {
+
+		try (Connection con = DataAccess.getConnection()) {
+			DBInspector dbInspector = new DBInspector(con);
+
+			return dbInspector.isNullable(tableName, columnName);
+		}
+	}
+
 	@Override
 	protected String replaceTemplate(String template) {
 
@@ -181,7 +193,7 @@ protected String replaceTemplate(String template) {
 	}
 
 	@Override
-	protected String reword(String data) throws IOException {
+	protected String reword(String data) throws IOException, SQLException {
 		try (UnsyncBufferedReader unsyncBufferedReader =
 				new UnsyncBufferedReader(new UnsyncStringReader(data))) {
 
@@ -201,9 +213,25 @@ protected String reword(String data) throws IOException {
 				else if (line.startsWith(ALTER_COLUMN_TYPE)) {
 					String[] template = buildColumnTypeTokens(line);
 
+					String nullable = template[template.length - 1];
+
+					if (!Validator.isBlank(nullable)) {
+						boolean currentNullable = isNullable(
+							template[0], template[1]);
+
+						if ((nullable.equals("null") && currentNullable) ||
+							(nullable.equals("not null") && !currentNullable)) {
+
+							nullable = StringPool.BLANK;
+						}
+					}
+
 					line = StringUtil.replace(
-						"alter table @table@ modify @old-column@ @type@;",
+						"alter table @table@ modify @old-column@ @type@ " +
+							nullable + ";",
 						REWORD_TEMPLATE, template);
+
+					line = StringUtil.replace(line, " ;", ";");
 				}
 				else if (line.startsWith(ALTER_TABLE_NAME)) {
 					String[] template = buildTableNameTokens(line);

modules/dxp/apps/portal/portal-dao-db/src/main/java/com/liferay/portal/dao/db/SQLServerDB.java

@@ -139,11 +139,6 @@ public String getRecreateSQL(String databaseName) {
 		return sb.toString();
 	}
 
-	@Override
-	public boolean isSupportsAlterColumnType() {
-		return _SUPPORTS_ALTER_COLUMN_TYPE;
-	}
-
 	@Override
 	public boolean isSupportsNewUuidFunction() {
 		return _SUPPORTS_NEW_UUID_FUNCTION;
@@ -181,8 +176,11 @@ else if (line.startsWith(ALTER_COLUMN_TYPE)) {
 					String[] template = buildColumnTypeTokens(line);
 
 					line = StringUtil.replace(
-						"alter table @table@ alter column @old-column@ @type@;",
+						"alter table @table@ alter column @old-column@ " +
+							"@type@ @nullable@;",
 						REWORD_TEMPLATE, template);
+
+					line = StringUtil.replace(line, " ;", ";");
 				}
 				else if (line.startsWith(ALTER_TABLE_NAME)) {
 					String[] template = buildTableNameTokens(line);
@@ -224,12 +222,10 @@ else if (line.contains(DROP_INDEX)) {
 
 	private static final int[] _SQL_TYPES = {
 		Types.LONGVARBINARY, Types.LONGVARBINARY, Types.BIT, Types.TIMESTAMP,
-		Types.DOUBLE, Types.INTEGER, Types.BIGINT, Types.LONGVARCHAR,
-		Types.LONGVARCHAR, Types.VARCHAR
+		Types.DOUBLE, Types.INTEGER, Types.BIGINT, Types.NVARCHAR,
+		Types.NVARCHAR, Types.NVARCHAR
 	};
 
-	private static final boolean _SUPPORTS_ALTER_COLUMN_TYPE = false;
-
 	private static final boolean _SUPPORTS_NEW_UUID_FUNCTION = true;
 
 }

modules/dxp/apps/portal/portal-dao-db/src/main/java/com/liferay/portal/dao/db/SybaseDB.java

@@ -172,8 +172,11 @@ else if (line.startsWith(ALTER_COLUMN_TYPE)) {
 					String[] template = buildColumnTypeTokens(line);
 
 					line = StringUtil.replace(
-						"alter table @table@ modify @old-column@ @type@;",
+						"alter table @table@ modify @old-column@ @type@ " +
+							"@nullable@;",
 						REWORD_TEMPLATE, template);
+
+					line = StringUtil.replace(line, " ;", ";");
 				}
 				else if (line.startsWith(ALTER_TABLE_NAME)) {
 					String[] template = buildTableNameTokens(line);