hdx-python-database 1.3.6__py3-none-any.whl → 1.3.8__py3-none-any.whl

hdx/database/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.6'
-__version_tuple__ = version_tuple = (1, 3, 6)
+__version__ = version = '1.3.8'
+__version_tuple__ = version_tuple = (1, 3, 8)
+
+__commit_id__ = commit_id = None

hdx/database/database.py

@@ -244,12 +244,10 @@ class Database:
         Returns:
             Tuple[Session, Any]: (SQLAlchemy session, base)
         """
-        batches = range(len(rows) // batch_size + 1)
-        for batch in batches:
-            start_row = batch * batch_size
-            end_row = start_row + batch_size
-            batch_rows = rows[start_row:end_row]
-            self._session.execute(insert(dbtable), batch_rows)
+
+        for i in range(0, len(rows), batch_size):
+            batch = rows[i : i + batch_size]
+            self._session.execute(insert(dbtable), batch)
         self._session.commit()
 
     @staticmethod
@@ -281,17 +279,15 @@ class Database:
             engine = create_engine(db_uri, poolclass=NullPool, echo=False)
         if reflect:
             Base = automap_base(declarative_base=table_base)
-            Base.prepare(
-                autoload_with=engine, reflection_options={"views": True}
-            )
+            Base.prepare(autoload_with=engine, reflection_options={"views": True})
             table_base = Base
         else:
             table_base.metadata.create_all(engine)
         return Session(engine), table_base
 
     @staticmethod
-    def recreate_schema(engine: Engine, schema_name: str = "public") -> bool:
-        """Wipe and create empty schema in database using SQLAlchemy.
+    def drop_schema(engine: Engine, schema_name: str = "public") -> bool:
+        """Wipe schema in database using SQLAlchemy.
 
         Args:
             engine (Engine): SQLAlchemy engine to use.
@@ -307,10 +303,30 @@ class Database:
                     DropSchema(schema_name, cascade=True, if_exists=True)
                 )
                 connection.commit()
+                return True
+        except SQLAlchemyError:
+            return False
+
+    @staticmethod
+    def recreate_schema(engine: Engine, schema_name: str = "public") -> bool:
+        """Wipe and create empty schema in database using SQLAlchemy.
+
+        Args:
+            engine (Engine): SQLAlchemy engine to use.
+            schema_name (str): Schema name. Defaults to "public".
+
+        Returns:
+            bool: True if all successful, False if not
+        """
+        # Wipe and create an empty schema
+        try:
+            with engine.connect() as connection:
                 connection.execute(
-                    CreateSchema(schema_name, if_not_exists=True)
+                    DropSchema(schema_name, cascade=True, if_exists=True)
                 )
                 connection.commit()
+                connection.execute(CreateSchema(schema_name, if_not_exists=True))
+                connection.commit()
                 return True
         except SQLAlchemyError:
             return False

hdx/database/postgresql.py

@@ -59,6 +59,12 @@ def restore_from_pgfile(db_uri: str, pg_restore_file: str) -> str:
         str: Output from the pg_restore command
     """
     db_params = get_params_from_connection_uri(db_uri)
+    if pg_restore_file[-3:] == ".xz":
+        decompress = subprocess.Popen(
+            ("unxz", "-c", "-d", pg_restore_file), stdout=subprocess.PIPE
+        ).stdout
+    else:
+        decompress = None
     subprocess_params = ["pg_restore", "-c"]
     for key, value in db_params.items():
         match key:
@@ -74,13 +80,18 @@ def restore_from_pgfile(db_uri: str, pg_restore_file: str) -> str:
                 continue
         subprocess_params.append(f"{value}")
 
-    subprocess_params.append(f"{pg_restore_file}")
+    if not decompress:
+        subprocess_params.append(pg_restore_file)
     env = environ.copy()
     password = db_params.get("password")
     if password:
         env["PGPASSWORD"] = password
     process = subprocess.run(
-        subprocess_params, env=env, capture_output=True, encoding="utf-8"
+        subprocess_params,
+        env=env,
+        capture_output=True,
+        encoding="utf-8",
+        stdin=decompress,
     )
     try:
         process.check_returncode()

hdx/database/utils.py

@@ -13,7 +13,5 @@ def camel_to_snake_case(string: str) -> str:
     Returns:
         str: String in snake case
     """
-    string = re.sub(
-        r"((?<=[a-z0-9])[A-Z]|(?!^)[A-Z](?=[a-z]))", r"_\1", string
-    )
+    string = re.sub(r"((?<=[a-z0-9])[A-Z]|(?!^)[A-Z](?=[a-z]))", r"_\1", string)
     return string.lower().lstrip("_")

{hdx_python_database-1.3.6.dist-info → hdx_python_database-1.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-database
-Version: 1.3.6
+Version: 1.3.8
 Summary: HDX Python database utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-database
 Author-email: Michael Rans <rans@email.com>
@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Requires-Dist: sqlalchemy>=2
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == 'dev'
@@ -35,8 +35,10 @@ Requires-Dist: psycopg[binary]; extra == 'postgresql'
 Provides-Extra: sshtunnel
 Requires-Dist: sshtunnel; extra == 'sshtunnel'
 Provides-Extra: test
+Requires-Dist: psycopg[binary]; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-cov; extra == 'test'
+Requires-Dist: sshtunnel; extra == 'test'
 Description-Content-Type: text/markdown
 
 [![Build Status](https://github.com/OCHA-DAP/hdx-python-database/actions/workflows/run-python-tests.yaml/badge.svg)](https://github.com/OCHA-DAP/hdx-python-database/actions/workflows/run-python-tests.yaml)

hdx_python_database-1.3.8.dist-info/RECORD

@@ -0,0 +1,13 @@
+hdx/database/__init__.py,sha256=sG2OYV5LHskgiDkB4IeVeQyPHL22Ta1kuxf-xN92-5E,155
+hdx/database/_version.py,sha256=_hPMnsWQOeGw9lqV0fueN3y4Gw7vLcBaoT0Bio9pJWo,704
+hdx/database/database.py,sha256=pOmshEfhkvlVN-cWJ9LX8ZL99TyZnwPAHOC-v0nF1pM,12926
+hdx/database/dburi.py,sha256=rw8RuLpU85vxYl5-Zk1SdZRAz-tqre_ot5aEnkjhxAQ,2977
+hdx/database/no_timezone.py,sha256=Lw087G3qOf8H70o8Hq_VvOMZ3ANei-lIA_sUlpFU_Uo,1130
+hdx/database/postgresql.py,sha256=5xmGFbzjTPTr9clQw4rOD1ZQEzYuY25Ho2hhz-WdCC8,2923
+hdx/database/utils.py,sha256=nzChgDj2_Mq8GS6xWaNmqOgpAiwK9tGYV_skKbErEVA,401
+hdx/database/views.py,sha256=U4BN9tbjlr93qKkeNbZNo_PCIwGsng09mQ2xFqh5CH0,1636
+hdx/database/with_timezone.py,sha256=GUUylmTwQHp22yedmCVKpVJzvjWgdS9lg9KeqciNJkY,235
+hdx_python_database-1.3.8.dist-info/METADATA,sha256=fC99IRhtjoty5SpmkVDobyMMYS3SYhs68ftDUoxOrZM,2841
+hdx_python_database-1.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hdx_python_database-1.3.8.dist-info/licenses/LICENSE,sha256=wc-4GpMn-ODs-U_bTe1YCiPVgvcjzrpYOx2wPuyAeII,1079
+hdx_python_database-1.3.8.dist-info/RECORD,,

hdx_python_database-1.3.6.dist-info/RECORD

@@ -1,13 +0,0 @@
-hdx/database/__init__.py,sha256=sG2OYV5LHskgiDkB4IeVeQyPHL22Ta1kuxf-xN92-5E,155
-hdx/database/_version.py,sha256=O6KrLlaUs-R3ppT6iunhqb7DyTGig2RAYgNqUiGEk0w,511
-hdx/database/database.py,sha256=hXjdRraeFouQ1afy9vHpCUkyaP-I2tPFGkDXE1z8A0A,12403
-hdx/database/dburi.py,sha256=rw8RuLpU85vxYl5-Zk1SdZRAz-tqre_ot5aEnkjhxAQ,2977
-hdx/database/no_timezone.py,sha256=Lw087G3qOf8H70o8Hq_VvOMZ3ANei-lIA_sUlpFU_Uo,1130
-hdx/database/postgresql.py,sha256=i5s_CJQZagMTuzgmnLakCOnSnvczpgJ26Q1CV6lz2_A,2646
-hdx/database/utils.py,sha256=6lLymWriMFCq8BZgrDt4V5z14GR3PbvG_WXZeBc99Ws,415
-hdx/database/views.py,sha256=U4BN9tbjlr93qKkeNbZNo_PCIwGsng09mQ2xFqh5CH0,1636
-hdx/database/with_timezone.py,sha256=GUUylmTwQHp22yedmCVKpVJzvjWgdS9lg9KeqciNJkY,235
-hdx_python_database-1.3.6.dist-info/METADATA,sha256=cPzaaLmmPam1abq5Ebh-Jed_qgv3jw-4FOnzLTc77f8,2750
-hdx_python_database-1.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hdx_python_database-1.3.6.dist-info/licenses/LICENSE,sha256=wc-4GpMn-ODs-U_bTe1YCiPVgvcjzrpYOx2wPuyAeII,1079
-hdx_python_database-1.3.6.dist-info/RECORD,,