stale/py-phias
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add regioncode to FIAS result set

Browse Source
This commit is contained in:
jar3b 2016-03-24 12:17:57 +03:00
parent c99db3ceea
commit 9d3590e5a4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aore/dbutils/dbschemas.py
View File

@ -13,7 +13,7 @@ db_shemas = dict()
db_shemas['ADDROBJ'] = \ db_shemas['ADDROBJ'] = \
DbSchema("ADDROBJ", DbSchema("ADDROBJ",
["AOID", "AOGUID", "SHORTNAME", "FORMALNAME", "AOLEVEL", "PARENTGUID", "ACTSTATUS", "LIVESTATUS", ["AOID", "AOGUID", "SHORTNAME", "FORMALNAME", "AOLEVEL", "PARENTGUID", "ACTSTATUS", "LIVESTATUS",
"NEXTID"], "NEXTID", "REGIONCODE"],
"aoid", "aoid",
"Object") "Object")

1
aore/templates/postgre/create_structure.sql
View File

@ -10,6 +10,7 @@ CREATE TABLE "ADDROBJ" (
"actstatus" BOOL, "actstatus" BOOL,
"livestatus" BOOL, "livestatus" BOOL,
"nextid" UUID, "nextid" UUID,
"regioncode" int2,
CONSTRAINT "aoid" UNIQUE ("aoid"), CONSTRAINT "aoid" UNIQUE ("aoid"),
CONSTRAINT "id_addrobj" PRIMARY KEY ("id") CONSTRAINT "id_addrobj" PRIMARY KEY ("id")
) )

2
aore/templates/postgre/expand_query.sql
View File

@ -6,4 +6,4 @@ WITH RECURSIVE child_to_parents AS (
WHERE "ADDROBJ".aoguid = child_to_parents.parentguid WHERE "ADDROBJ".aoguid = child_to_parents.parentguid
AND "ADDROBJ".actstatus = True AND "ADDROBJ".livestatus = True AND "ADDROBJ".nextid IS NULL AND "ADDROBJ".actstatus = True AND "ADDROBJ".livestatus = True AND "ADDROBJ".nextid IS NULL
) )
SELECT DISTINCT ON (scname) cs.aoid, cs.aoguid, cs.shortname, cs.formalname, cs.aolevel, s.socrname FROM child_to_parents cs LEFT JOIN "SOCRBASE" s ON s.scname=cs.shortname ORDER BY scname, aolevel; SELECT DISTINCT ON (scname) cs.aoid, cs.aoguid, cs.shortname, cs.formalname, cs.aolevel, cs.regioncode, s.socrname FROM child_to_parents cs LEFT JOIN "SOCRBASE" s ON s.scname=cs.shortname ORDER BY scname, aolevel;