Add --dump-all-queries, printing queries as they are generated.

Author: anse1

README.org

@@ -80,6 +80,7 @@ The following options are currently supported:
 | =--dry-run=          | print queries instead of executing them                  |
 | =--max-queries=long= | terminate after generating this many queries             |
 | =--exclude-catalog=  | don't generate queries using catalog relations           |
+| =--dump-all-queries= | dump queries as they are generated                       |
 | =--dump-all-graphs=  | dump generated ASTs for debugging                        |
 | =--rng-state=string= | deserialize dumped rng state                             |
 

log.hh

@@ -20,6 +20,14 @@ struct logger {
   }
 };
 
+/// logger to dump all generated queries
+struct query_dumper : logger {
+  virtual void generated(prod &query) {
+       query.out(std::cout);
+       std::cout << ";" << std::endl;
+  }
+};
+
 /// logger for statistics collection
 struct stats_collecting_logger : logger {
   long queries = 0;

sqlsmith.cc

@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
   cerr << PACKAGE_NAME " " GITREV << endl;
 
   map<string,string> options;
-  regex optregex("--(help|log-to|verbose|target|sqlite|monetdb|version|dump-all-graphs|seed|dry-run|max-queries|rng-state|exclude-catalog)(?:=((?:.|\n)*))?");
+  regex optregex("--(help|log-to|verbose|target|sqlite|monetdb|version|dump-all-graphs|dump-all-queries|seed|dry-run|max-queries|rng-state|exclude-catalog)(?:=((?:.|\n)*))?");
 
   for(char **opt = argv+1 ;opt < argv+argc; opt++) {
     smatch match;
@@ -86,6 +86,7 @@ int main(int argc, char *argv[])
 #endif
       "    --log-to=connstr     log errors to postgres database" << endl <<
       "    --seed=int           seed RNG with specified int instead of PID" << endl <<
+      "    --dump-all-queries   print queries as they are generated" << endl <<
       "    --dump-all-graphs    dump generated ASTs" << endl <<
       "    --dry-run            print queries instead of executing them" << endl <<
       "    --exclude-catalog    don't generate queries using catalog relations" << endl <<
@@ -149,7 +150,10 @@ int main(int argc, char *argv[])
 
       if (options.count("dump-all-graphs"))
 	loggers.push_back(make_shared<ast_logger>());
-      
+
+      if (options.count("dump-all-queries"))
+	loggers.push_back(make_shared<query_dumper>());
+
       if (options.count("dry-run")) {
 	while (1) {
 	  shared_ptr<prod> gen = statement_factory(&scope);