From 8abb384a758f57bf663d7e2d6036f0e9c2162549 Mon Sep 17 00:00:00 2001
From: "raphael.wcosta@gmail.com" <raphael.wcosta@gmail.com>
Date: Wed, 5 Jan 2022 12:18:54 -0300
Subject: [PATCH 1/2] Improve docs usage for JSONB (close #63) and improve
 unittest jsonb (close #64)

---
 CHANGES.rst                                   |  7 ++
 USAGE.rst                                     | 70 ++++++++++++++++++-
 bdc_db/version.py                             |  2 +-
 .../jsonschemas/dummy-jsonschema.json         |  7 +-
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8a81a55..6917c07 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,13 @@ BDC-DB - Changes
 ================
 
 
+Version 0.6.1 (2022-01-05)
+--------------------------
+
+- Improve documentation how to use `JSONB` with JSONSchemas (`#63 <https://github.com/brazil-data-cube/bdc-db/issues/63>`_).
+- Fix unittest with `JSONSchema` ref schema key (`#64 <https://github.com/brazil-data-cube/bdc-db/issues/64>`_).
+
+
 Version 0.6.0 (2021-12-21)
 --------------------------
 
diff --git a/USAGE.rst b/USAGE.rst
index 687c8a5..1f2294f 100644
--- a/USAGE.rst
+++ b/USAGE.rst
@@ -85,6 +85,8 @@ Basically, the ``BDC-DB`` has the following entry points to deal with dynamic SQ
 
 - ``bdc_db.namespaces``: Map of namespaces (table schema) to be created.
 
+- ``bdc_db.schemas``: A folder any JSONSchema files
+
 - ``bdc_db.scripts``: A folder with SQL scripts to be loaded and executed in the database.
 
 - ``bdc_db.triggers``: A folder with SQL scripts to create triggers.
@@ -224,4 +226,70 @@ You can also load all data scripts with command::
 
 .. note::
 
-    Make sure to have set ``SQLALCHEMY_DATABASE_URI``. Please refer to `Configurations <./configurations.html>`_ for further information.
\ No newline at end of file
+    Make sure to have set ``SQLALCHEMY_DATABASE_URI``. Please refer to `Configurations <./configurations.html>`_ for further information.
+
+
+Using SQLAlchemy JSONB fields with JSONSchemas
+----------------------------------------------
+
+.. versionadded:: 0.6.0
+
+We have created a new :class:`bdc_db.sqltypes.JSONB` to support the PostgreSQL JSONB fields with JSONSchema validation using `jsonschema <https://python-jsonschema.readthedocs.io/en/stable/>`_.
+
+In order to do that, you must have to set the entrypoint `bdc.schemas` in `setup.py`:
+
+.. code-block:: python
+
+    entry_points={
+        'bdc_db.jsonschemas': [
+            'myapp = myapp.jsonschemas'
+        ],
+        'bdc_db.models': [
+            'myapp = myapp.models'
+        ]
+    }
+
+After that, you must create a new folder `myapp.jsonschemas` with `__init__.py` inside. The `bdc-db` will be handle the entire folder
+according your `myapp` and you must use relative files to refer the JSONSchemas. We recommend you to create `myapp` inside `jsonschemas` to add a prefix and place any JSONSchema in this directory like following::
+
+    - myapp
+      - myapp
+        - __init__.py
+        - jsonschemas
+          - __init__.py
+          - myapp
+            - myschema.json
+      - setup.py
+
+
+And the create the ``models.py`` referring the `myapp/myschema.json`:
+
+.. code-block:: python
+
+    from bdc_db.db import db
+    from bdc_db.sqltypes import JSONB
+
+
+    class Collection(db.Model):
+        """Define a simple table to store collections."""
+
+        __table_name__ = 'collections'
+
+        id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+        name = db.Column(db.String, nullable=False)
+        properties = db.Column(JSONB('myapp/myschema.json'))
+
+With ``myapp.models.Collection`` is created, the :class:`bdc_db.sqltypes.JSONB` will validate the field `properties` with the given schema when model is added in memory.
+
+.. code-block:: python
+
+    from bdc_db.db import db
+    from flask import current_app
+    from myapp.models import Collection
+
+    with current_app.app_context():
+        collection = Collection(name='S2_L1C')
+        collection.properties = dict()
+
+        db.session.add(collection) # apply validation here
+
diff --git a/bdc_db/version.py b/bdc_db/version.py
index 38b2c76..28dfa8c 100644
--- a/bdc_db/version.py
+++ b/bdc_db/version.py
@@ -8,4 +8,4 @@
 
 """Version information for BDC-DB."""
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'
diff --git a/tests/demo_app/jsonschemas/dummy-jsonschema.json b/tests/demo_app/jsonschemas/dummy-jsonschema.json
index 94d1ccc..5406880 100644
--- a/tests/demo_app/jsonschemas/dummy-jsonschema.json
+++ b/tests/demo_app/jsonschemas/dummy-jsonschema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "#dummy-jsonschema.json",
+    "$id": "dummy-jsonschema.json",
     "type": "object",
     "title": "Dummy JSONSchema",
     "description": "Define a simple JSONSchema for minimal tests.",
@@ -12,6 +12,11 @@
             "additionalProperties": true
         },
         "fieldStringRequired": {
+            "$ref": "#/definitions/dummyField"
+        }
+    },
+    "definitions": {
+        "dummyField": {
             "type": "string"
         }
     }

From 3fdbc21cad4315cd7e432f11383920b01502f1b2 Mon Sep 17 00:00:00 2001
From: "raphael.wcosta@gmail.com" <raphael.wcosta@gmail.com>
Date: Wed, 5 Jan 2022 12:45:57 -0300
Subject: [PATCH 2/2] Minimal doc change

---
 USAGE.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/USAGE.rst b/USAGE.rst
index 1f2294f..0c8ca5f 100644
--- a/USAGE.rst
+++ b/USAGE.rst
@@ -85,7 +85,7 @@ Basically, the ``BDC-DB`` has the following entry points to deal with dynamic SQ
 
 - ``bdc_db.namespaces``: Map of namespaces (table schema) to be created.
 
-- ``bdc_db.schemas``: A folder any JSONSchema files
+- ``bdc_db.schemas``: A folder with any JSONSchema files
 
 - ``bdc_db.scripts``: A folder with SQL scripts to be loaded and executed in the database.