execsql2 2.13.2__py3-none-any.whl → 2.14.1__py3-none-any.whl

execsql/metacommands/dispatch.py

@@ -857,7 +857,7 @@ def build_dispatch_table() -> MetaCommandList:
         x_write_warnings,
     )
     mcl.add(
-        r"^\s*CONFIG\s+GUI_LEVEL\s+(?P<level>[0-2])\s*$",
+        r"^\s*CONFIG\s+GUI_LEVEL\s+(?P<level>[0-3])\s*$",
         x_gui_level,
         description="GUI_LEVEL",
         category="config_option",
@@ -1443,7 +1443,7 @@ def build_dispatch_table() -> MetaCommandList:
         ins_table_rxs(
             r'^\s*PROMPT\s+ENTER_SUB\s+(?P<match_str>~?\w+)\s+(?:(?P<password>PASSWORD)\s+)?MESSAGE\s+"(?P<message>([^"]|\n)*)"(?:\s+DISPLAY\s+',
             r")?(?:\s+TYPE\s+(?P<type>INT|FLOAT|BOOL|IDENT))?(?:\s+(?P<case>LCASE|UCASE))?"
-            r'(?:\s+INITIALLY\s+"(?P<initial>[^"]+)")?(?:\s+HELP\s+"(?P<help>[^+]+)")?\s*$',
+            r'(?:\s+INITIALLY\s+"(?P<initial>[^"]+)")?(?:\s+HELP\s+"(?P<help>[^"]+)")?\s*$',
         ),
         x_prompt_enter,
     )
@@ -1527,6 +1527,7 @@ def build_dispatch_table() -> MetaCommandList:
     # ------------------------------------------------------------------
     # PROMPT COMPARE / PROMPT ASK COMPARE
     # ------------------------------------------------------------------
+    # HELP before MESSAGE (documented order)
     mcl.add(
         ins_table_rxs(
             r"^\s*PROMPT\s+COMPARE\s+",
@@ -1555,6 +1556,33 @@ def build_dispatch_table() -> MetaCommandList:
         ),
         x_prompt_compare,
     )
+    # HELP after MESSAGE (alternate order)
+    mcl.add(
+        ins_table_rxs(
+            r"^\s*PROMPT\s+COMPARE\s+",
+            ins_table_rxs(
+                r"(?:\s+IN\s+(?P<alias1>\w+))?\s+(?P<orient>AND|BESIDE)\s+",
+                r'(?:\s+IN\s+(?P<alias2>\w+))?\s+(?:PK|KEY)\s*\((?P<pks>(("[A-Z_0-9]+")|[A-Z_0-9]+)'
+                r'(\s*,\s*(("[A-Z_0-9]+")|[A-Z_0-9]+))*)\)\s+MESSAGE\s+"(?P<msg>[^"]*)"\s+HELP\s+(?P<help>[^\s]+)\s*$',
+                suffix="2",
+            ),
+            suffix="1",
+        ),
+        x_prompt_compare,
+    )
+    mcl.add(
+        ins_table_rxs(
+            r"^\s*PROMPT\s+COMPARE\s+",
+            ins_table_rxs(
+                r"(?:\s+IN\s+(?P<alias1>\w+))?\s+(?P<orient>AND|BESIDE)\s+",
+                r'(?:\s+IN\s+(?P<alias2>\w+))?\s+(?:PK|KEY)\s*\((?P<pks>(("[A-Z_0-9]+")|[A-Z_0-9]+)'
+                r'(\s*,\s*(("[A-Z_0-9]+")|[A-Z_0-9]+))*)\)\s+MESSAGE\s+"(?P<msg>[^"]*)"\s+HELP\s+"(?P<help>[^"]+)"\s*$',
+                suffix="2",
+            ),
+            suffix="1",
+        ),
+        x_prompt_compare,
+    )
     mcl.add(
         ins_table_rxs(
             r'^\s*PROMPT\s+ASK\s+"(?P<msg>(.|\n)*)"\s+SUB\s+(?P<match>~?\w+)\s+COMPARE\s+',
@@ -2073,7 +2101,7 @@ def build_dispatch_table() -> MetaCommandList:
     mcl.add(
         ins_table_rxs(
             r'^\s*PROMPT\s+MESSAGE\s+"(?P<message>(.|\n)*)"\s+DISPLAY\s+',
-            r"(?:\s+HELP\s+(?P<help>[^\s]+))?(?:\s+(?P<free>FREE))?\s*$",
+            r"(?:\s+HELP\s+(?P<help>[^\s]+))?\s*$",
         ),
         x_prompt,
         description="PROMPT DISPLAY",
@@ -2082,21 +2110,36 @@ def build_dispatch_table() -> MetaCommandList:
     mcl.add(
         ins_table_rxs(
             r'^\s*PROMPT\s+MESSAGE\s+"(?P<message>(.|\n)*)"\s+DISPLAY\s+',
-            r'(?:\s+HELP\s+"(?P<help>[^"]+)")?(?:\s+(?P<free>FREE))?\s*$',
+            r'(?:\s+HELP\s+"(?P<help>[^"]+)")?\s*$',
+        ),
+        x_prompt,
+    )
+    mcl.add(
+        ins_table_rxs(
+            r"^\s*PROMPT\s+DISPLAY\s+",
+            r'\s+MESSAGE\s+"(?P<message>(.|\n)*)"(?:\s+HELP\s+(?P<help>[^\s]+))?\s*$',
+        ),
+        x_prompt,
+    )
+    mcl.add(
+        ins_table_rxs(
+            r"^\s*PROMPT\s+DISPLAY\s+",
+            r'\s+MESSAGE\s+"(?P<message>(.|\n)*)"(?:\s+HELP\s+"(?P<help>[^"]+)")?\s*$',
         ),
         x_prompt,
     )
+    # PROMPT DISPLAY with HELP after MESSAGE (non-greedy message to avoid capturing HELP)
     mcl.add(
         ins_table_rxs(
             r"^\s*PROMPT\s+DISPLAY\s+",
-            r'\s+MESSAGE\s+"(?P<message>(.|\n)*)"(?:\s+HELP\s+(?P<help>[^\s]+))?(?:\s+(?P<free>FREE))?\s*$',
+            r'\s+MESSAGE\s+"(?P<message>[^"]*)"\s+HELP\s+(?P<help>[^\s]+)\s*$',
         ),
         x_prompt,
     )
     mcl.add(
         ins_table_rxs(
             r"^\s*PROMPT\s+DISPLAY\s+",
-            r'\s+MESSAGE\s+"(?P<message>(.|\n)*)"(?:\s+HELP\s+"(?P<help>[^"]+)")?(?:\s+(?P<free>FREE))?\s*$',
+            r'\s+MESSAGE\s+"(?P<message>[^"]*)"\s+HELP\s+"(?P<help>[^"]+)"\s*$',
         ),
         x_prompt,
     )

execsql/metacommands/io_export.py

@@ -460,7 +460,7 @@ def x_export_ods_multiple(**kwargs: Any) -> None:
     tee = kwargs["tee"]
     tee = bool(tee)
     append = kwargs["append"]
-    append = append is not None
+    append = bool(append)
     check_dir(outfile)
     write_queries_to_ods(table_list, _state.dbs.current(), outfile, append, tee, desc=description)
 
@@ -473,7 +473,7 @@ def x_export_xlsx_multiple(**kwargs: Any) -> None:
     tee = kwargs["tee"]
     tee = bool(tee)
     append = kwargs["append"]
-    append = append is not None
+    append = bool(append)
     check_dir(outfile)
     write_queries_to_xlsx(table_list, _state.dbs.current(), outfile, append, tee, desc=description)
 

execsql/metacommands/prompt.py

@@ -62,7 +62,6 @@ def x_prompt(**kwargs: Any) -> None:
     table = kwargs["table"]
     message = kwargs["message"]
     help_url = unquoted(kwargs["help"])
-    free = kwargs["free"] is not None
     sq_name = db.schema_qualified_table_name(schema, table)
     script, line_no = current_script_line()
     cmd = f"select * from {sq_name};"
@@ -76,16 +75,14 @@ def x_prompt(**kwargs: Any) -> None:
         "column_headers": colnames,
         "rowset": rows,
         "help_url": help_url,
-        "free": free,
     }
     _state.gui_manager_queue.put(GuiSpec(GUI_DISPLAY, gui_args, return_queue))
-    if not free:
-        user_response = return_queue.get(block=True)
-        btn = user_response["button"]
-        if not btn and _state.status.cancel_halt:
-            msg = f"Halted from display of {sq_name}"
-            _state.exec_log.log_exit_halt(script, line_no, msg)
-            exit_now(2, None)
+    user_response = return_queue.get(block=True)
+    btn = user_response["button"]
+    if not btn and _state.status.cancel_halt:
+        msg = f"Halted from display of {sq_name}"
+        _state.exec_log.log_exit_halt(script, line_no, msg)
+        exit_now(2, None)
     return None
 
 
@@ -119,7 +116,6 @@ def x_prompt_enter(**kwargs: Any) -> None:
         "textentrycase": textcase,
         "initialtext": initial,
         "help_url": help_url,
-        "free": False,
     }
     _state.gui_manager_queue.put(GuiSpec(GUI_DISPLAY, gui_args, return_queue))
     user_response = return_queue.get(block=True)
@@ -862,7 +858,6 @@ def x_ask(**kwargs: Any) -> None:
             "title": script,
             "message": kwargs["question"],
             "button_list": [("Yes", 1, "y"), ("No", 0, "n")],
-            "free": False,
         }
         _state.gui_manager_queue.put(GuiSpec(GUI_DISPLAY, gui_args, return_queue))
         user_response = return_queue.get(block=True)

{execsql2-2.13.2.dist-info → execsql2-2.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.13.2
+Version: 2.14.1
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Homepage, https://execsql2.readthedocs.io
 Project-URL: Repository, https://github.com/geocoug/execsql

{execsql2-2.13.2.dist-info → execsql2-2.14.1.dist-info}/RECORD

@@ -51,10 +51,10 @@ execsql/exporters/xml.py,sha256=lqcOM8uKDoCayU42BPSLNH1_2DIHU5D3LtQItREU90c,2564
 execsql/exporters/yaml.py,sha256=1Vuc6uMDuLTkCuXCfXWKz4gLkkAVdEXkLs4gEB_67Xo,3110
 execsql/exporters/zip.py,sha256=kr0X6VLE_ULGVQtMzfqZZSUmc1Qupxg9HbMOAvnTQvI,4890
 execsql/gui/__init__.py,sha256=oCb-cyhLZzVpWJ4WU5HbqEDBrV-lm0ytEwxemrOZyqs,2048
-execsql/gui/base.py,sha256=sfNRkDrf7FhIgMRUOdyZpRLS1Xk9RqNhrV0A1RP6PXU,6068
-execsql/gui/console.py,sha256=TuGzm7XFxa8iWrofGLwx5DuVIlr3wqqyP_pSnAJ1S3s,14271
-execsql/gui/desktop.py,sha256=LxRzX0R5iOfXO-OFGm2nzgUZqzGtMJYm0VgY3TV5feA,42152
-execsql/gui/tui.py,sha256=lBwUrePXMF0eWbFqkJ8kBLEHEr3tc-wmxwbyFjs-gfk,50579
+execsql/gui/base.py,sha256=Kwguh8CGgs5kRFgnpaIEt1yOMP7ejj7TwXrtbiRpnm0,7776
+execsql/gui/console.py,sha256=5vDTHx9jJHQZ47WdKMWOTqNHgeG_CbD7e1o9QCYS0X8,18040
+execsql/gui/desktop.py,sha256=TWehraUdvBBj9SiBmUuW8DOHdWq-Kux0RJ6fKBt_xyA,53182
+execsql/gui/tui.py,sha256=AQ0vtITTIbxwGfa21FfsDZ6nj2wMsVaiRkPyfZ5-udw,62718
 execsql/importers/__init__.py,sha256=dDsxSVeQYXBvm9yGqN3QswyGbLWTwt08pvUuRJgZhl4,289
 execsql/importers/base.py,sha256=FGVz3ntN6xHL99rQixlQj3tAf570K_oU83UtbYE1lJg,4124
 execsql/importers/csv.py,sha256=Mu848WNzuhVO1ade-WurPyxqGOuVNRO8UwRF3-bav_I,4845
@@ -64,17 +64,17 @@ execsql/importers/ods.py,sha256=MJsdsjropzCvxAA3DDZfAL_AnmZ4yij7DnrjGyDJqHQ,2843
 execsql/importers/xls.py,sha256=e0Zfe47ZiCpA1Ae3XDJ1ko3sCiH3-8U6XLKi6NvD0jQ,3683
 execsql/metacommands/__init__.py,sha256=3Kz-VasFS9B-C-UdHOjr3RMXjheMeYHe6qYBwp5e7wE,11434
 execsql/metacommands/conditions.py,sha256=Fzrk83-pWbFOoKahYdQW7CZjQeh3zByDUbfgpTM_bjQ,29259
-execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAVfE,14804
+execsql/metacommands/connect.py,sha256=U17ByjVmwrLN5DB7Ea9lTLyFJr8On2c9LfPO1Wc4l4U,14890
 execsql/metacommands/control.py,sha256=PAZFK1ck5SDSm5QdFV1ctif3KpEiyYWIXdDceRWgQ6k,8513
 execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
 execsql/metacommands/debug.py,sha256=pnT24dfvfOx8xFu86mO5czfVCGKbcvgBLyXnqaMWO4w,8184
-execsql/metacommands/dispatch.py,sha256=LYmTuSfC0nFKgAPWRK8n8Qf8sbrRtRmbh6ntosOjQEo,85587
+execsql/metacommands/dispatch.py,sha256=rY259pp5Bcq1q0N86NvxFgmFyOhYrNtgByzrNjocipI,87083
 execsql/metacommands/io.py,sha256=vlGBje5sgnqeilooMdhJDgSRIhysHy5_7LrKtik9Xjs,3011
-execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
+execsql/metacommands/io_export.py,sha256=c04uiFX3KcPqHUNiId0gF4sWBVZizZL95pL0aSr7mrM,18347
 execsql/metacommands/io_fileops.py,sha256=RrcJTh_cgj7bJ-bezjo0yNl-fN3CoWV-aZ71z1KHYZs,9803
 execsql/metacommands/io_import.py,sha256=fzShl_m74DWt2_SmxlxWQe00H53hDIrOYZtvvqKBhSM,14231
 execsql/metacommands/io_write.py,sha256=NpL2aYGfBpbqmPpYsqniYltYfd_SCA1EQz3_4qSdNbo,8279
-execsql/metacommands/prompt.py,sha256=xd3mAkdbn4AE4hUPuSfN5DgZGUZmk-Db23iL-JJPwXs,36918
+execsql/metacommands/prompt.py,sha256=E2e7q4pxbl_wEBrhco0B2gm5hO_HG3rNIF75PLdTgGg,36767
 execsql/metacommands/script_ext.py,sha256=TUgAldB2LSJAwZrCvDDi804hQ1d9BDQD2GDqHNPVOcM,2280
 execsql/metacommands/system.py,sha256=AeyxbMLZVOi2nThbHiZ2F_UAIrZ1r4kjI3G80TtnSD4,7385
 execsql/metacommands/upsert.py,sha256=P2935aQHDZPiVwnXi0fGQ7Guxrm-Sy_YunyuSqVSegI,15880
@@ -94,24 +94,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.13.2.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.13.2.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.13.2.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.13.2.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.13.2.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.13.2.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.13.2.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.13.2.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.13.2.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.13.2.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.13.2.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.13.2.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.13.2.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.13.2.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.13.2.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.13.2.dist-info/METADATA,sha256=R_jJi0OgB5NoPJ6g8mLse9YttgHU2EIZxlCZADPe9d0,17566
-execsql2-2.13.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.13.2.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.13.2.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.13.2.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.13.2.dist-info/RECORD,,
+execsql2-2.14.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.14.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.14.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.14.1.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.14.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.14.1.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.14.1.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.14.1.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.14.1.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.14.1.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.14.1.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.14.1.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.14.1.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.14.1.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.14.1.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.14.1.dist-info/METADATA,sha256=4H299Jz_SqnoHxbxOxobQ42CCgTOv0ynOarTVEQxMqo,17566
+execsql2-2.14.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.14.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.14.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.14.1.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.14.1.dist-info/RECORD,,