importer: Improve performance of AS name export query

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in
index 04c0cf98463a4193fa80f590b6592a50a04657a2..55e06ce1166f81b3349847705da418d429174f74 100644 (file)
--- a/src/scripts/location-importer.in
+++ b/src/scripts/location-importer.in
@@ -273,13 +273,16 @@ class CLI(object):
                        SELECT
                                autnums.number AS number,
                                COALESCE(
-                                       (SELECT overrides.name FROM autnum_overrides overrides
-                                               WHERE overrides.number = autnums.number),
+                                       overrides.name,
                                        autnums.name
                                ) AS name
-                               FROM autnums
-                               WHERE name <> %s ORDER BY number
-                       """, "")
+                       FROM
+                               autnums
+                       LEFT JOIN
+                               autnum_overrides overrides ON autnums.number = overrides.number
+                       ORDER BY
+                               autnums.number
+                       """)
 
                for row in rows:
                        a = writer.add_as(row.number)