execsql2 2.29.0__py3-none-any.whl → 2.31.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 (67) hide show
  1. execsql/__main__.py +4 -5
  2. execsql/api.py +6 -0
  3. execsql/cli/__init__.py +3 -14
  4. execsql/cli/application.py +6 -4
  5. execsql/cli/commands/lint.py +5 -2
  6. execsql/cli/commands/lsp.py +42 -0
  7. execsql/cli/dsn.py +38 -2
  8. execsql/cli/lint.py +24 -7
  9. execsql/cli/run.py +22 -9
  10. execsql/config.py +58 -10
  11. execsql/data/execsql.conf.template +8 -2
  12. execsql/db/access.py +7 -5
  13. execsql/db/base.py +18 -0
  14. execsql/db/duckdb.py +96 -14
  15. execsql/db/factory.py +11 -1
  16. execsql/db/mysql.py +56 -3
  17. execsql/db/odbc.py +45 -0
  18. execsql/db/postgres.py +1 -1
  19. execsql/db/sqlserver.py +37 -21
  20. execsql/exporters/ods.py +146 -41
  21. execsql/exporters/values.py +166 -9
  22. execsql/gui/__init__.py +3 -31
  23. execsql/importers/base.py +1 -1
  24. execsql/importers/csv.py +1 -1
  25. execsql/importers/ods.py +2 -0
  26. execsql/lsp/_util.py +21 -0
  27. execsql/lsp/cache.py +73 -0
  28. execsql/lsp/code_actions.py +10 -14
  29. execsql/lsp/completion.py +8 -15
  30. execsql/lsp/diagnostics.py +15 -3
  31. execsql/lsp/document.py +142 -41
  32. execsql/lsp/hover.py +5 -13
  33. execsql/lsp/navigation.py +7 -10
  34. execsql/lsp/server.py +111 -29
  35. execsql/manifest.py +29 -9
  36. execsql/metacommands/__init__.py +0 -2
  37. execsql/metacommands/io_fileops.py +16 -5
  38. execsql/metacommands/reference.py +1 -1
  39. execsql/metacommands/upsert.py +10 -1
  40. execsql/script/executor.py +2 -21
  41. execsql/state.py +6 -3
  42. execsql/state.pyi +2 -0
  43. execsql/utils/auth.py +21 -14
  44. execsql/utils/errors.py +20 -37
  45. execsql/utils/fileio.py +44 -48
  46. execsql/utils/paths.py +31 -0
  47. execsql/utils/regex.py +0 -5
  48. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/README.md +9 -8
  49. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/md_compare.sql +53 -29
  50. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/md_glossary.sql +20 -20
  51. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/md_upsert.sql +59 -66
  52. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/pg_compare.sql +19 -22
  53. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/pg_glossary.sql +13 -17
  54. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/script_template.sql +302 -299
  55. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/ss_compare.sql +39 -29
  56. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/ss_glossary.sql +13 -17
  57. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/ss_upsert.sql +56 -66
  58. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/METADATA +17 -43
  59. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/RECORD +66 -63
  60. execsql2-2.29.0.data/data/execsql2_extras/pg_upsert.sql +0 -2791
  61. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/config_settings.sqlite +0 -0
  62. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/example_config_prompt.sql +0 -0
  63. {execsql2-2.29.0.data → execsql2-2.31.1.data}/data/execsql2_extras/make_config_db.sql +0 -0
  64. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/WHEEL +0 -0
  65. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/entry_points.txt +0 -0
  66. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/licenses/LICENSE.txt +0 -0
  67. {execsql2-2.29.0.dist-info → execsql2-2.31.1.dist-info}/licenses/NOTICE +0 -0
execsql/exporters/ods.py CHANGED
@@ -13,6 +13,7 @@ import datetime
13
13
  import decimal
14
14
  import getpass
15
15
  import os
16
+ import re
16
17
  from pathlib import Path
17
18
  from typing import Any
18
19
 
@@ -184,42 +185,25 @@ class OdsFile:
184
185
  if not sheet:
185
186
  raise OdsFileError(f"There is no sheet named {sheetname}")
186
187
 
187
- def row_data(sheetrow):
188
- # Adapted from http://www.marco83.com/work/wp-content/uploads/2011/11/odf-to-array.py
189
- cells = sheetrow.getElementsByType(of.table.TableCell)
190
- rowdata = []
191
- for cell in cells:
192
- p_content = []
193
- repeat = cell.getAttribute("numbercolumnsrepeated")
194
- if not repeat:
195
- repeat = 1
196
- spanned = int(cell.getAttribute("numbercolumnsspanned") or 0)
197
- if spanned > 1:
198
- repeat = spanned
199
- ps = cell.getElementsByType(of.text.P)
200
- if len(ps) == 0:
201
- for _rr in range(int(repeat)):
202
- p_content.append(None)
203
- else:
204
- for p in ps:
205
- pval = str(p)
206
- if len(pval) == 0:
207
- for _rr in range(int(repeat)):
208
- p_content.append(None)
209
- else:
210
- for _rr in range(int(repeat)):
211
- p_content.append(pval)
212
- if len(p_content) == 0:
213
- for _rr in range(int(repeat)):
214
- rowdata.append(None)
215
- elif p_content[0] != "#":
216
- rowdata.extend(p_content)
217
- return rowdata
218
-
219
- rows = sheet.getElementsByType(of.table.TableRow)
220
- if junk_header_rows > 0:
221
- rows = rows[junk_header_rows:]
222
- return [row_data(r) for r in rows]
188
+ rows: list[list | None] = []
189
+ pending_empty = 0
190
+ for sheetrow in sheet.getElementsByType(of.table.TableRow):
191
+ data = _row_values(sheetrow)
192
+ repeat = int(sheetrow.getAttribute("numberrowsrepeated") or 1)
193
+ if not data:
194
+ # Empty rows are kept only when data follows them, so the
195
+ # filler rows a spreadsheet writes below the data are dropped.
196
+ pending_empty += repeat
197
+ continue
198
+ rows.extend(None for _ in range(pending_empty))
199
+ pending_empty = 0
200
+ rows.extend(list(data) for _ in range(repeat))
201
+ rows = rows[junk_header_rows:]
202
+ # Every row is as wide as the widest, so a blank trailing header is
203
+ # still seen, and an empty row inside the data is a row of NULLs that
204
+ # EMPTY_ROWS keeps or drops.
205
+ width = max((len(r) for r in rows if r is not None), default=0)
206
+ return [(r or []) + [None] * (width - len(r or [])) for r in rows]
223
207
 
224
208
  def new_sheet(self, sheetname: str) -> Any:
225
209
  """Create and return a detached sheet object that can later be added to the workbook."""
@@ -239,7 +223,11 @@ class OdsFile:
239
223
  for item in datarow:
240
224
  if isinstance(item, bool):
241
225
  # Booleans must be evaluated before numbers.
242
- tc = of.table.TableCell(valuetype="boolean", value=1 if item else 0, stylename=style_name)
226
+ tc = of.table.TableCell(
227
+ valuetype="boolean",
228
+ booleanvalue="true" if item else "false",
229
+ stylename=style_name,
230
+ )
243
231
  elif isinstance(item, float | int | decimal.Decimal):
244
232
  # Decimal belongs here: PostgreSQL, MySQL and DuckDB all return it
245
233
  # for numeric/decimal columns. Without it the value fell to the
@@ -269,8 +257,11 @@ class OdsFile:
269
257
  item.microsecond,
270
258
  item.tzinfo,
271
259
  )
272
- tc = of.table.TableCell(timevalue=timeval.strftime("PT%HH%MM%S.%fS"), stylename="iso_datetime")
273
- tc.addElement(of.text.P(text=timeval.strftime("%H:%M:%S.%f")))
260
+ tc = of.table.TableCell(
261
+ valuetype="time",
262
+ timevalue=timeval.strftime("PT%HH%MM%S.%fS"),
263
+ stylename="iso_datetime",
264
+ )
274
265
  elif isinstance(item, str):
275
266
  # An XML parser normalises a newline inside an attribute to a
276
267
  # space, so office:string-value cannot carry one. ODF's answer
@@ -280,16 +271,23 @@ class OdsFile:
280
271
  tc = of.table.TableCell(valuetype="string", stylename=style_name)
281
272
  else:
282
273
  tc = of.table.TableCell(valuetype="string", stringvalue=item, stylename=style_name)
274
+ elif item is None:
275
+ # An empty cell: no value type, no value, no text.
276
+ tc = of.table.TableCell(stylename=style_name)
283
277
  else:
284
- tc = of.table.TableCell(value=item, stylename=style_name)
278
+ tc = of.table.TableCell(valuetype="string", stringvalue=str(item), stylename=style_name)
285
279
  if item is not None:
286
280
  if isinstance(item, str) and ("\n" in item or "\r" in item):
287
281
  # Previously these were flattened to spaces, silently changing
288
282
  # the exported value.
289
283
  for line in item.replace("\r\n", "\n").replace("\r", "\n").split("\n"):
290
284
  tc.addElement(of.text.P(text=line))
285
+ elif isinstance(item, datetime.time):
286
+ tc.addElement(of.text.P(text=item.strftime("%H:%M:%S.%f")))
291
287
  else:
292
- tc.addElement(of.text.P(text=item))
288
+ # str(): odfpy writes no text for a falsy value, so 0 and
289
+ # False showed as blank cells.
290
+ tc.addElement(of.text.P(text=str(item)))
293
291
  tr.addElement(tc)
294
292
 
295
293
  def add_sheet(self, of_table: Any) -> None:
@@ -311,6 +309,113 @@ class OdsFile:
311
309
  self.wbk = None
312
310
 
313
311
 
312
+ def _paragraph_text(node: Any) -> str:
313
+ """Return the text of a ``<text:p>``, expanding ODF's space, tab and line-break elements."""
314
+ parts: list[str] = []
315
+ for child in node.childNodes:
316
+ if child.nodeType == child.TEXT_NODE:
317
+ parts.append(str(child))
318
+ elif child.qname == (of.text.TEXTNS, "s"):
319
+ parts.append(" " * int(child.getAttribute("c") or 1))
320
+ elif child.qname == (of.text.TEXTNS, "tab"):
321
+ parts.append("\t")
322
+ elif child.qname == (of.text.TEXTNS, "line-break"):
323
+ parts.append("\n")
324
+ else:
325
+ parts.append(_paragraph_text(child))
326
+ return "".join(parts)
327
+
328
+
329
+ def _time_text(duration: str) -> str:
330
+ """Convert an ODF time value (``PT13H05M09.5S``) to ``13:05:09.5``."""
331
+ m = re.fullmatch(r"-?PT(\d+)H(\d+)M(\d+)(\.\d*)?S", duration)
332
+ if not m:
333
+ return duration
334
+ hours, minutes, seconds, fraction = m.groups()
335
+ fraction = (fraction or "").rstrip("0").rstrip(".")
336
+ return f"{int(hours):02d}:{int(minutes):02d}:{int(seconds):02d}{fraction}"
337
+
338
+
339
+ def _cell_value(cell: Any) -> str | None:
340
+ """Return a cell's stored value as text, or ``None`` for an empty cell.
341
+
342
+ The value comes from the cell's ``office:value-type`` and value
343
+ attribute, not from its displayed text, so a number formatted to two
344
+ places, a percentage or a date keeps its full value.
345
+ """
346
+ vtype = cell.getAttribute("valuetype")
347
+ value: str | None
348
+ if vtype in ("float", "percentage", "currency"):
349
+ value = cell.getAttribute("value")
350
+ elif vtype == "date":
351
+ value = cell.getAttribute("datevalue")
352
+ elif vtype == "time":
353
+ value = cell.getAttribute("timevalue")
354
+ value = _time_text(value) if value else value
355
+ elif vtype == "boolean":
356
+ value = cell.getAttribute("booleanvalue")
357
+ if not value:
358
+ # Files from execsql2 2.30 and earlier wrote office:value="1"/"0".
359
+ flag = cell.getAttribute("value")
360
+ value = {"1": "true", "0": "false"}.get(flag or "", flag)
361
+ else:
362
+ value = None
363
+ if value:
364
+ return value
365
+ if vtype == "string":
366
+ value = cell.getAttribute("stringvalue")
367
+ if value:
368
+ return value
369
+ # A string cell, a cell with no type, or a typed cell missing its value
370
+ # attribute: the paragraphs are the value, one line each.
371
+ paragraphs = [
372
+ _paragraph_text(child) for child in cell.childNodes if getattr(child, "qname", None) == (of.text.TEXTNS, "p")
373
+ ]
374
+ text = "\n".join(paragraphs)
375
+ return text or None
376
+
377
+
378
+ def _row_values(sheetrow: Any) -> list:
379
+ """Return one value per column of a ``<table:table-row>``, without trailing empty cells."""
380
+ values: list = []
381
+ pending_empty = 0
382
+ covered_by_span = 0
383
+ for cell in sheetrow.childNodes:
384
+ qname = getattr(cell, "qname", None)
385
+ if qname == (of.table.TABLENS, "table-cell"):
386
+ covered = False
387
+ elif qname == (of.table.TABLENS, "covered-table-cell"):
388
+ covered = True
389
+ else:
390
+ continue
391
+ repeat = int(cell.getAttribute("numbercolumnsrepeated") or 1)
392
+ if covered:
393
+ # A horizontal merge repeats its value across the columns it
394
+ # covers (below); covered cells left over belong to a merge from
395
+ # a row above and are empty in this row.
396
+ skip = min(repeat, covered_by_span)
397
+ covered_by_span -= skip
398
+ repeat -= skip
399
+ value = None
400
+ else:
401
+ value = _cell_value(cell)
402
+ spanned = int(cell.getAttribute("numbercolumnsspanned") or 1)
403
+ if spanned > 1:
404
+ covered_by_span = spanned - 1
405
+ repeat *= spanned
406
+ if repeat <= 0:
407
+ continue
408
+ if value is None:
409
+ # Counted rather than appended, so a trailing filler cell
410
+ # repeated across the whole sheet width costs nothing.
411
+ pending_empty += repeat
412
+ continue
413
+ values.extend([None] * pending_empty)
414
+ pending_empty = 0
415
+ values.extend([value] * repeat)
416
+ return values
417
+
418
+
314
419
  def export_ods(
315
420
  outfile: str,
316
421
  hdrs: list[str],
@@ -9,6 +9,7 @@ for loading data into a database from a plain SQL file.
9
9
  """
10
10
 
11
11
  import decimal
12
+ import re
12
13
  from typing import Any
13
14
 
14
15
  import execsql.state as _state
@@ -20,11 +21,146 @@ from execsql.utils.fileio import filewriter_close
20
21
  __all__ = ["export_values", "write_query_to_values"]
21
22
 
22
23
 
23
- def _sql_literal(value: Any) -> str:
24
+ # How each DBMS joins strings and writes a character by its code. A text
25
+ # value that execsql would misread when a script runs the file with INCLUDE (see
26
+ # _text_literal) is written as pieces joined this way. (template, joiner, char)
27
+ _CONCAT: dict[str, tuple[str, str, str]] = {
28
+ "MySQL": ("CONCAT({})", ", ", "CHAR({} USING utf8mb4)"),
29
+ "SQL Server": ("({})", " + ", "CHAR({})"),
30
+ "Access": ("({})", " & ", "Chr({})"),
31
+ "SQLite": ("({})", " || ", "char({})"),
32
+ "Firebird": ("({})", " || ", "ASCII_CHAR({})"),
33
+ }
34
+ # PostgreSQL, DuckDB, Oracle, and an ODBC DSN.
35
+ _CONCAT_DEFAULT = ("({})", " || ", "CHR({})")
36
+
37
+ # What execsql acts on when it runs the file: a line break (a line of the
38
+ # value could end the statement with ';' or start a '-- !x!' metacommand)
39
+ # and the start of a substitution variable (!!x!!, !'!x!'!, !"!x!"!, !{x}!).
40
+ _RX_UNSAFE = re.compile(r"\r\n|\r|\n|!(?=!|'!|\"!|\{)")
41
+ _LINE_BREAK_CODES = {"\r\n": (13, 10), "\r": (13,), "\n": (10,)}
42
+
43
+ # Column names written quoted: PostgreSQL's reserved key words, which cover
44
+ # the names other DBMSs also reject bare, plus KEY and INDEX (MySQL).
45
+ _RESERVED = frozenset(
46
+ [
47
+ "ALL",
48
+ "ANALYSE",
49
+ "ANALYZE",
50
+ "AND",
51
+ "ANY",
52
+ "ARRAY",
53
+ "AS",
54
+ "ASC",
55
+ "ASYMMETRIC",
56
+ "BOTH",
57
+ "CASE",
58
+ "CAST",
59
+ "CHECK",
60
+ "COLLATE",
61
+ "COLUMN",
62
+ "CONSTRAINT",
63
+ "CREATE",
64
+ "CURRENT_CATALOG",
65
+ "CURRENT_DATE",
66
+ "CURRENT_ROLE",
67
+ "CURRENT_TIME",
68
+ "CURRENT_TIMESTAMP",
69
+ "CURRENT_USER",
70
+ "DEFAULT",
71
+ "DEFERRABLE",
72
+ "DESC",
73
+ "DISTINCT",
74
+ "DO",
75
+ "ELSE",
76
+ "END",
77
+ "EXCEPT",
78
+ "FALSE",
79
+ "FETCH",
80
+ "FOR",
81
+ "FOREIGN",
82
+ "FROM",
83
+ "GRANT",
84
+ "GROUP",
85
+ "HAVING",
86
+ "IN",
87
+ "INDEX",
88
+ "INITIALLY",
89
+ "INTERSECT",
90
+ "INTO",
91
+ "KEY",
92
+ "LATERAL",
93
+ "LEADING",
94
+ "LIMIT",
95
+ "LOCALTIME",
96
+ "LOCALTIMESTAMP",
97
+ "NOT",
98
+ "NULL",
99
+ "OFFSET",
100
+ "ON",
101
+ "ONLY",
102
+ "OR",
103
+ "ORDER",
104
+ "PLACING",
105
+ "PRIMARY",
106
+ "REFERENCES",
107
+ "RETURNING",
108
+ "SELECT",
109
+ "SESSION_USER",
110
+ "SOME",
111
+ "SYMMETRIC",
112
+ "SYSTEM_USER",
113
+ "TABLE",
114
+ "THEN",
115
+ "TO",
116
+ "TRAILING",
117
+ "TRUE",
118
+ "UNION",
119
+ "UNIQUE",
120
+ "USER",
121
+ "USING",
122
+ "VARIADIC",
123
+ "WHEN",
124
+ "WHERE",
125
+ "WINDOW",
126
+ "WITH",
127
+ ],
128
+ )
129
+
130
+
131
+ def _text_literal(text: str, dbms: str | None) -> str:
132
+ """*text* as a SQL string that execsql reads back unchanged when a script runs the file with INCLUDE.
133
+
134
+ execsql reads a script line by line, substituting variables and treating
135
+ a ``-- !x!`` line as a metacommand and a line ending in ``;`` as the end of
136
+ a statement, inside a string literal too. So a value holding a line
137
+ break or the start of a variable reference is written as pieces, each
138
+ free of both, joined in *dbms*'s syntax: ``('a' || CHR(10) || 'b')``.
139
+ """
140
+ if not _RX_UNSAFE.search(text):
141
+ return "'" + text.replace("'", "''") + "'"
142
+ template, joiner, char = _CONCAT.get(dbms or "", _CONCAT_DEFAULT)
143
+ pieces: list[str] = []
144
+ start = 0
145
+ for m in _RX_UNSAFE.finditer(text):
146
+ if m.group() == "!": # end a piece after the '!', so no piece holds the whole marker
147
+ pieces.append("'" + text[start : m.end()].replace("'", "''") + "'")
148
+ else:
149
+ if m.start() > start:
150
+ pieces.append("'" + text[start : m.start()].replace("'", "''") + "'")
151
+ pieces.extend(char.format(code) for code in _LINE_BREAK_CODES[m.group()])
152
+ start = m.end()
153
+ if start < len(text):
154
+ pieces.append("'" + text[start:].replace("'", "''") + "'")
155
+ return template.format(joiner.join(pieces))
156
+
157
+
158
+ def _sql_literal(value: Any, dbms: str | None = None) -> str:
24
159
  """Render a value as a SQL literal for an INSERT ... VALUES list.
25
160
 
26
161
  Only numbers are emitted bare. Everything else is quoted, with embedded
27
- single quotes doubled — the SQL standard escape.
162
+ single quotes doubled — the SQL standard escape — and text execsql would
163
+ misread when running the file is split into pieces (:func:`_text_literal`).
28
164
 
29
165
  Quoting is the safe default rather than the exception. Previously anything
30
166
  that was not a string went out through ``str()`` unquoted, so a date became
@@ -40,7 +176,17 @@ def _sql_literal(value: Any) -> str:
40
176
  return "TRUE" if value else "FALSE"
41
177
  if isinstance(value, int | float | decimal.Decimal):
42
178
  return str(value)
43
- return "'" + str(value).replace("'", "''") + "'"
179
+ return _text_literal(str(value), dbms)
180
+
181
+
182
+ def _column_name(name: str, dbtype: Any) -> str:
183
+ """*name* as written in the column list: quoted if it is not a plain, unreserved identifier."""
184
+ if re.fullmatch(r"[A-Za-z_]\w*", name) and name.upper() not in _RESERVED:
185
+ return name
186
+ opening, closing = getattr(dbtype, "quotechars", ('"', '"'))
187
+ if opening == closing:
188
+ name = name.replace(opening, opening * 2)
189
+ return opening + name + closing
44
190
 
45
191
 
46
192
  def export_values(
@@ -50,9 +196,17 @@ def export_values(
50
196
  append: bool = False,
51
197
  desc: str | None = None,
52
198
  zipfile: str | None = None,
199
+ dbtype: Any = None,
53
200
  ) -> None:
54
- """Write pre-fetched rows as SQL INSERT … VALUES statements to a file or ZIP archive."""
201
+ """Write pre-fetched rows as SQL INSERT … VALUES statements to a file or ZIP archive.
202
+
203
+ *dbtype* is the exporting database's :class:`~execsql.types.DbType`: its
204
+ identifier quotes and its string syntax are used where a name or a
205
+ value needs them. With no rows, the file holds a comment instead of an
206
+ INSERT, which would be invalid SQL.
207
+ """
55
208
  conf = _state.conf
209
+ dbms = getattr(dbtype, "dbms_id", None)
56
210
  if outfile.lower() == "stdout":
57
211
  f = _state.output
58
212
  else:
@@ -70,17 +224,20 @@ def export_values(
70
224
  try:
71
225
  if desc is not None:
72
226
  f.write(f"-- {desc}\n")
73
- f.write(f"INSERT INTO !!target_table!!\n ({', '.join(hdrs)})\n")
74
- f.write("VALUES\n")
75
227
  firstrow = True
76
228
  for r in rows:
77
229
  if firstrow:
78
230
  firstrow = False
231
+ columns = ", ".join(_column_name(h, dbtype) for h in hdrs)
232
+ f.write(f"INSERT INTO !!target_table!!\n ({columns})\nVALUES\n")
79
233
  else:
80
234
  f.write(",\n")
81
- quoted_row = [_sql_literal(v) for v in r]
235
+ quoted_row = [_sql_literal(v, dbms) for v in r]
82
236
  f.write(f" ({', '.join(quoted_row)})")
83
- f.write("\n ;\n")
237
+ if firstrow:
238
+ f.write("-- The query returned no rows: nothing to insert.\n")
239
+ else:
240
+ f.write("\n ;\n")
84
241
  finally:
85
242
  if outfile.lower() != "stdout":
86
243
  f.close()
@@ -101,4 +258,4 @@ def write_query_to_values(
101
258
  raise
102
259
  except Exception as e:
103
260
  raise ErrInfo("db", select_stmt, exception_msg=exception_desc()) from e
104
- export_values(outfile, hdrs, rows, append, desc, zipfile=zipfile)
261
+ export_values(outfile, hdrs, rows, append, desc, zipfile=zipfile, dbtype=getattr(db, "type", None))
execsql/gui/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
- """GUI backend factory and manager thread for execsql.
1
+ """The GUI manager thread for execsql.
2
2
 
3
3
  Usage
4
4
  -----
@@ -7,7 +7,7 @@ and start the manager thread. All dialog requests are then placed on
7
7
  ``_state.gui_manager_queue`` as ``GuiSpec`` objects and dispatched by
8
8
  ``gui_manager_loop()``.
9
9
 
10
- Backend selection (framework-based, not level-based):
10
+ ``enable_gui()`` picks the backend by framework, not by level:
11
11
 
12
12
  framework "tkinter" → TkinterBackend → TextualBackend → ConsoleBackend
13
13
  framework "textual" → TextualBackend → ConsoleBackend
@@ -21,35 +21,7 @@ from typing import TYPE_CHECKING, Any
21
21
  if TYPE_CHECKING:
22
22
  from execsql.gui.base import GuiBackend
23
23
 
24
- __all__ = ["get_backend", "gui_manager_loop"]
25
-
26
-
27
- def get_backend(framework: str = "tkinter") -> GuiBackend:
28
- """Return the best available backend for *framework*.
29
-
30
- Falls back gracefully if the preferred backend's dependencies are missing.
31
- """
32
- if framework == "tkinter":
33
- try:
34
- from execsql.gui.desktop import TkinterBackend
35
-
36
- backend = TkinterBackend()
37
- backend.start()
38
- return backend
39
- except (ImportError, RuntimeError, Exception):
40
- pass
41
-
42
- # Textual path (framework == "textual", or tkinter unavailable)
43
- try:
44
- from execsql.gui.tui import TextualBackend
45
-
46
- return TextualBackend()
47
- except ImportError:
48
- pass
49
-
50
- from execsql.gui.console import ConsoleBackend
51
-
52
- return ConsoleBackend()
24
+ __all__ = ["gui_manager_loop"]
53
25
 
54
26
 
55
27
  def gui_manager_loop(q: queue.Queue[Any], backend: GuiBackend) -> None:
execsql/importers/base.py CHANGED
@@ -107,7 +107,7 @@ def import_data_table(
107
107
  if is_new == 2:
108
108
  tblspec = db.schema_qualified_table_name(schemaname, tablename)
109
109
  try:
110
- db.drop_table(tblspec)
110
+ db.drop_table_for_replacement(schemaname, tablename)
111
111
  except ErrInfo:
112
112
  raise
113
113
  except Exception as e:
execsql/importers/csv.py CHANGED
@@ -55,7 +55,7 @@ def importtable(
55
55
  sql = inf.create_table(db.type, schemaname, tablename)
56
56
  if is_new == 2:
57
57
  try:
58
- db.drop_table(db.schema_qualified_table_name(schemaname, tablename))
58
+ db.drop_table_for_replacement(schemaname, tablename)
59
59
  except ErrInfo:
60
60
  raise
61
61
  except Exception as e:
execsql/importers/ods.py CHANGED
@@ -39,6 +39,8 @@ def ods_data(
39
39
  alldata = wbk.sheet_data(sheetname, junk_header_rows)
40
40
  except Exception as e:
41
41
  raise ErrInfo(type="cmd", other_msg=f"{sheetname} is not a worksheet in {filename}.") from e
42
+ if not alldata:
43
+ raise ErrInfo(type="error", other_msg=f"The input file {filename}, sheet {sheetname} contains no data.")
42
44
  colhdrs = alldata[0]
43
45
  if any(x is None or len(x.strip()) == 0 for x in colhdrs):
44
46
  if conf.del_empty_cols:
execsql/lsp/_util.py ADDED
@@ -0,0 +1,21 @@
1
+ """Small helpers several language-server features share."""
2
+
3
+ from __future__ import annotations
4
+
5
+ import re
6
+
7
+ from lsprotocol import types
8
+
9
+ __all__ = ["RX_METACOMMAND", "markdown", "span"]
10
+
11
+ # A metacommand line: the ``-- !x!`` marker (with its spacing) and the command after it.
12
+ RX_METACOMMAND = re.compile(r"^(?P<lead>\s*--\s*!x!\s*)(?P<command>.*?)\s*$", re.I)
13
+
14
+
15
+ def span(line: int, start: int, end: int) -> types.Range:
16
+ """The characters *start* to *end* of zero-based *line*."""
17
+ return types.Range(start=types.Position(line=line, character=start), end=types.Position(line=line, character=end))
18
+
19
+
20
+ def markdown(text: str) -> types.MarkupContent:
21
+ return types.MarkupContent(kind=types.MarkupKind.Markdown, value=text)
execsql/lsp/cache.py ADDED
@@ -0,0 +1,73 @@
1
+ """What the server keeps between requests, so each one reparses only what changed.
2
+
3
+ Every feature request indexes the current document together with every file
4
+ it ``INCLUDE``s. Without this, a script with fifty large includes rereads and
5
+ reparses all of them on each completion, hover or definition request.
6
+ """
7
+
8
+ from __future__ import annotations
9
+
10
+ from collections import OrderedDict
11
+ from pathlib import Path
12
+
13
+ from execsql.lsp.document import FileFacts, file_facts, read_included, same_file_key
14
+
15
+ __all__ = ["IndexCache"]
16
+
17
+ # Characters of file text held at most (included files' text plus the texts facts were taken from).
18
+ MAX_CACHED_CHARS = 64 * 1024 * 1024
19
+
20
+
21
+ class IndexCache:
22
+ """Included files' text, by path and the file's size and modification time, and each text's :class:`FileFacts`."""
23
+
24
+ def __init__(self, max_chars: int = MAX_CACHED_CHARS) -> None:
25
+ self.max_chars = max_chars
26
+ self._texts: OrderedDict[tuple[str, int, int], str | None] = OrderedDict()
27
+ self._facts: OrderedDict[tuple[str | None, str | None, str], FileFacts] = OrderedDict()
28
+ self._chars = 0
29
+
30
+ def text(self, path: Path) -> str | None:
31
+ """:func:`read_included` of *path*, read again only when the file's size or modification time changed."""
32
+ try:
33
+ stat = path.stat()
34
+ except (OSError, ValueError): # missing, unreadable, or a name the OS rejects
35
+ return None
36
+ key = (str(path), stat.st_mtime_ns, stat.st_size)
37
+ if key in self._texts:
38
+ self._texts.move_to_end(key)
39
+ return self._texts[key]
40
+ text = read_included(path)
41
+ self._texts[key] = text
42
+ self._grow(len(text or ""))
43
+ return text
44
+
45
+ def facts(self, source: str, path: str | None, base_dir: str | None = None) -> FileFacts:
46
+ """:func:`file_facts` of *source*, taken again only when its text or paths differ, or it reads an INI file."""
47
+ key = (path, base_dir, source)
48
+ found = self._facts.get(key)
49
+ if found is not None and not found.reads_ini:
50
+ self._facts.move_to_end(key)
51
+ return found
52
+ found = file_facts(source, path, base_dir)
53
+ if key not in self._facts:
54
+ self._grow(len(source))
55
+ self._facts[key] = found
56
+ return found
57
+
58
+ def forget(self, path: str) -> None:
59
+ """Drop what was read from the file at *path*: the client says it changed."""
60
+ changed = same_file_key(path)
61
+ for key in [k for k in self._texts if same_file_key(k[0]) == changed]:
62
+ self._chars -= len(self._texts.pop(key) or "")
63
+
64
+ def _grow(self, chars: int) -> None:
65
+ self._chars += chars
66
+ while self._chars > self.max_chars and (self._texts or self._facts):
67
+ # From the kind holding more entries, least recently used first.
68
+ if self._texts and (not self._facts or len(self._texts) >= len(self._facts)):
69
+ _, text = self._texts.popitem(last=False)
70
+ self._chars -= len(text or "")
71
+ else:
72
+ (_, _, source), _ = self._facts.popitem(last=False)
73
+ self._chars -= len(source)