fix: EXPOSED-161 SQL Server syntax incorrectly allows CASCADE with dr…

…opSchema Using dropSchema() with cascade set to true in SQL Server throws a syntax excep> because cascade is not supported. Edit syntax to remove cascade. Add unit test.
JetBrains · Aug 30, 2023 · ad64e60 · ad64e60
1 parent 7c8d8a2
commit ad64e60
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/SQLServerDialect.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/SQLServerDialect.kt
@@ -312,13 +312,7 @@ open class SQLServerDialect : VendorDialect(dialectName, SQLServerDataTypeProvid
         appendIfNotNull(" AUTHORIZATION ", schema.authorization)
     }
 
-    override fun dropSchema(schema: Schema, cascade: Boolean): String = buildString {
-        append("DROP SCHEMA ", schema.identifier)
-
-        if (cascade) {
-            append(" CASCADE")
-        }
-    }
+    override fun dropSchema(schema: Schema, cascade: Boolean): String = "DROP SCHEMA ${schema.identifier}"
 
     override fun createIndex(index: Index): String {
         if (index.functions != null) {

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt
@@ -56,6 +56,20 @@ class SchemaTests : DatabaseTestsBase() {
         }
     }
 
+    @Test
+    fun testDropSchemaWithCascade() {
+        withDb {
+            if (currentDialect.supportsCreateSchema) {
+                val schema = Schema("TEST_SCHEMA")
+                SchemaUtils.createSchema(schema)
+                assertTrue(schema.exists())
+
+                SchemaUtils.dropSchema(schema, cascade = true)
+                assertFalse(schema.exists())
+            }
+        }
+    }
+
     @Test
     fun `table references table with same name in other database in mysql`() {
         withDb(listOf(TestDB.MYSQL, TestDB.MARIADB)) {