Kotlin: Generate dbscheme deterministically

igfoo · igfoo · commit dbef42120407 · 2022-05-10T18:45:52.000+01:00
diff --git a/java/kotlin-extractor/generate_dbscheme.py b/java/kotlin-extractor/generate_dbscheme.py
@@ -42,7 +42,6 @@ def upperFirst(string):
             s = type_hierarchy.get(typ, set())
             s.add(name)
             type_hierarchy[typ] = s
-    kt.write('\n')
 
     # tables
     for relname, body in re.findall('\n([\w_]+)(\([^)]*\))',
@@ -84,11 +83,11 @@ def upperFirst(string):
         kt.write(')\\n")\n')
         kt.write('}\n')
 
-    for typ in type_hierarchy:
+    for typ in sorted(type_hierarchy):
         kt.write('sealed interface Db' + upperFirst(typ))
-        names = type_hierarchy[typ]
+        names = sorted(type_hierarchy[typ])
         if names:
             kt.write(': ')
-            kt.write(', '.join(map(lambda name: 'Db' + upperFirst(name), type_hierarchy[typ])))
+            kt.write(', '.join(map(lambda name: 'Db' + upperFirst(name), names)))
         kt.write(' {}\n')
 
