execsql2 2.10.0__py3-none-any.whl → 2.10.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. execsql/metacommands/debug_repl.py +5 -1
  2. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/METADATA +1 -1
  3. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/RECORD +22 -22
  4. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/README.md +0 -0
  5. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/config_settings.sqlite +0 -0
  6. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/example_config_prompt.sql +0 -0
  7. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/execsql.conf +0 -0
  8. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/make_config_db.sql +0 -0
  9. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/md_compare.sql +0 -0
  10. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/md_glossary.sql +0 -0
  11. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/md_upsert.sql +0 -0
  12. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/pg_compare.sql +0 -0
  13. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/pg_glossary.sql +0 -0
  14. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/pg_upsert.sql +0 -0
  15. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/script_template.sql +0 -0
  16. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/ss_compare.sql +0 -0
  17. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/ss_glossary.sql +0 -0
  18. {execsql2-2.10.0.data → execsql2-2.10.1.data}/data/execsql2_extras/ss_upsert.sql +0 -0
  19. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/WHEEL +0 -0
  20. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/entry_points.txt +0 -0
  21. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/licenses/LICENSE.txt +0 -0
  22. {execsql2-2.10.0.dist-info → execsql2-2.10.1.dist-info}/licenses/NOTICE +0 -0
@@ -151,8 +151,12 @@ def _print_var(varname: str) -> None:
151
151
  if subvars is None:
152
152
  _write(f" {varname}: (substitution variables not initialised)\n")
153
153
  return
154
- # varvalue() expects the name with its prefix (e.g. "$foo"); it lowercases internally.
154
+ # Try the name as typed first, then without the sigil prefix ($, &, @, #, ~).
155
+ # SUB creates variables without a prefix (e.g., "logfile"), but users
156
+ # naturally type "$logfile" at the prompt.
155
157
  value = subvars.varvalue(varname)
158
+ if value is None and len(varname) > 1 and varname[0] in "$&@#~":
159
+ value = subvars.varvalue(varname[1:])
156
160
  if value is None:
157
161
  _write(f" {varname}: (undefined)\n")
158
162
  else:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: execsql2
3
- Version: 2.10.0
3
+ Version: 2.10.1
4
4
  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.
5
5
  Project-URL: Repository, https://github.com/geocoug/execsql
6
6
  Project-URL: Issues, https://github.com/geocoug/execsql/issues
@@ -65,7 +65,7 @@ execsql/metacommands/connect.py,sha256=Nsm0D91i3RX-R2rzQQ-Br-gULaI6Uvdn9fqb7DOAV
65
65
  execsql/metacommands/control.py,sha256=CBCg0ZKSR-BGejBW5cXwk6aJ9VrYBzCg9C40ofi8qi8,8776
66
66
  execsql/metacommands/data.py,sha256=tRQBGTAuW-eJ2tBNWaoZI9OjTyNNyHJISo7gOdL-sm8,11370
67
67
  execsql/metacommands/debug.py,sha256=nmfQ2ijUbTQO3drnyV9EzFueGSTfMl-CddP_NlQyI14,8178
68
- execsql/metacommands/debug_repl.py,sha256=fjf8O25dQs-Nrl_Uw_0RahKSttkty4cbzUClNsZuV18,7303
68
+ execsql/metacommands/debug_repl.py,sha256=UsTup7oYsJ0bNsKKynxQz-4wplFKnIcKSNrkz6gl0VM,7530
69
69
  execsql/metacommands/dispatch.py,sha256=1Mae6yqrea6wViFLBsvVt33Zgx4xP8tnhOuB_aQC89c,84054
70
70
  execsql/metacommands/io.py,sha256=Duh60caM4go9JczbGYNMKKYpcMimwPzF6EQ_tshKxdE,2971
71
71
  execsql/metacommands/io_export.py,sha256=7lkCSnPhXy9FVau9_hT1u68NOVdG2DsWmvUh9hM1QWI,18359
@@ -91,24 +91,24 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
91
91
  execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
92
92
  execsql/utils/strings.py,sha256=5Dvzrk-9SIw2lpxXZQkiJbNyo1sy7iXXAtSULlZ0KG8,8488
93
93
  execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
94
- execsql2-2.10.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
95
- execsql2-2.10.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
96
- execsql2-2.10.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
97
- execsql2-2.10.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
98
- execsql2-2.10.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
99
- execsql2-2.10.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
100
- execsql2-2.10.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
101
- execsql2-2.10.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
102
- execsql2-2.10.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
103
- execsql2-2.10.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
104
- execsql2-2.10.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
105
- execsql2-2.10.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
106
- execsql2-2.10.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
107
- execsql2-2.10.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
108
- execsql2-2.10.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
109
- execsql2-2.10.0.dist-info/METADATA,sha256=V4hDmO7GKgx0ZRu8BsVES5C6oyRIUus-MIu7k7RJlfI,16956
110
- execsql2-2.10.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
111
- execsql2-2.10.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
112
- execsql2-2.10.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
113
- execsql2-2.10.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
114
- execsql2-2.10.0.dist-info/RECORD,,
94
+ execsql2-2.10.1.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
95
+ execsql2-2.10.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
96
+ execsql2-2.10.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
97
+ execsql2-2.10.1.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
98
+ execsql2-2.10.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
99
+ execsql2-2.10.1.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
100
+ execsql2-2.10.1.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
101
+ execsql2-2.10.1.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
102
+ execsql2-2.10.1.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
103
+ execsql2-2.10.1.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
104
+ execsql2-2.10.1.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
105
+ execsql2-2.10.1.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
106
+ execsql2-2.10.1.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
107
+ execsql2-2.10.1.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
108
+ execsql2-2.10.1.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
109
+ execsql2-2.10.1.dist-info/METADATA,sha256=uRqE2iIiqGuy00GvroEk5nPDMg8PXCozmOtfi1DJr4Y,16956
110
+ execsql2-2.10.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
111
+ execsql2-2.10.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
112
+ execsql2-2.10.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
113
+ execsql2-2.10.1.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
114
+ execsql2-2.10.1.dist-info/RECORD,,