OpenTreeMap / otm-core / 2953
84%

DEFAULT BRANCH: develop
Ran
Jobs 1
Files 216
Run time 12s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
2953

Pull #3124

travis-ci

web-flow 
upgrade HStore

Overview
--------

The point of this commit is to switch from
`django_hstore.fields.DictionaryField` to
`django.contrib.postgres.fields.HStoreField`.

The former is incompatible with later releases of django,
and OpenTreeMap needs to migrate from the current 1.8 to 1.11
for stability.

The latter is the sanctioned django interface to PostgreSQL's hstore
going forward.

The latter is also less functional than the former, prompting a series
of other changes.
Changes were also made for the sake of maintenance simplicity.

The key changes here are in `treemap.udf`, `treemap.audit`, `*.models`, and
`treemap.search`.

**treemap.udf**

Entry points:
-   `UDFModel`, a base class for models that need user defined fields
-   `UserDefinedFieldDefinition`, defines the name, data type, and model type
    for a user defined field, for a given treemap instance, as a
    scalar or a collection
-   `UserDefinedCollectionValue`, an HStore collection value for a
    specific `UserDefinedFieldDefinition` on a specific model instance

`UDFModel` user guide:

Classes that want custom fields subclass `UDFModel`.
The `UDFModel` `HStoreField` is named `hstore_udfs`, but unless you are
getting deep into udf code, you should use `udfs`, which is an ordinary
attribute on the model instance, not directly associated with any
django `Field`.

To assign a custom field,
    `my_model_instance.udfs['custom field name'] = value`

There are three ways to retrieve it:
    `my_model_instance.udfs['custom field name']`
    `getattr(my_model_instance, 'custom field name')`
    `getattr(my_model_instance, 'udf:custom field name'`)

All of the above work for both scalar and collection custom fields.

Filter using the `hstore_udf` transform.

In addition to the transforms and lookups described at
https://docs.djangoproject.com/en/1.8/ref/contrib/postgres/fields/,
`UDFModel` implements `__int` and `__float` transforms, for use
before magnitude comparisons (`__gt`, `__gte`, `__lt... (continued)
Pull Request #3124: update HStore

17181 of 20596 relevant lines covered (83.42%)

0.83 hits per line

Uncovered Existing Lines

Lines Coverage ∆ File
1
93.86
 -0.78% treemap/util.py
1
99.77
 6.34% treemap/tests/test_audit.py
1
97.92
 -2.08% treemap/management/commands/random_trees.py
4
86.44
 -3.39% treemap/templatetags/auth_extras.py
4
93.44
 -0.11% stormwater/models.py
5
97.94
 2.22% treemap/search.py
5
96.24
 0.04% importer/models/trees.py
14
87.8
 0.1% treemap/templatetags/form_extras.py
18
77.96
 0.27% treemap/views/map_feature.py
30
55.43
 -1.23% otm1_migrator/data_util.py
60
88.8
 -0.11% treemap/models.py
114
76.84
 -8.99% treemap/audit.py
134
83.01
 -6.86% treemap/udf.py
Jobs
ID Job ID Ran Files Coverage
1 2953.1 216
83.42
 Travis Job 2953.1
Source Files on build 2953
Coverage ∆ File Lines Relevant Covered Missed Hits/Line