Move Base for clarity

doc/main.md

@@ -17,6 +17,10 @@ Additional postgresql functionality is available if this library is installed wi
 
 ## Breaking changes
 
+From 1.2.3, Base must be chosen from `hdx.database.no_timezone` 
+(`db_has_tz=False`: the default) or `hdx.database.with_timezone` 
+(`db_has_tz=True`).
+
 From 1.2.2, database datetime columns are assumed to be timezoneless unless
 db_has_tz is set to True.
 
@@ -38,9 +42,9 @@ Versions from 1.0.6 no longer support Python 2.7.
 ## Database
 
 Your SQLAlchemy database tables must inherit from `Base` in
-`hdx.database` or `hdx.database.database_notz` eg. :
+`hdx.database.no_timezone` or `hdx.database.with_timezone` eg. :
 
-    from hdx.database import Base
+    from hdx.database.no_timezone import Base
     class MyTable(Base):
         my_col = Column(Integer, ForeignKey(MyTable2.col2), primary_key=True)
 
@@ -58,8 +62,10 @@ tunnel:
         session.query(...)
 
 `db_has_tz` which defaults to `False` indicates whether database datetime 
-columns have timezones. If not, conversion occurs between Python datetimes
-with timezones to timezoneless database columns.   
+columns have timezones. If `db_has_tz` is `True`, use `Base` from 
+`hdx.database.with_timezone`, otherwise use `Base` from 
+`hdx.database.no_timezone`. If `db_has_tz` is `False`, conversion occurs 
+between Python datetimes with timezones to timezoneless database columns.   
 
 ## Connection URI
 

src/hdx/database/__init__.py

@@ -1,28 +1,22 @@
 from ._version import version as __version__  # noqa: F401
-from .dburi import get_connection_uri
 
 """Database utilities"""
 import logging
 from typing import Any, Optional, Type, Union
 
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import DeclarativeBase, Session, sessionmaker
 from sqlalchemy.pool import NullPool
 from sshtunnel import SSHTunnelForwarder
 
+from .dburi import get_connection_uri
 from .no_timezone import Base as NoTZBase
 from .postgresql import wait_for_postgresql
+from .with_timezone import Base
 
 logger = logging.getLogger(__name__)
 
 
-class Base(DeclarativeBase):
-    @declared_attr.directive
-    def __tablename__(cls):
-        return f"{cls.__name__.lower()}s"
-
-
 class Database:
     """Database helper class to handle ssh tunnels, waiting for PostgreSQL to
     be up etc. Can be used in a with statement returning a Session object.

src/hdx/database/with_timezone.py

@@ -0,0 +1,7 @@
+from sqlalchemy.orm import DeclarativeBase, declared_attr
+
+
+class Base(DeclarativeBase):
+    @declared_attr.directive
+    def __tablename__(cls):
+        return f"{cls.__name__.lower()}s"