execsql2 2.4.0__py3-none-any.whl → 2.4.4__py3-none-any.whl

execsql/cli/run.py

@@ -141,18 +141,19 @@ def _run(
             raise SystemExit(1)
         db_type = db_type or parsed_dsn["db_type"]
         conf.db_type = db_type
-        if parsed_dsn["server"] and not conf.server:
+        # DSN values override conf-file values — the CLI flag is explicit.
+        if parsed_dsn["server"]:
             conf.server = parsed_dsn["server"]
-        if parsed_dsn["db"] and not conf.db:
+        if parsed_dsn["db"]:
             conf.db = parsed_dsn["db"]
-        if parsed_dsn["db_file"] and not conf.db_file:
+        if parsed_dsn["db_file"]:
             conf.db_file = parsed_dsn["db_file"]
-        if parsed_dsn["user"] and not user:
+        if parsed_dsn["user"]:
             user = parsed_dsn["user"]
         if parsed_dsn["password"]:
             conf.db_password = parsed_dsn["password"]
             conf.passwd_prompt = False
-        if parsed_dsn["port"] and not port:
+        if parsed_dsn["port"]:
             port = parsed_dsn["port"]
 
     # Apply CLI options over config-file values
@@ -538,6 +539,7 @@ def _connect_initial_db(conf: ConfigData):
             pw_needed=conf.passwd_prompt,
             port=conf.port,
             encoding=conf.db_encoding,
+            password=getattr(conf, "db_password", None),
         )
     elif conf.db_type == "l":
         if conf.db_file is None:
@@ -553,6 +555,7 @@ def _connect_initial_db(conf: ConfigData):
             pw_needed=conf.passwd_prompt,
             port=conf.port,
             encoding=conf.db_encoding,
+            password=getattr(conf, "db_password", None),
         )
     elif conf.db_type == "k":
         if conf.db_file is None:
@@ -568,6 +571,7 @@ def _connect_initial_db(conf: ConfigData):
             pw_needed=conf.passwd_prompt,
             port=conf.port,
             encoding=conf.db_encoding,
+            password=getattr(conf, "db_password", None),
         )
     elif conf.db_type == "f":
         return db_Firebird(
@@ -577,6 +581,7 @@ def _connect_initial_db(conf: ConfigData):
             pw_needed=conf.passwd_prompt,
             port=conf.port,
             encoding=conf.db_encoding,
+            password=getattr(conf, "db_password", None),
         )
     elif conf.db_type == "d":
         return db_Dsn(
@@ -584,6 +589,7 @@ def _connect_initial_db(conf: ConfigData):
             user=conf.username,
             pw_needed=conf.passwd_prompt,
             encoding=conf.db_encoding,
+            password=getattr(conf, "db_password", None),
         )
     else:
         from execsql.utils.errors import fatal_error

execsql/db/factory.py

@@ -93,9 +93,10 @@ def db_SqlServer(
     pw_needed: bool = True,
     port: int | None = None,
     encoding: str | None = None,
+    password: str | None = None,
 ) -> SqlServerDatabase:
     """Open a Microsoft SQL Server connection via pyodbc."""
-    return SqlServerDatabase(server_name, database_name, user, pw_needed, port, encoding)
+    return SqlServerDatabase(server_name, database_name, user, pw_needed, port, encoding, password=password)
 
 
 def db_MySQL(
@@ -105,9 +106,10 @@ def db_MySQL(
     pw_needed: bool = True,
     port: int | None = None,
     encoding: str | None = None,
+    password: str | None = None,
 ) -> MySQLDatabase:
     """Open a MySQL or MariaDB connection via pymysql."""
-    return MySQLDatabase(server_name, database_name, user, pw_needed, port, encoding)
+    return MySQLDatabase(server_name, database_name, user, pw_needed, port, encoding, password=password)
 
 
 def db_DuckDB(
@@ -136,9 +138,10 @@ def db_Oracle(
     pw_needed: bool = True,
     port: int | None = None,
     encoding: str | None = None,
+    password: str | None = None,
 ) -> OracleDatabase:
     """Open an Oracle database connection via cx_Oracle (python-oracledb)."""
-    return OracleDatabase(server_name, database_name, user, pw_needed, port, encoding)
+    return OracleDatabase(server_name, database_name, user, pw_needed, port, encoding, password=password)
 
 
 def db_Firebird(
@@ -148,9 +151,10 @@ def db_Firebird(
     pw_needed: bool = True,
     port: int | None = None,
     encoding: str | None = None,
+    password: str | None = None,
 ) -> FirebirdDatabase:
     """Open a Firebird database connection via the firebird-driver package."""
-    return FirebirdDatabase(server_name, database_name, user, pw_needed, port, encoding)
+    return FirebirdDatabase(server_name, database_name, user, pw_needed, port, encoding, password=password)
 
 
 def db_Dsn(
@@ -158,6 +162,7 @@ def db_Dsn(
     user: str | None = None,
     pw_needed: bool = True,
     encoding: str | None = None,
+    password: str | None = None,
 ) -> DsnDatabase:
     """Open a connection to any ODBC data source registered under *dsn_name*."""
-    return DsnDatabase(dsn_name=dsn_name, user_name=user, need_passwd=pw_needed, encoding=encoding)
+    return DsnDatabase(dsn_name=dsn_name, user_name=user, need_passwd=pw_needed, encoding=encoding, password=password)

execsql/db/mysql.py

@@ -18,6 +18,18 @@ import execsql.state as _state
 
 __all__ = ["MySQLDatabase"]
 
+# Map Python encoding names to MySQL CHARACTER SET names for LOAD DATA INFILE.
+_PYTHON_TO_MYSQL_CHARSET: dict[str, str] = {
+    "utf-8": "utf8mb4",
+    "utf8": "utf8mb4",
+    "latin-1": "latin1",
+    "iso-8859-1": "latin1",
+    "iso8859-1": "latin1",
+    "ascii": "ascii",
+    "cp1252": "cp1252",
+    "windows-1252": "cp1252",
+}
+
 
 class MySQLDatabase(Database):
     """MySQL and MariaDB adapter using the pymysql package."""
@@ -190,7 +202,8 @@ class MySQLDatabase(Database):
         ):
             import_sql = f"load data local infile '{csv_file_obj.csvfname}' into table {sq_name}"
             if csv_file_obj.encoding:
-                import_sql = f"{import_sql} character set {csv_file_obj.encoding}"
+                charset = _PYTHON_TO_MYSQL_CHARSET.get(csv_file_obj.encoding.lower(), csv_file_obj.encoding)
+                import_sql = f"{import_sql} character set {charset}"
             if csv_file_obj.delimiter or csv_file_obj.quotechar:
                 import_sql = import_sql + " columns"
                 if csv_file_obj.delimiter:

execsql/importers/base.py

@@ -28,7 +28,7 @@ def import_data_table(
     hdrs: list[str],
     data: list[Any],
 ) -> None:
-    from execsql.utils.errors import exception_info
+    from execsql.utils.errors import exception_desc
 
     conf = _state.conf
     if any(x is None or len(x.strip()) == 0 for x in hdrs):
@@ -91,7 +91,7 @@ def import_data_table(
             raise ErrInfo(
                 type="db",
                 command_text=sql,
-                exception_msg=exception_info(),
+                exception_msg=exception_desc(),
                 other_msg=f"Could not create new table ({tablename}) for IMPORT metacommand",
             ) from e
     table_cols = db.table_columns(tablename, schemaname)
@@ -111,4 +111,4 @@ def import_data_table(
     except ErrInfo:
         raise
     except Exception as e:
-        raise ErrInfo("db", "Call to populate_table when importing data", exception_msg=exception_info()) from e
+        raise ErrInfo("db", "Call to populate_table when importing data", exception_msg=exception_desc()) from e

execsql/importers/csv.py

@@ -32,7 +32,7 @@ def importtable(
     encoding: str | None = None,
     junk_header_lines: int = 0,
 ) -> None:
-    from execsql.utils.errors import exception_info
+    from execsql.utils.errors import exception_desc
 
     conf = _state.conf
     if not Path(filename).is_file():
@@ -66,7 +66,7 @@ def importtable(
             raise ErrInfo(
                 type="db",
                 command_text=sql,
-                exception_msg=exception_info(),
+                exception_msg=exception_desc(),
                 other_msg=f"Could not create new table ({tablename}) for IMPORT metacommand",
             ) from e
     else:
@@ -91,7 +91,7 @@ def importtable(
         fq_tablename = db.schema_qualified_table_name(schemaname, tablename)
         raise ErrInfo(
             "exception",
-            exception_msg=exception_info(),
+            exception_msg=exception_desc(),
             other_msg=f"Can't import tabular file ({filename}) to table ({fq_tablename})",
         ) from e
     inf.close()
@@ -104,7 +104,7 @@ def importfile(
     columname: str,
     filename: str,
 ) -> None:
-    from execsql.utils.errors import exception_info
+    from execsql.utils.errors import exception_desc
 
     if schemaname is not None:
         if not db.table_exists(tablename, schemaname):
@@ -127,6 +127,6 @@ def importfile(
         fq_tablename = db.schema_qualified_table_name(schemaname, tablename)
         raise ErrInfo(
             "exception",
-            exception_msg=exception_info(),
+            exception_msg=exception_desc(),
             other_msg=f"Can't import file ({filename}) to table ({fq_tablename})",
         ) from e

execsql/importers/feather.py

@@ -24,14 +24,14 @@ def import_feather(
     filename: str,
     is_new: Any,
 ) -> None:
-    from execsql.utils.errors import exception_info
+    from execsql.utils.errors import exception_desc
 
     try:
         import polars as pl
     except Exception as e:
         raise ErrInfo(
             "exception",
-            exception_msg=exception_info(),
+            exception_msg=exception_desc(),
             other_msg="The polars Python library must be installed to import data from the Feather format.",
         ) from e
     df = pl.read_ipc(filename)
@@ -47,14 +47,14 @@ def import_parquet(
     filename: str,
     is_new: Any,
 ) -> None:
-    from execsql.utils.errors import exception_info
+    from execsql.utils.errors import exception_desc
 
     try:
         import polars as pl
     except Exception as e:
         raise ErrInfo(
             "exception",
-            exception_msg=exception_info(),
+            exception_msg=exception_desc(),
             other_msg="The polars Python library must be installed to import data from the Parquet format.",
         ) from e
     df = pl.read_parquet(filename)

{execsql2-2.4.0.dist-info → execsql2-2.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.4.0
+Version: 2.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.
 Project-URL: Repository, https://github.com/geocoug/execsql
 Project-URL: Issues, https://github.com/geocoug/execsql/issues

{execsql2-2.4.0.dist-info → execsql2-2.4.4.dist-info}/RECORD

@@ -12,15 +12,15 @@ execsql/types.py,sha256=8lCYX4ihkSzQJKqCYFTOVv0GDfvNrY7dcb8pAnTSR4E,29776
 execsql/cli/__init__.py,sha256=rxQy5MktCksykRm9u7kqxqbTo-Rx0MCIHd3wqWufszY,14667
 execsql/cli/dsn.py,sha256=_mDilt_dhjt1uwN1AC6Mbl9zmKl7pdaZA7eMgR7ZpeE,2759
 execsql/cli/help.py,sha256=zSEn66LDnNEnkqgA6CEQWraIzgiwGBJSiaflRuCySXQ,5331
-execsql/cli/run.py,sha256=Ex3B_gGEGgQlkBEiYz5O3qQBK4IiCj7VKTO6Bu8zny0,22469
+execsql/cli/run.py,sha256=MjsQjSFyQRSIqA_T82n9ZbiKaVnFVzpRIcuv0IHqJT8,22748
 execsql/db/__init__.py,sha256=jTbuafuKOqYtXFR1wvCOoKK5Lr3l1uErfaIbIr6UywI,1063
 execsql/db/access.py,sha256=bx5qr_K51LNHVTibPqmjv7U1O2bW6DRQr8HzlzHrYIY,16520
 execsql/db/base.py,sha256=jcamHa5pHsOKpoNf3E166j_eKsMxu-8QMkHkMePLwd0,30110
 execsql/db/dsn.py,sha256=4YZr4yzXeaMrE-b72c8mJvi4gnllpI9v8iRrlzXKjb4,5142
 execsql/db/duckdb.py,sha256=KQQzO89ajJjXqEchysn9_kKdXdWxRPi4mKp8ra6A8v4,2836
-execsql/db/factory.py,sha256=fD0JlJjPn_czlW5VmjXpdSC9RB1mzLQQGQXzhdDFGYw,4970
+execsql/db/factory.py,sha256=YR1m_c2Hhj_GXVGGkWoSEPZBpgNu_c4FxRnbp-xV3rs,5230
 execsql/db/firebird.py,sha256=Kgjlij7HeKXr7fymFDl05Ljzvs25uoQcI6Do3A2mSNQ,7871
-execsql/db/mysql.py,sha256=n3T-MKDQrWbDjMYrjI9NgA5iykyelAX8tUrjjgV2k0M,12909
+execsql/db/mysql.py,sha256=KzDT5xgMG9Eh0L2fjKswdbRqEfVTq9pPSyBeWEAJVk4,13334
 execsql/db/oracle.py,sha256=Psl9JZ0XWwHshr2xyy1vIbLf2KJ2TGRj_kTcc0YXLh4,9464
 execsql/db/postgres.py,sha256=gYG1Jw8tbq06TROokoSlEfg6ZtSOXhWDYAeyS_K2Yaw,19443
 execsql/db/sqlite.py,sha256=oT8MlhsaD7lmJx9ZK32wR6H9Pccr5wxs3Bk9Q3iypRI,9429
@@ -49,9 +49,9 @@ execsql/gui/console.py,sha256=Ln9ixVMLlEK5foHi0t2EywrvTiBqWoPEpp8cnof3eIw,14241
 execsql/gui/desktop.py,sha256=zooMA28FWHndy9Aw242wRzchs1QxYwlGGMsWvn4-EKo,42123
 execsql/gui/tui.py,sha256=n5xzwe1jAsU54jj0PpcBmVfnvfycPVOeiLx07-IfVVk,45948
 execsql/importers/__init__.py,sha256=dDsxSVeQYXBvm9yGqN3QswyGbLWTwt08pvUuRJgZhl4,289
-execsql/importers/base.py,sha256=bURS7dXMIDuOzSpjRaOHqaC_jvwB70sLqWVQO36AtaQ,4040
-execsql/importers/csv.py,sha256=P0uMwafYoG4s1H0Yo1OysKgWWea56Sq2DZqjtjGUwUE,4696
-execsql/importers/feather.py,sha256=BBYtwM77EbdXBlpdd2BEacUK1DfwLHXW9ieSGHRxIws,1770
+execsql/importers/base.py,sha256=ODRrJ4mVRFyQ3iF7qYdTzrXZutxgFCHYnixvfPjt03k,4040
+execsql/importers/csv.py,sha256=x_9MrKj6K2ByrZNuO2mCnQNhQiN4WXclF4IfhwvRFPA,4696
+execsql/importers/feather.py,sha256=y_4i8A4v_kI2dOW7LPo2ndoQqUP5CmdDWqXtHsqpJ60,1770
 execsql/importers/ods.py,sha256=O-bXyy_vlG4xl_KEQstYOaSAlzkGdF6TRnoHCTGpgTo,2770
 execsql/importers/xls.py,sha256=wWIS8T-zxHEhK_YFl9tovCE_ByTVtUlbmVLhrrdFRb8,3602
 execsql/metacommands/__init__.py,sha256=z5KtcR7qCoV0P9qyoAB1i2naXMKLqKjCa7wBNjKMrHU,8720
@@ -85,24 +85,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.4.0.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
-execsql2-2.4.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.4.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
-execsql2-2.4.0.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
-execsql2-2.4.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.4.0.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
-execsql2-2.4.0.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
-execsql2-2.4.0.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
-execsql2-2.4.0.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
-execsql2-2.4.0.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
-execsql2-2.4.0.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
-execsql2-2.4.0.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
-execsql2-2.4.0.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
-execsql2-2.4.0.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
-execsql2-2.4.0.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
-execsql2-2.4.0.dist-info/METADATA,sha256=GZb9PGPvtiIATG_F_8a1QzeuH49j3aro92xDioQtbds,15168
-execsql2-2.4.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-execsql2-2.4.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.4.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.4.0.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
-execsql2-2.4.0.dist-info/RECORD,,
+execsql2-2.4.4.data/data/execsql2_extras/README.md,sha256=sxwVyU0ZahCfANv56LahkyuM505kFjrMhe-1SvWE69E,4845
+execsql2-2.4.4.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.4.4.data/data/execsql2_extras/example_config_prompt.sql,sha256=SY3Jxn1qcVm4kPW9xmmTfknHfvURXmeEYTbRjYrjGSw,7487
+execsql2-2.4.4.data/data/execsql2_extras/execsql.conf,sha256=_45iJ-KWZnB8uMW_gEg067MM5pmGJ-dVl7VbAZMunAE,9530
+execsql2-2.4.4.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.4.4.data/data/execsql2_extras/md_compare.sql,sha256=B8Wd7LZ0vnMY2qvA139JIEBkPObgRH2i5xj6PejTQt8,24092
+execsql2-2.4.4.data/data/execsql2_extras/md_glossary.sql,sha256=DJRHcU5NbFpxTTX-IwH3yRlsboj1q6BBGrUAHKn4Cuo,10796
+execsql2-2.4.4.data/data/execsql2_extras/md_upsert.sql,sha256=v_7GbWh_N1mBTmw3gvTrkagOVp2q0KmXvM8hE-DlFxY,112524
+execsql2-2.4.4.data/data/execsql2_extras/pg_compare.sql,sha256=9dWa8hnfy5dVJI-z2iGpd9JzQmI4j2ziMlEdpnr66ro,24352
+execsql2-2.4.4.data/data/execsql2_extras/pg_glossary.sql,sha256=pKjIIDsROAgJq2H-1qNEcRMAWManivcZ_AEVHzUUlic,9908
+execsql2-2.4.4.data/data/execsql2_extras/pg_upsert.sql,sha256=k7AFiGTLBy3nf-qO5QIaZrEYTAKvdxxU3JDLx9jqkzs,108315
+execsql2-2.4.4.data/data/execsql2_extras/script_template.sql,sha256=1Estacb_vm1FgK41k_G9nuduP1yiA-fQ1Kn4Z4mv5Ao,11153
+execsql2-2.4.4.data/data/execsql2_extras/ss_compare.sql,sha256=TsVxWm3cEpR5-EiMYXNhtaY0arSNeKZhsJdHdLA7xeI,24833
+execsql2-2.4.4.data/data/execsql2_extras/ss_glossary.sql,sha256=cLM7nN8JOIu9ZVP9oY9qdSK3hrnWJiDcX6nZmQQbQWI,13065
+execsql2-2.4.4.data/data/execsql2_extras/ss_upsert.sql,sha256=BCqmBykXBF-BpCgOFeG1qhf2XfScKsxPD17wd1hYfHw,120647
+execsql2-2.4.4.dist-info/METADATA,sha256=7WLnQPnzRGSLoTgEnsL29rXUHxeEtTaxG8VQ4pkiJ64,15168
+execsql2-2.4.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+execsql2-2.4.4.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.4.4.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.4.4.dist-info/licenses/NOTICE,sha256=sqVrM73Ys9zfvWC_P797lHfTnoPW_ETeBSrUTFaob0A,339
+execsql2-2.4.4.dist-info/RECORD,,