Skip to content

Implement text array decoder #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2017
Merged

Implement text array decoder #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
266184e
Add infrastructure for multiformat data codecs
elprans Jan 2, 2017
78a3009
Implement text array decoder
elprans Jan 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions asyncpg/introspection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

INTRO_LOOKUP_TYPES = '''\
WITH RECURSIVE typeinfo_tree(
oid, ns, name, kind, basetype, elemtype, range_subtype,
elem_has_bin_input, elem_has_bin_output, attrtypoids, attrnames, depth)
oid, ns, name, kind, basetype, has_bin_io, elemtype, elemdelim,
range_subtype, elem_has_bin_io, attrtypoids, attrnames, depth)
AS (
WITH composite_attrs
AS (
Expand Down Expand Up @@ -58,10 +58,23 @@

ELSE NULL
END) AS basetype,
t.typreceive::oid != 0 AND t.typsend::oid != 0
AS has_bin_io,
t.typelem AS elemtype,
elem_t.typdelim AS elemdelim,
range_t.rngsubtype AS range_subtype,
elem_t.typreceive::oid != 0 AS elem_has_bin_input,
elem_t.typsend::oid != 0 AS elem_has_bin_output,
(CASE WHEN t.typtype = 'r' THEN
(SELECT
range_elem_t.typreceive::oid != 0 AND
range_elem_t.typsend::oid != 0
FROM
pg_catalog.pg_type AS range_elem_t
WHERE
range_elem_t.oid = range_t.rngsubtype)
ELSE
elem_t.typreceive::oid != 0 AND
elem_t.typsend::oid != 0
END) AS elem_has_bin_io,
(CASE WHEN t.typtype = 'c' THEN
(SELECT ca.typoids
FROM composite_attrs AS ca
Expand Down Expand Up @@ -91,8 +104,8 @@
)

SELECT
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.elemtype,
ti.range_subtype, ti.elem_has_bin_input, ti.elem_has_bin_output,
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.has_bin_io,
ti.elemtype, ti.elemdelim, ti.range_subtype, ti.elem_has_bin_io,
ti.attrtypoids, ti.attrnames, 0
FROM
typeinfo AS ti
Expand All @@ -102,8 +115,8 @@
UNION ALL

SELECT
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.elemtype,
ti.range_subtype, ti.elem_has_bin_input, ti.elem_has_bin_output,
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.has_bin_io,
ti.elemtype, ti.elemdelim, ti.range_subtype, ti.elem_has_bin_io,
ti.attrtypoids, ti.attrnames, tt.depth + 1
FROM
typeinfo ti,
Expand All @@ -126,8 +139,8 @@
# Prior to 9.2 PostgreSQL did not have range types.
INTRO_LOOKUP_TYPES_91 = '''\
WITH RECURSIVE typeinfo_tree(
oid, ns, name, kind, basetype, elemtype, range_subtype,
elem_has_bin_input, elem_has_bin_output, attrtypoids, attrnames, depth)
oid, ns, name, kind, basetype, has_bin_io, elemtype, elemdelim,
range_subtype, elem_has_bin_io, attrtypoids, attrnames, depth)
AS (
WITH composite_attrs
AS (
Expand Down Expand Up @@ -177,10 +190,14 @@

ELSE NULL
END) AS basetype,
t.typreceive::oid != 0 AND t.typsend::oid != 0
AS has_bin_io,
t.typelem AS elemtype,
elem_t.typdelim AS elemdelim,
NULL::oid AS range_subtype,
elem_t.typreceive::oid != 0 AS elem_has_bin_input,
elem_t.typsend::oid != 0 AS elem_has_bin_output,
elem_t.typreceive::oid != 0 AND
elem_t.typsend::oid != 0
AS elem_has_bin_io,
(CASE WHEN t.typtype = 'c' THEN
(SELECT ca.typoids
FROM composite_attrs AS ca
Expand All @@ -207,8 +224,8 @@
)

SELECT
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.elemtype,
ti.range_subtype, ti.elem_has_bin_input, ti.elem_has_bin_output,
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.has_bin_io,
ti.elemtype, ti.elemdelim, ti.range_subtype, ti.elem_has_bin_io,
ti.attrtypoids, ti.attrnames, 0
FROM
typeinfo AS ti
Expand All @@ -218,8 +235,8 @@
UNION ALL

SELECT
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.elemtype,
ti.range_subtype, ti.elem_has_bin_input, ti.elem_has_bin_output,
ti.oid, ti.ns, ti.name, ti.kind, ti.basetype, ti.has_bin_io,
ti.elemtype, ti.elemdelim, ti.range_subtype, ti.elem_has_bin_io,
ti.attrtypoids, ti.attrnames, tt.depth + 1
FROM
typeinfo ti,
Expand Down
Loading