Work around connections not being closed by adding a new database prefix option

mrigger · mrigger · commit b24af26bd989 · 2020-08-25T21:47:03.000+02:00
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -453,7 +453,7 @@ private String formatInteger(long intValue) {
         ExecutorService execService = Executors.newFixedThreadPool(options.getNumberConcurrentThreads());
         DBMSExecutorFactory<?, ?> executorFactory = nameToProvider.get(jc.getParsedCommand());
         for (int i = 0; i < options.getTotalNumberTries(); i++) {
-            final String databaseName = "database" + i;
+            final String databaseName = options.getDatabasePrefix() + i;
             final long seed;
             if (options.getRandomSeed() == -1) {
                 seed = System.currentTimeMillis() + i;
diff --git a/src/sqlancer/MainOptions.java b/src/sqlancer/MainOptions.java
@@ -88,6 +88,9 @@ public class MainOptions {
     @Parameter(names = "--constant-cache-size", description = "Specifies the size of the constant cache. This option only takes effect when constant caching is enabled")
     private int constantCacheSize = 100; // NOPMD
 
+    @Parameter(names = "--database-prefix", description = "The prefix used for each database created")
+    private String databasePrefix = "database"; // NOPMD
+
     public int getMaxExpressionDepth() {
         return maxExpressionDepth;
     }
@@ -197,4 +200,8 @@ public boolean isHelp() {
         return help;
     }
 
+    public String getDatabasePrefix() {
+        return databasePrefix;
+    }
+
 }
diff --git a/test/sqlancer/dbms/TestPostgres.java b/test/sqlancer/dbms/TestPostgres.java
@@ -27,7 +27,9 @@ public void testPQS() {
         assertEquals(0,
                 Main.executeMain(new String[] { "--random-seed", "0", "--timeout-seconds", TestConfig.SECONDS,
                         "--num-threads", "4", "--num-queries", TestConfig.NUM_QUERIES, "--random-string-generation",
-                        "ALPHANUMERIC_SPECIALCHAR", "postgres", "--test-collations", "false", "--oracle", "pqs" }));
+                        "ALPHANUMERIC_SPECIALCHAR", "--database-prefix",
+                        "pqsdb" /* Workaround for connections not being closed */, "postgres", "--test-collations",
+                        "false", "--oracle", "pqs" }));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ public class MainOptions {`
`88`	`88`	`@Parameter(names = "--constant-cache-size", description = "Specifies the size of the constant cache. This option only takes effect when constant caching is enabled")`
`89`	`89`	`private int constantCacheSize = 100; // NOPMD`
`90`	`90`
	`91`	`+ @Parameter(names = "--database-prefix", description = "The prefix used for each database created")`
	`92`	`+ private String databasePrefix = "database"; // NOPMD`
	`93`	`+`
`91`	`94`	`public int getMaxExpressionDepth() {`
`92`	`95`	`return maxExpressionDepth;`
`93`	`96`	`}`
`@@ -197,4 +200,8 @@ public boolean isHelp() {`
`197`	`200`	`return help;`
`198`	`201`	`}`
`199`	`202`
	`203`	`+ public String getDatabasePrefix() {`
	`204`	`+ return databasePrefix;`
	`205`	`+ }`
	`206`	`+`
`200`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ public void testPQS() {`
`27`	`27`	`assertEquals(0,`
`28`	`28`	`Main.executeMain(new String[] { "--random-seed", "0", "--timeout-seconds", TestConfig.SECONDS,`
`29`	`29`	`"--num-threads", "4", "--num-queries", TestConfig.NUM_QUERIES, "--random-string-generation",`
`30`		`- "ALPHANUMERIC_SPECIALCHAR", "postgres", "--test-collations", "false", "--oracle", "pqs" }));`
	`30`	`+ "ALPHANUMERIC_SPECIALCHAR", "--database-prefix",`
	`31`	`+ "pqsdb" /* Workaround for connections not being closed */, "postgres", "--test-collations",`
	`32`	`+ "false", "--oracle", "pqs" }));`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`}`