SAK-48241 - Remove unneeded legacy XML columns in ContentHosting (cruft) (sakaiproject#11142)

Author: csev

kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/DbContentService.java

@@ -127,7 +127,6 @@ CREATE TABLE CONTENT_RESOURCE
 	FILE_PATH VARCHAR (128),
 	FILE_SIZE BIGINT,
 	RESOURCE_TYPE_ID VARCHAR (255),
-    XML LONGVARCHAR,
     BINARY_ENTITY LONGVARBINARY,
     CONSTRAINT CONTENT_RESOURCE_INDEX UNIQUE (RESOURCE_ID)
 -- for BINARY body, add BODY BINARY -- and drop the content_resource_body_binary tables -ggolden

kernel/kernel-impl/src/main/sql/hsqldb/sakai_content.sql

@@ -13,7 +13,6 @@ CREATE TABLE CONTENT_RESOURCE_DELETE
 	RESOURCE_TYPE_ID VARCHAR (255),
 	DELETE_DATE DATE,
 	DELETE_USERID VARCHAR (36),
-    XML LONGVARCHAR,
     BINARY_ENTITY LONGVARBINARY,
     CONSTRAINT CONTENT_RESOURCE_UUID_DELETE_I UNIQUE (RESOURCE_UUID)
 );

kernel/kernel-impl/src/main/sql/hsqldb/sakai_content_delete.sql

@@ -131,7 +131,6 @@ CREATE TABLE CONTENT_RESOURCE
 	FILE_PATH VARCHAR (128),
 	FILE_SIZE BIGINT,
 	RESOURCE_TYPE_ID VARCHAR (255),
-    XML LONGTEXT,
     BINARY_ENTITY BLOB
 
 -- for BLOB body, add BODY BLOB -- and drop the content_resource_body_binary tables -ggolden

kernel/kernel-impl/src/main/sql/mysql/sakai_content.sql

@@ -13,7 +13,6 @@ CREATE TABLE CONTENT_RESOURCE_DELETE
 	RESOURCE_TYPE_ID VARCHAR (255),
 	DELETE_DATE DATETIME,
 	DELETE_USERID VARCHAR (36),
-    XML LONGTEXT,
     BINARY_ENTITY BLOB
 );
 

kernel/kernel-impl/src/main/sql/mysql/sakai_content_delete.sql

@@ -132,7 +132,6 @@ CREATE TABLE CONTENT_RESOURCE
 	FILE_PATH VARCHAR2 (128),
 	FILE_SIZE NUMBER(18),
 	RESOURCE_TYPE_ID VARCHAR2 (255),
-    XML CLOB,
     BINARY_ENTITY BLOB
 -- for BLOB body, add BODY BLOB -- and drop the content_resource_body_binary tables -ggolden
 );

kernel/kernel-impl/src/main/sql/oracle/sakai_content.sql

@@ -13,7 +13,6 @@ CREATE TABLE CONTENT_RESOURCE_DELETE
 	RESOURCE_TYPE_ID VARCHAR2 (255),
 	DELETE_DATE DATE,
 	DELETE_USERID VARCHAR2 (36),
-    XML LONG,
     BINARY_ENTITY BLOB
 );
 

kernel/kernel-impl/src/main/sql/oracle/sakai_content_delete.sql

@@ -22,6 +22,10 @@
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Iterator;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.SQLException;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -47,6 +51,7 @@
 import org.sakaiproject.tool.api.Session;
 import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.util.BasicConfigItem;
+import org.sakaiproject.db.api.SqlService;
 
 @FixMethodOrder(NAME_ASCENDING)
 @Slf4j
@@ -264,4 +269,89 @@ public void testMimeDetection() throws Exception {
 			stream.close();
 		}
     }
+
+    @Test
+    public void testSqlSanity() {
+        ContentHostingService ch = getService(ContentHostingService.class);
+        SqlService m_sqlService = getService(SqlService.class);
+
+        // Make sure that the structure of the CONTENT_ tables passes the "modern schema" test
+        try {
+            Connection connection = m_sqlService.borrowConnection();
+            Statement statement = connection.createStatement();
+
+           try {
+                statement.execute("select BINARY_ENTITY from CONTENT_COLLECTION where COLLECTION_ID = 'does-not-exist' " );
+            } catch ( Exception ex ) {
+                Assert.fail();
+            }
+            try {
+                statement.execute("select XML from CONTENT_COLLECTION where COLLECTION_ID = 'does-not-exist' ");
+            } catch ( Exception ex ) {
+                Assert.fail();
+            }
+
+            try {
+                statement.execute("select BINARY_ENTITY from CONTENT_RESOURCE where RESOURCE_ID = 'does-not-exist' " );
+            } catch ( Exception ex ) {
+                Assert.fail();
+            }
+            try {
+                statement.execute("select XML from CONTENT_RESOURCE where RESOURCE_ID = 'does-not-exist' ");
+                Assert.fail();
+            } catch ( Exception ex ) {
+                // Pass
+            }
+            try {
+                statement.execute("select BINARY_ENTITY from CONTENT_RESOURCE_DELETE where RESOURCE_ID = 'does-not-exist' " );
+            } catch ( Exception ex ) {
+                Assert.fail();
+            }
+            try {
+                statement.execute("select XML from CONTENT_RESOURCE_DELETE where RESOURCE_ID = 'does-not-exist' ");
+                Assert.fail();
+            } catch ( Exception ex ) {
+                // pass
+            }
+
+            // Yes, these are a bit less than exciting, post autoDDL - but what they heck -
+            // they should not fail and be correct
+            checkCount("select count(*) from CONTENT_COLLECTION where BINARY_ENTITY IS NULL ", 0);
+            checkCount("select count(*) from CONTENT_RESOURCE where BINARY_ENTITY IS NULL ", 0);
+            checkCount("select count(*) from CONTENT_RESOURCE_DELETE where BINARY_ENTITY IS NULL ", 0);
+
+            checkCount("select count(*) from CONTENT_COLLECTION where XML IS NOT NULL ", 0);
+
+        } catch ( Exception ex ) {
+            Assert.fail();
+        }
+    }
+
+    protected void checkCount(String sql, int expected) throws Exception
+    {
+
+        SqlService m_sqlService = getService(SqlService.class);
+        List list = m_sqlService.dbRead(sql, null, null);
+        if (list == null) Assert.fail("Nothing returned for: "+sql);
+
+        Iterator iter = list.iterator();
+        if (iter.hasNext())
+        {
+            Object val = null;
+            try
+            {
+                val = iter.next();
+                Integer found = Integer.parseInt((String) val);
+                if ( found == expected ) return;
+                Assert.fail("Mismatch expecting: " + expected + " found: " + found + " sql: "+sql);
+            }
+            catch (Exception ignore)
+            {
+                Assert.fail("Bad integer: " + val + " from: "+sql);
+            }
+        }
+        Assert.fail("Empty list for: "+sql);
+        return;
+    }
+
 }