Merge pull request #29 from RudolfCardinal/improve_alembic_db_url_handling

Improve alembic db url handling + improve merge_db etc.

Author: RudolfCardinal

cardinal_pythonlib/sqlalchemy/alembic_func.py

@@ -76,13 +76,15 @@ def get_head_revision_from_alembic(
 ) -> str:
     """
     Ask Alembic what its head revision is (i.e. where the Python code would
-    like the database to be at).
+    like the database to be at). This does not read the database.
 
     Arguments:
-        alembic_config_filename: config filename
-        alembic_base_dir: directory to start in, so relative paths in the
-            config file work.
-        version_table: table name for Alembic versions
+        alembic_config_filename:
+            config filename
+        alembic_base_dir:
+            directory to start in, so relative paths in the config file work.
+        version_table:
+            table name for Alembic versions
     """
     if alembic_base_dir is None:
         alembic_base_dir = os.path.dirname(alembic_config_filename)
@@ -148,6 +150,7 @@ def get_current_and_head_revision(
 @preserve_cwd
 def upgrade_database(
     alembic_config_filename: str,
+    db_url: str = None,
     alembic_base_dir: str = None,
     starting_revision: str = None,
     destination_revision: str = "head",
@@ -164,6 +167,9 @@ def upgrade_database(
         alembic_config_filename:
             config filename
 
+        db_url:
+            Optional database URL to use, by way of override.
+
         alembic_base_dir:
             directory to start in, so relative paths in the config file work
 
@@ -187,6 +193,8 @@ def upgrade_database(
         alembic_base_dir = os.path.dirname(alembic_config_filename)
     os.chdir(alembic_base_dir)  # so the directory in the config file works
     config = Config(alembic_config_filename)
+    if db_url:
+        config.set_main_option("sqlalchemy.url", db_url)
     script = ScriptDirectory.from_config(config)
 
     # noinspection PyUnusedLocal,PyProtectedMember
@@ -217,6 +225,7 @@ def upgrade(rev, context):
 def downgrade_database(
     alembic_config_filename: str,
     destination_revision: str,
+    db_url: str = None,
     alembic_base_dir: str = None,
     starting_revision: str = None,
     version_table: str = DEFAULT_ALEMBIC_VERSION_TABLE,
@@ -233,6 +242,9 @@ def downgrade_database(
         alembic_config_filename:
             config filename
 
+        db_url:
+            Optional database URL to use, by way of override.
+
         alembic_base_dir:
             directory to start in, so relative paths in the config file work
 
@@ -255,6 +267,8 @@ def downgrade_database(
         alembic_base_dir = os.path.dirname(alembic_config_filename)
     os.chdir(alembic_base_dir)  # so the directory in the config file works
     config = Config(alembic_config_filename)
+    if db_url:
+        config.set_main_option("sqlalchemy.url", db_url)
     script = ScriptDirectory.from_config(config)
 
     # noinspection PyUnusedLocal,PyProtectedMember
@@ -403,6 +417,9 @@ def stamp_allowing_unusual_version_table(
     This function is a clone of ``alembic.command.stamp()``, but allowing
     ``version_table`` to change. See
     https://alembic.zzzcomputing.com/en/latest/api/commands.html#alembic.command.stamp
+
+    Note that the Config object can include the database URL; use
+    ``config.set_main_option("sqlalchemy.url", db_url)``.
     """
 
     script = ScriptDirectory.from_config(config)

cardinal_pythonlib/sqlalchemy/core_query.py

@@ -24,6 +24,31 @@
 
 **Query helper functions using the SQLAlchemy Core.**
 
+Example of result types in SQLAlchemy 1.4+ and higher:
+
+.. code-block:: python
+
+    from typing import List
+    from sqlalchemy.engine.cursor import CursorResult
+    from sqlalchemy.engine.result import MappingResult, Result
+    from sqlalchemy.engine.row import Row, RowMapping
+
+    query = (
+        select(text("*"))
+        .select_from(table(some_tablename))
+    )
+
+    # As tuples:
+    result_1: CursorResult = session.execute(query)
+    # ... or, more generically, of type Result
+    like_unnamed_tuples: List[Row] = result_1.fetchall()
+
+    # Or:
+    result_2: Result = session.execute(query)
+    mapping_result: Mapping_Result = result_2.mappings()
+    like_dicts: List[RowMapping] = list(mapping_result)  # implicit fetchall()
+    # ... or could have done: like_dicts = result_2.mappings().fetchall()
+
 """
 
 from typing import Any, List, Optional, Tuple, Union