bcdata 0.7.9__tar.gz → 0.7.11__tar.gz

{bcdata-0.7.9 → bcdata-0.7.11}/CHANGES.txt

@@ -1,6 +1,15 @@
 Changes
 =======
 
+0.7.11 (2023-06-28)
+------------------
+- fix conflicting bc2pg short option definitions (#134)
+
+0.7.10 (2023-06-28)
+------------------
+- add bc2pg option --geometry_type to avoid issues when type sniffing (#132)
+- fix appending to table with name different from source (#133)
+
 0.7.9 (2023-06-13)
 ------------------
 - fix geometry type checking (#131)

{bcdata-0.7.9/bcdata.egg-info → bcdata-0.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.7.9
+Version: 0.7.11
 Summary: Python tools for quick access to DataBC geo-data available via WFS
 Home-page: https://github.com/smnorris/bcdata
 Author: Simon Norris
@@ -139,11 +139,13 @@ Options:
                           environment variable if set
   --table TEXT            Destination table name
   --schema TEXT           Destination schema name
+  --geometry_type TEXT    Spatial type of geometry column
   --query TEXT            A valid CQL or ECQL query
   -c, --count INTEGER     Total number of features to load
   -p, --pagesize INTEGER  Maximum request size
   -k, --primary_key TEXT  Primary key of dataset
-  -s, --schema_only       Dump only the object definitions (schema), not data
+  -s, --sortby TEXT       Name of sort field
+  -e, --schema_only       Create empty table from catalogue schema
   -a, --append            Append to existing table
   -t, --no_timestamp      Do not add download timestamp to bcdata meta table
   -v, --verbose           Increase verbosity.

{bcdata-0.7.9 → bcdata-0.7.11}/README.md

@@ -117,11 +117,13 @@ Options:
                           environment variable if set
   --table TEXT            Destination table name
   --schema TEXT           Destination schema name
+  --geometry_type TEXT    Spatial type of geometry column
   --query TEXT            A valid CQL or ECQL query
   -c, --count INTEGER     Total number of features to load
   -p, --pagesize INTEGER  Maximum request size
   -k, --primary_key TEXT  Primary key of dataset
-  -s, --schema_only       Dump only the object definitions (schema), not data
+  -s, --sortby TEXT       Name of sort field
+  -e, --schema_only       Create empty table from catalogue schema
   -a, --append            Append to existing table
   -t, --no_timestamp      Do not add download timestamp to bcdata meta table
   -v, --verbose           Increase verbosity.

{bcdata-0.7.9 → bcdata-0.7.11}/bcdata/__init__.py

@@ -11,4 +11,4 @@ from .bc2pg import bc2pg
 from .wcs import get_dem
 
 
-__version__ = "0.7.9"
+__version__ = "0.7.11"

{bcdata-0.7.9 → bcdata-0.7.11}/bcdata/bc2pg.py

@@ -15,12 +15,25 @@ from bcdata.database import Database
 
 log = logging.getLogger(__name__)
 
+SUPPORTED_TYPES = [
+    "POINT",
+    "POINTZ",
+    "MULTIPOINT",
+    "MULTIPOINTZ",
+    "LINESTRING",
+    "MULTILINESTRING",
+    "MULTILINESTRINGZ",
+    "POLYGON",
+    "MULTIPOLYGON",
+]
+
 
 def bc2pg(
     dataset,
     db_url,
     table=None,
     schema=None,
+    geometry_type=None,
     query=None,
     count=None,
     sortby=None,
@@ -44,16 +57,24 @@ def bc2pg(
     # if appending, get column names from db
     if append:
         # make sure table actually exists
-        if dataset.lower() not in db.tables:
-            raise ValueError(f"{dataset} does not exist, nothing to append to")
+        if schema_name + "." + table_name not in db.tables:
+            raise ValueError(
+                f"{schema_name}.{table_name} does not exist, nothing to append to"
+            )
         column_names = db.get_columns(schema_name, table_name)
 
     # if not appending, define and create table
     else:
         # get info about the table from catalouge
         table_comments, table_details = bcdata.get_table_definition(dataset)
-        # find geometry type(s) in first 10 records and take the first one
-        geom_type = bcdata.get_types(dataset, 10)[0]
+
+        # check that provided geometry type is valid
+        if geometry_type and geometry_type not in SUPPORTED_TYPES:
+            raise ValueError("Geometry type {geometry_type} is not supported")
+
+        # if geometry type is not provided, infer from first 10 records in dataset
+        if not geometry_type:
+            geometry_type = bcdata.get_types(dataset, 10)[0]
 
         # build the table definition and create table
         table = db.define_table(
@@ -61,7 +82,7 @@ def bc2pg(
             table_name,
             table_details,
             table_comments,
-            geom_type,
+            geometry_type,
             primary_key,
             append,
         )

{bcdata-0.7.9 → bcdata-0.7.11}/bcdata/cli.py

@@ -300,6 +300,7 @@ def cat(
 )
 @click.option("--table", help="Destination table name")
 @click.option("--schema", help="Destination schema name")
+@click.option("--geometry_type", help="Spatial type of geometry column")
 @click.option(
     "--query",
     help="A valid CQL or ECQL query",
@@ -315,10 +316,10 @@ def cat(
 @click.option("--primary_key", "-k", default=None, help="Primary key of dataset")
 @click.option("--sortby", "-s", help="Name of sort field")
 @click.option(
+    "-e",
     "--schema_only",
-    "-s",
     is_flag=True,
-    help="Dump only the object definitions (schema), not data",
+    help="Create empty table from catalogue schema",
 )
 @click.option(
     "--append",
@@ -339,6 +340,7 @@ def bc2pg(
     db_url,
     table,
     schema,
+    geometry_type,
     query,
     count,
     pagesize,
@@ -370,6 +372,7 @@ def bc2pg(
         table=table,
         schema=schema,
         query=query,
+        geometry_type=geometry_type.upper(),
         count=count,
         pagesize=pagesize,
         primary_key=primary_key,

{bcdata-0.7.9 → bcdata-0.7.11/bcdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.7.9
+Version: 0.7.11
 Summary: Python tools for quick access to DataBC geo-data available via WFS
 Home-page: https://github.com/smnorris/bcdata
 Author: Simon Norris
@@ -139,11 +139,13 @@ Options:
                           environment variable if set
   --table TEXT            Destination table name
   --schema TEXT           Destination schema name
+  --geometry_type TEXT    Spatial type of geometry column
   --query TEXT            A valid CQL or ECQL query
   -c, --count INTEGER     Total number of features to load
   -p, --pagesize INTEGER  Maximum request size
   -k, --primary_key TEXT  Primary key of dataset
-  -s, --schema_only       Dump only the object definitions (schema), not data
+  -s, --sortby TEXT       Name of sort field
+  -e, --schema_only       Create empty table from catalogue schema
   -a, --append            Append to existing table
   -t, --no_timestamp      Do not add download timestamp to bcdata meta table
   -v, --verbose           Increase verbosity.

{bcdata-0.7.9 → bcdata-0.7.11}/tests/test_bc2pg.py

@@ -1,3 +1,5 @@
+import pytest
+
 import bcdata
 from bcdata.database import Database
 
@@ -41,6 +43,22 @@ def test_bc2pg_schema():
     DB_CONNECTION.execute("drop schema testschema cascade")
 
 
+def test_bc2pg_geometry_type():
+    bcdata.bc2pg(AIRPORTS_TABLE, DB_URL, count=10, geometry_type="POINT")
+    assert AIRPORTS_TABLE in DB_CONNECTION.tables
+    DB_CONNECTION.execute("drop table " + AIRPORTS_TABLE)
+
+
+def test_bc2pg_geometry_type_mismatch():
+    with pytest.raises(Exception):
+        bcdata.bc2pg(AIRPORTS_TABLE, DB_URL, count=10, geometry_type="LINESTRING")
+
+
+def test_bc2pg_geometry_type_invalid():
+    with pytest.raises(Exception):
+        bcdata.bc2pg(AIRPORTS_TABLE, DB_URL, count=10, geometry_type="MULTIPOLYGONZ")
+
+
 def test_bc2pg_z():
     bcdata.bc2pg(STREAMS_TABLE, DB_URL, query="WATERSHED_GROUP_CODE='VICT'")
     assert STREAMS_TABLE in DB_CONNECTION.tables
@@ -111,3 +129,24 @@ def test_bc2pg_append():
     r = DB_CONNECTION.query("select * from whse_imagery_and_base_maps.gsr_airports_svw")
     assert len(r) == 2
     DB_CONNECTION.execute("drop table " + AIRPORTS_TABLE)
+
+
+def test_bc2pg_append_to_other():
+    bcdata.bc2pg(AIRPORTS_TABLE, DB_URL, schema_only=True, table="arpt")
+    bcdata.bc2pg(
+        AIRPORTS_TABLE,
+        DB_URL,
+        table="arpt",
+        query="AIRPORT_NAME='Terrace (Northwest Regional) Airport'",
+        append=True,
+    )
+    bcdata.bc2pg(
+        AIRPORTS_TABLE,
+        DB_URL,
+        table="arpt",
+        query="AIRPORT_NAME='Victoria International Airport'",
+        append=True,
+    )
+    r = DB_CONNECTION.query("select * from whse_imagery_and_base_maps.arpt")
+    assert len(r) == 2
+    DB_CONNECTION.execute("drop table whse_imagery_and_base_maps.arpt")