cartodb4/crankshaft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to old query styles even though it breaks pep8

Browse Source
This commit is contained in:
Andy Eschbacher 2016-09-21 16:43:30 -04:00
parent 375f765531
commit c52eb507ea
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/py/crankshaft/crankshaft/pysal_utils/pysal_utils.py
View File

@ -50,7 +50,7 @@ def query_attr_select(params):
""" """
attr_string = "" attr_string = ""
template = 'i."%(col)s"::numeric As attr%(alias_num)s, ' template = "i.\"%(col)s\"::numeric As attr%(alias_num)s, "
if 'time_cols' in params: if 'time_cols' in params:
# if markov analysis # if markov analysis
@ -90,7 +90,7 @@ def query_attr_where(params):
NULL AND idx_replace."time3" IS NOT NULL' NULL AND idx_replace."time3" IS NOT NULL'
""" """
attr_string = [] attr_string = []
template = 'idx_replace."%s" IS NOT NULL' template = "idx_replace.\"%s\" IS NOT NULL"
if 'time_cols' in params: if 'time_cols' in params:
# markov where clauses # markov where clauses
@ -110,7 +110,7 @@ def query_attr_where(params):
attr_string.append(template % params[attr]) attr_string.append(template % params[attr])
if len(attrs) == 2: if len(attrs) == 2:
attr_string.append('idx_replace."%s" <> 0' % params[attrs[1]]) attr_string.append("idx_replace.\"%s\" <> 0" % params[attrs[1]])
out = " AND ".join(attr_string) out = " AND ".join(attr_string)
@ -129,23 +129,22 @@ def knn(params):
"attr_where_i": attr_where.replace("idx_replace", "i"), "attr_where_i": attr_where.replace("idx_replace", "i"),
"attr_where_j": attr_where.replace("idx_replace", "j")} "attr_where_j": attr_where.replace("idx_replace", "j")}
query = ''' query = "SELECT " \
SELECT "i.\"{id_col}\" As id, " \
i."{id_col}" As id, "%(attr_select)s" \
%(attr_select)s "(SELECT ARRAY(SELECT j.\"{id_col}\" " \
(SELECT ARRAY(SELECT j."{id_col}" "FROM ({subquery}) As j " \
FROM ({subquery}) As j "WHERE " \
WHERE "i.\"{id_col}\" <> j.\"{id_col}\" AND " \
i."{id_col}" <> j."{id_col}" AND "%(attr_where_j)s " \
%(attr_where_j)s "ORDER BY " \
ORDER BY "j.\"{geom_col}\" <-> i.\"{geom_col}\" ASC " \
j."{geom_col}" <-> i."{geom_col}" ASC "LIMIT {num_ngbrs})" \
LIMIT {num_ngbrs}) ") As neighbors " \
) As neighbors "FROM ({subquery}) As i " \
FROM ({subquery}) As i "WHERE " \
WHERE %(attr_where_i)s "%(attr_where_i)s " \
ORDER BY i."{id_col}" ASC; "ORDER BY i.\"{id_col}\" ASC;" % replacements
''' % replacements
return query.format(**params) return query.format(**params)
@ -162,20 +161,19 @@ def queen(params):
"attr_where_i": attr_where.replace("idx_replace", "i"), "attr_where_i": attr_where.replace("idx_replace", "i"),
"attr_where_j": attr_where.replace("idx_replace", "j")} "attr_where_j": attr_where.replace("idx_replace", "j")}
query = ''' query = "SELECT " \
SELECT "i.\"{id_col}\" As id, " \
i."{id_col}" As id, "%(attr_select)s" \
%(attr_select)s "(SELECT ARRAY(SELECT j.\"{id_col}\" " \
(SELECT ARRAY(SELECT j."{id_col}" "FROM ({subquery}) As j " \
FROM ({subquery}) As j "WHERE i.\"{id_col}\" <> j.\"{id_col}\" AND " \
WHERE i."{id_col}" <> j."{id_col}" AND "ST_Touches(i.\"{geom_col}\", j.\"{geom_col}\") AND " \
ST_Touches(i."{geom_col}", j."{geom_col}") AND "%(attr_where_j)s)" \
%(attr_where_j)s ") As neighbors " \
) As neighbors "FROM ({subquery}) As i " \
FROM ({subquery}) As i "WHERE " \
WHERE %(attr_where_i)s "%(attr_where_i)s " \
ORDER BY i."{id_col}" ASC; "ORDER BY i.\"{id_col}\" ASC;" % replacements
''' % replacements
return query.format(**params) return query.format(**params)