1 files changed, 17 insertions, 27 deletions
diff --git a/ca/tests/sql-cleaner.py b/ca/tests/sql-cleaner.py
index ca88d456..c518b77b 100644
--- a/ca/tests/sql-cleaner.py
+++ b/ca/tests/sql-cleaner.py
@@ -19,43 +19,33 @@
 """
 
 import rpki.config
-import rpki.sql_schemas
 from rpki.mysql_import import MySQLdb
 
-cfg = rpki.config.parser(None, "yamltest", allow_missing = True)
+cfg = rpki.config.parser(section = "yamltest", allow_missing = True)
 
 for name in ("rpkid", "irdbd", "pubd"):
 
-  username = cfg.get("%s_sql_username" % name, name[:4])
-  password = cfg.get("%s_sql_password" % name, "fnord")
+    username = cfg.get("%s_sql_username" % name, name[:4])
+    password = cfg.get("%s_sql_password" % name, "fnord")
 
-  schema = []
-  for line in getattr(rpki.sql_schemas, name, "").splitlines():
-    schema.extend(line.partition("--")[0].split())
-  schema = " ".join(schema).strip(";").split(";")
-  schema = [statement.strip() for statement in schema if statement and "DROP TABLE" not in statement]
+    db = MySQLdb.connect(user = username, passwd = password)
+    cur = db.cursor()
 
-  db = MySQLdb.connect(user = username, passwd = password)
-  cur = db.cursor()
+    cur.execute("SHOW DATABASES")
 
-  cur.execute("SHOW DATABASES")
+    databases = [r[0] for r in cur.fetchall() if r[0][:4] == name[:4] and r[0][4:].isdigit()]
 
-  databases = [r[0] for r in cur.fetchall() if r[0][:4] == name[:4] and r[0][4:].isdigit()]
+    for database in databases:
 
-  for database in databases:
+        cur.execute("USE " + database)
 
-    cur.execute("USE " + database)
+        cur.execute("SHOW TABLES")
+        tables = [r[0] for r in cur.fetchall()]
 
-    cur.execute("SHOW TABLES")
-    tables = [r[0] for r in cur.fetchall()]
+        cur.execute("SET foreign_key_checks = 0")
+        for table in tables:
+            cur.execute("DROP TABLE %s" % table)
+        cur.execute("SET foreign_key_checks = 1")
 
-    cur.execute("SET foreign_key_checks = 0")
-    for table in tables:
-      cur.execute("DROP TABLE %s" % table)
-    cur.execute("SET foreign_key_checks = 1")
-
-    for statement in schema:
-      cur.execute(statement)
-
-  cur.close()
-  db.close()
+    cur.close()
+    db.close()