]> git.ipfire.org Git - location/libloc.git/commitdiff
importer: Reformat the large SQL query
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Mar 2024 09:57:40 +0000 (09:57 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 2 Mar 2024 09:57:40 +0000 (09:57 +0000)
There are no functional changes here. This is just to be able to extend
the script more easily.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/scripts/location-importer.in

index 0eb3f763cef39a2a25461ca087eaff8e82be02b4..296058c06ef7b2381966bd5d1d8f0a5c011ddbf0 100644 (file)
@@ -371,25 +371,45 @@ class CLI(object):
                                -- Country
                                COALESCE(
                                        (
-                                               SELECT country FROM network_overrides overrides
-                                                       WHERE networks.network <<= overrides.network
-                                                       ORDER BY masklen(overrides.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       country
+                                               FROM
+                                                       network_overrides overrides
+                                               WHERE
+                                                       networks.network <<= overrides.network
+                                               ORDER BY
+                                                       masklen(overrides.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT country FROM autnum_overrides overrides
-                                                       WHERE networks.autnum = overrides.number
+                                               SELECT
+                                                       country
+                                               FROM
+                                                       autnum_overrides overrides
+                                               WHERE
+                                                       networks.autnum = overrides.number
                                        ),
                                        (
-                                               SELECT country FROM network_feeds feeds
-                                                       WHERE networks.network <<= feeds.network
-                                                       ORDER BY masklen(feeds.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       country
+                                               FROM
+                                                       network_feeds feeds
+                                               WHERE
+                                                       networks.network <<= feeds.network
+                                               ORDER BY
+                                                       masklen(feeds.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT country FROM autnum_feeds feeds
-                                                       WHERE networks.autnum = feeds.number
-                                                       ORDER BY source LIMIT 1
+                                               SELECT
+                                                       country
+                                               FROM
+                                                       autnum_feeds feeds
+                                               WHERE
+                                                       networks.autnum = feeds.number
+                                               ORDER BY
+                                                       source
+                                               LIMIT 1
                                        ),
                                        (
                                                SELECT
@@ -420,97 +440,177 @@ class CLI(object):
                                -- Flags
                                COALESCE(
                                        (
-                                               SELECT is_anonymous_proxy FROM network_overrides overrides
-                                                       WHERE networks.network <<= overrides.network
-                                                       ORDER BY masklen(overrides.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_anonymous_proxy
+                                               FROM
+                                                       network_overrides overrides
+                                               WHERE
+                                                       networks.network <<= overrides.network
+                                               ORDER BY
+                                                       masklen(overrides.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anonymous_proxy FROM network_feeds feeds
-                                                       WHERE networks.network <<= feeds.network
-                                                       ORDER BY masklen(feeds.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_anonymous_proxy
+                                               FROM
+                                                       network_feeds feeds
+                                               WHERE
+                                                       networks.network <<= feeds.network
+                                               ORDER BY
+                                                       masklen(feeds.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anonymous_proxy FROM autnum_feeds feeds
-                                                       WHERE networks.autnum = feeds.number
-                                                       ORDER BY source LIMIT 1
+                                               SELECT
+                                                       is_anonymous_proxy
+                                               FROM
+                                                       autnum_feeds feeds
+                                               WHERE
+                                                       networks.autnum = feeds.number
+                                               ORDER BY
+                                                       source
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anonymous_proxy FROM autnum_overrides overrides
-                                                       WHERE networks.autnum = overrides.number
+                                               SELECT
+                                                       is_anonymous_proxy
+                                               FROM
+                                                       autnum_overrides overrides
+                                               WHERE
+                                                       networks.autnum = overrides.number
                                        ),
                                        FALSE
                                ) AS is_anonymous_proxy,
                                COALESCE(
                                        (
-                                               SELECT is_satellite_provider FROM network_overrides overrides
-                                                       WHERE networks.network <<= overrides.network
-                                                       ORDER BY masklen(overrides.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_satellite_provider
+                                               FROM
+                                                       network_overrides overrides
+                                               WHERE
+                                                       networks.network <<= overrides.network
+                                               ORDER BY
+                                                       masklen(overrides.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_satellite_provider FROM network_feeds feeds
-                                                       WHERE networks.network <<= feeds.network
-                                                       ORDER BY masklen(feeds.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_satellite_provider
+                                               FROM
+                                                       network_feeds feeds
+                                               WHERE
+                                                       networks.network <<= feeds.network
+                                               ORDER BY
+                                                       masklen(feeds.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_satellite_provider FROM autnum_feeds feeds
-                                                       WHERE networks.autnum = feeds.number
-                                                       ORDER BY source LIMIT 1
+                                               SELECT
+                                                       is_satellite_provider
+                                               FROM
+                                                       autnum_feeds feeds
+                                               WHERE
+                                                       networks.autnum = feeds.number
+                                               ORDER BY
+                                                       source
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_satellite_provider FROM autnum_overrides overrides
-                                                       WHERE networks.autnum = overrides.number
+                                               SELECT
+                                                       is_satellite_provider
+                                               FROM
+                                                       autnum_overrides overrides
+                                               WHERE
+                                                       networks.autnum = overrides.number
                                        ),
                                        FALSE
                                ) AS is_satellite_provider,
                                COALESCE(
                                        (
-                                               SELECT is_anycast FROM network_overrides overrides
-                                                       WHERE networks.network <<= overrides.network
-                                                       ORDER BY masklen(overrides.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_anycast
+                                               FROM
+                                                       network_overrides overrides
+                                               WHERE
+                                                       networks.network <<= overrides.network
+                                               ORDER BY
+                                                       masklen(overrides.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anycast FROM network_feeds feeds
-                                                       WHERE networks.network <<= feeds.network
-                                                       ORDER BY masklen(feeds.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_anycast
+                                               FROM
+                                                       network_feeds feeds
+                                               WHERE
+                                                       networks.network <<= feeds.network
+                                               ORDER BY
+                                                       masklen(feeds.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anycast FROM autnum_feeds feeds
-                                                       WHERE networks.autnum = feeds.number
-                                                       ORDER BY source LIMIT 1
+                                               SELECT
+                                                       is_anycast
+                                               FROM
+                                                       autnum_feeds feeds
+                                               WHERE
+                                                       networks.autnum = feeds.number
+                                               ORDER BY
+                                                       source
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_anycast FROM autnum_overrides overrides
-                                                       WHERE networks.autnum = overrides.number
+                                               SELECT
+                                                       is_anycast
+                                               FROM
+                                                       autnum_overrides overrides
+                                               WHERE
+                                                       networks.autnum = overrides.number
                                        ),
                                        FALSE
                                ) AS is_anycast,
                                COALESCE(
                                        (
-                                               SELECT is_drop FROM network_overrides overrides
-                                                       WHERE networks.network <<= overrides.network
-                                                       ORDER BY masklen(overrides.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_drop
+                                               FROM
+                                                       network_overrides overrides
+                                               WHERE
+                                                       networks.network <<= overrides.network
+                                               ORDER BY
+                                                       masklen(overrides.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_drop FROM network_feeds feeds
-                                                       WHERE networks.network <<= feeds.network
-                                                       ORDER BY masklen(feeds.network) DESC
-                                                       LIMIT 1
+                                               SELECT
+                                                       is_drop
+                                               FROM
+                                                       network_feeds feeds
+                                               WHERE
+                                                       networks.network <<= feeds.network
+                                               ORDER BY
+                                                       masklen(feeds.network) DESC
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_drop FROM autnum_feeds feeds
-                                                       WHERE networks.autnum = feeds.number
-                                                       ORDER BY source LIMIT 1
+                                               SELECT
+                                                       is_drop
+                                               FROM
+                                                       autnum_feeds feeds
+                                               WHERE
+                                                       networks.autnum = feeds.number
+                                               ORDER BY
+                                                       source
+                                               LIMIT 1
                                        ),
                                        (
-                                               SELECT is_drop FROM autnum_overrides overrides
-                                                       WHERE networks.autnum = overrides.number
+                                               SELECT
+                                                       is_drop
+                                               FROM
+                                                       autnum_overrides overrides
+                                               WHERE
+                                                       networks.autnum = overrides.number
                                        ),
                                        FALSE
                                ) AS is_drop