Reintroduce sealed interfaces for generated DB types

tamasvajk · igfoo · commit cb406619cbb5 · 2022-05-10T19:51:04.000+01:00
diff --git a/java/kotlin-extractor/build.gradle b/java/kotlin-extractor/build.gradle
@@ -19,13 +19,17 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        // enable the below for building with kotlinVersion=1.4.32:
+        // languageVersion = "1.5"
     }
 }
 
 sourceSets {
     main {
         kotlin {
             excludes = ["utils/versions/v_1_4/*.kt"]
+            // change the above line to the below for building with kotlinVersion=1.4.32:
+            //excludes = ["utils/versions/default/*.kt"]
         }
     }
 }
diff --git a/java/kotlin-extractor/generate_dbscheme.py b/java/kotlin-extractor/generate_dbscheme.py
@@ -171,7 +171,7 @@ def genTable(kt, relname, columns, enum = None, kind = None, num = None, typ = N
                 genTable(kt, relname, columns, enum, kind, num, typ)
 
     for typ in sorted(supertypes):
-        kt.write('interface Db' + upperFirst(typ))
+        kt.write('sealed interface Db' + upperFirst(typ))
         # Sorting makes the output deterministic.
         names = sorted(supertypes[typ])
         if names:

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,17 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`19`	`19`	`kotlinOptions {`
`20`	`20`	`jvmTarget = "1.8"`
`21`	`21`	`freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"`
	`22`	`+ // enable the below for building with kotlinVersion=1.4.32:`
	`23`	`+ // languageVersion = "1.5"`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`sourceSets {`
`26`	`28`	`main {`
`27`	`29`	`kotlin {`
`28`	`30`	`excludes = ["utils/versions/v_1_4/*.kt"]`
	`31`	`+ // change the above line to the below for building with kotlinVersion=1.4.32:`
	`32`	`+ //excludes = ["utils/versions/default/*.kt"]`
`29`	`33`	`}`
`30`	`34`	`}`
`31`	`35`	`}`