logger: suffixing queries with ';', indentation of linebreaks within queries

querybuilder/drivers/sql/tokenizer.py

@@ -248,7 +248,8 @@ class Tokenizer:
         columns = (TkInd(),) + self.tokenize_list(tcomma, columns, accolate=True)
 
         return (
-            (select, columns),
+            (select, TkInd(), columns),
+            TkInd(),
             from_,
             where,
             (groupby, TkInd(), having),

querybuilder/tests/drivers/sql/test_tokenizer.py

@@ -412,6 +412,7 @@ class TestTokenizer:
                     TkInd(),
                     TkStr(qbtoken.Token.Keyword, "DISTINCT").to_seq(),
                 ),
+                TkInd(),
                 (
                     TkInd(),
                     columns[0] + sepseq,
@@ -419,6 +420,7 @@ class TestTokenizer:
                     columns[2],
                 ),
             ),
+            TkInd(),
             from_,
             where,
             (

querybuilder/utils/logger.py

@@ -19,7 +19,7 @@ import querybuilder.utils.typing as qbtyping
 import querybuilder.formatting.formatter as qbformatter
 from querybuilder.formatting import token as qbtoken
 from querybuilder.queries.queries import Query
-from querybuilder.formatting.tokentree import TkStr
+from querybuilder.formatting.tokentree import TkStr, TkSeq
 import querybuilder
 
 
@@ -96,12 +96,14 @@ class Logger:
         self.query_log.append(query)
 
         tokens = query.tokenize(self.tokenizer)
+        finaltokens: tuple[TkSeq, ...] = ()
         if parameters:
-            finaltokens = (
+            finaltokens += (
                 TkStr(qbtoken.Punctuation.Linebreak, "\n").to_seq(),
                 TkStr(qbtoken.Comment.Args, f"  --  ↖{parameters}").to_seq(),
             )
-            tokens = (tokens, finaltokens)
+        finaltokens += (TkStr(qbtoken.Punctuation.Semicolon, ";").to_seq(),)
+        tokens = (tokens, finaltokens)
         self.formatter.format(tokens, self.file)
         self.file.write("\n")