cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes unnecessary arrays

Browse Source
This commit is contained in:
Guido Fioravantti
2015-11-12 12:07:15 +01:00
parent 2afb541d8d
commit ff3f5a1f4c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/sql/0.0.1/70_ips.sql
+4 -7
View File
@@ -31,16 +31,13 @@ RETURNS Geometry AS $$
DECLARE DECLARE
ret Geometry; ret Geometry;
new_ips INET[]; new_ip INET;
old_ips TEXT[];
BEGIN BEGIN
BEGIN BEGIN
IF family(ip::inet) = 6 THEN IF family(ip::inet) = 6 THEN
new_ips := array_append(new_ips, ip::inet); new_ip := ip::inet;
old_ips := array_append(old_ips, ip);
ELSE ELSE
new_ips := array_append(new_ips, ('::ffff:' || ip)::inet); new_ip := ('::ffff:' || ip)::inet;
old_ips := array_append(old_ips, ip);
END IF; END IF;
EXCEPTION WHEN OTHERS THEN EXCEPTION WHEN OTHERS THEN
SELECT ip AS q, NULL as geom, FALSE as success INTO ret; SELECT ip AS q, NULL as geom, FALSE as success INTO ret;
@@ -48,7 +45,7 @@ RETURNS Geometry AS $$
END; END;
WITH WITH
ips AS (SELECT unnest(old_ips) s, unnest(new_ips) net), ips AS (SELECT ip s, new_ip net),
matches AS (SELECT s, (SELECT the_geom FROM ip_address_locations WHERE network_start_ip <= ips.net ORDER BY network_start_ip DESC LIMIT 1) geom FROM ips) matches AS (SELECT s, (SELECT the_geom FROM ip_address_locations WHERE network_start_ip <= ips.net ORDER BY network_start_ip DESC LIMIT 1) geom FROM ips)
SELECT geom INTO ret SELECT geom INTO ret
FROM matches; FROM matches;