1
=== modified file 'storm/databases/postgres.py'
2
--- storm/databases/postgres.py	2015-06-15 12:02:12 +0000
3
+++ storm/databases/postgres.py	2016-03-30 15:22:19 +0000
4
@@ -40,9 +40,9 @@
5
40
40
6
41
from storm.expr import (
41
from storm.expr import (
7
42
    Undef, Expr, SetExpr, Select, Insert, Alias, And, Eq, FuncExpr, SQLRaw,
42
    Undef, Expr, SetExpr, Select, Insert, Alias, And, Eq, FuncExpr, SQLRaw,
11
43
    Sequence, Like, SQLToken, COLUMN, COLUMN_NAME, COLUMN_PREFIX, TABLE,
43
    Sequence, Like, SQLToken, BinaryOper, COLUMN, COLUMN_NAME, COLUMN_PREFIX,
12
44
    compile, compile_select, compile_insert, compile_set_expr, compile_like,
44
    TABLE, compile, compile_select, compile_insert, compile_set_expr,
13
45
    compile_sql_token)
45
    compile_like, compile_sql_token)
14
46
from storm.variables import Variable, ListVariable
46
from storm.variables import Variable, ListVariable
15
47
from storm.database import Database, Connection, Result
47
from storm.database import Database, Connection, Result
16
48
from storm.exceptions import (
48
from storm.exceptions import (
17
@@ -456,3 +456,17 @@
18
456
            "statement timeout" in str(error)):
456
            "statement timeout" in str(error)):
19
457
            raise TimeoutError(
457
            raise TimeoutError(
20
458
                statement, params, "SQL server cancelled statement")
458
                statement, params, "SQL server cancelled statement")
21
459
22
460
23
461
# Postgres-specific operators
24
462
25
463
class JSONElement(BinaryOper):
26
464
    """Return an element of a JSON value (by index or field name)."""
27
465
28
466
    oper = "->"
29
467
30
468
31
469
class JSONTextElement(BinaryOper):
32
470
    """Return an element of a JSON value (by index or field name) as text."""
33
471
34
472
    oper = "->>"
35
459
473
36
=== modified file 'tests/databases/postgres.py'
37
--- tests/databases/postgres.py	2015-06-05 07:27:54 +0000
38
+++ tests/databases/postgres.py	2016-03-30 15:22:19 +0000
39
@@ -20,10 +20,11 @@
40
20
#
20
#
41
21
from datetime import date, time, timedelta
21
from datetime import date, time, timedelta
42
22
import os
22
import os
43
23
import json
44
23
24
45
24
from storm.databases.postgres import (
25
from storm.databases.postgres import (
46
25
    Postgres, compile, currval, Returning, Case, PostgresTimeoutTracer,
26
    Postgres, compile, currval, Returning, Case, PostgresTimeoutTracer,
48
26
    make_dsn)
27
    make_dsn, JSONElement, JSONTextElement)
49
27
from storm.database import create_database
28
from storm.database import create_database
50
28
from storm.exceptions import InterfaceError, ProgrammingError
29
from storm.exceptions import InterfaceError, ProgrammingError
51
29
from storm.variables import DateTimeVariable, RawStrVariable
30
from storm.variables import DateTimeVariable, RawStrVariable
52
@@ -31,7 +32,7 @@
53
31
from storm.properties import Int
32
from storm.properties import Int
54
32
from storm.exceptions import DisconnectionError, OperationalError
33
from storm.exceptions import DisconnectionError, OperationalError
55
33
from storm.expr import (Union, Select, Insert, Update, Alias, SQLRaw, State,
34
from storm.expr import (Union, Select, Insert, Update, Alias, SQLRaw, State,
57
34
                        Sequence, Like, Column, COLUMN)
35
                        Sequence, Like, Column, COLUMN, Cast, Func)
58
35
from storm.tracer import install_tracer, TimeoutError
36
from storm.tracer import install_tracer, TimeoutError
59
36
from storm.uri import URI
37
from storm.uri import URI
60
37
38
61
@@ -638,6 +639,28 @@
62
638
        exc = OperationalError("could not receive data from server")
639
        exc = OperationalError("could not receive data from server")
63
639
        self.assertTrue(self.connection.is_disconnection_error(exc))
640
        self.assertTrue(self.connection.is_disconnection_error(exc))
64
640
641
65
642
    def test_json_element(self):
66
643
        "JSONElement returns an element from a json field."
67
644
        connection = self.database.connect()
68
645
        json_value = Cast(u'{"a": 1}', "json")
69
646
        expr = JSONElement(json_value, u"a")
70
647
        # Need to cast as text since newer psycopg versions decode JSON
71
648
        # automatically.
72
649
        result = connection.execute(Select(Cast(expr, "text")))
73
650
        self.assertEqual("1", result.get_one()[0])
74
651
        result = connection.execute(Select(Func("pg_typeof", expr)))
75
652
        self.assertEqual("json", result.get_one()[0])
76
653
77
654
    def test_json_text_element(self):
78
655
        "JSONTextElement returns an element from a json field as text."
79
656
        connection = self.database.connect()
80
657
        json_value = Cast(u'{"a": 1}', "json")
81
658
        expr = JSONTextElement(json_value, u"a")
82
659
        result = connection.execute(Select(expr))
83
660
        self.assertEqual("1", result.get_one()[0])
84
661
        result = connection.execute(Select(Func("pg_typeof", expr)))
85
662
        self.assertEqual("text", result.get_one()[0])
86
663
87
641
664
88
642
_max_prepared_transactions = None
665
_max_prepared_transactions = None
89
643
666
Reviewer	Date Requested	Status
Данило Шеган (community)	2016-03-30	Approve on 2016-03-30
Benji York (community)	2016-03-30	Approve on 2016-03-30
Review via email: mp+290440@code.launchpad.net