sysdb: Only try to reconnect before executing a command or on an empty line.

[sysdb.git] / src / tools / sysdb / scanner.l

diff --git a/src/tools/sysdb/scanner.l b/src/tools/sysdb/scanner.l
index 3ec4b04f32f2ce302064866f63b0cd7e15910594..16defa61859085dc20dad932c8f812986af494e3 100644 (file)
--- a/src/tools/sysdb/scanner.l
+++ b/src/tools/sysdb/scanner.l
@@ -26,17 +26,33 @@
  */
 
 %{
+
+/*
+ * This is a simplified version of frontend/scanner.l. The only purpose is to
+ * find queries (terminated by semicolon).
+ */
+
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "tools/sysdb/input.h"
 
+#include <string.h>
+
 #ifdef YY_INPUT
 #      undef YY_INPUT
 #endif
 #define YY_INPUT(buf, result, max_size) \
+       sdb_input_readline((buf), (size_t *)&(result), (max_size))
+
+#define APPEND() \
        do { \
-               sdb_input_readline(sdb_input, (buf), &(result), (max_size)); \
+               if (! isspace((int)yytext[0])) \
+                       sysdb_input->have_input = 1; \
+               sysdb_input->query_len += strlen(yytext); \
        } while (0)
 
-static sdb_input_t *sdb_input;
 %}
 
 %option interactive
@@ -47,17 +63,57 @@ static sdb_input_t *sdb_input;
 %option verbose
 %option warn
 
-%%
+%x CSC
+
+newline                        (\n|\r\n)
+simple_comment ("--"[^\n\r]*)
 
-. { /* do nothing */ }
+/*
+ * C style comments
+ */
+csc_start      \/\*
+csc_inside     ([^*/]+|[^*]\/|\*[^/])
+csc_end                \*\/
+
+/*
+ * Strings.
+ */
+/* TODO: fully support SQL strings */
+string         ('([^']|'')*')
 
 %%
 
-void
-sdb_input_set(sdb_input_t *new_input)
-{
-       sdb_input = new_input;
-} /* sdb_input_set */
+       /*
+        * Here, we only care about syntax elements that may include semicolons
+        * and escape their meaning as a query terminator.
+        */
+
+{simple_comment}       { APPEND(); }
+
+{csc_start}                    { APPEND(); BEGIN(CSC); }
+<CSC>{csc_inside}      { APPEND(); }
+<CSC>{csc_end}         { APPEND(); BEGIN(INITIAL); }
+<CSC><<EOF>>           { return -1; }
+
+{string}                       { APPEND(); }
+
+       /*
+        * The following rules are specific to the command line tool.
+        */
+
+";\n"          { APPEND(); sdb_input_exec_query(); }
+";"                    { APPEND(); sdb_input_exec_query(); }
+
+{newline}      {
+                               APPEND();
+                               if (! sysdb_input->have_input)
+                                       /* give the input module a chance to do stuff on empty lines */
+                                       sdb_input_exec_query();
+                       }
+
+.                      { APPEND(); }
+
+%%
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */