From: Peter Müller Date: Sun, 20 Sep 2020 19:19:36 +0000 (+0000) Subject: location-importer.in: avoid violating NOT NULL constraints during JOIN X-Git-Tag: 0.9.4~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cd2e34241a1fdd29acea39dc910b33007ebd98c;p=location%2Flibloc.git location-importer.in: avoid violating NOT NULL constraints during JOIN Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- diff --git a/src/python/location-importer.in b/src/python/location-importer.in index f5ae4a9..77952f2 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -360,7 +360,7 @@ class CLI(object): ON COMMIT DROP; CREATE UNIQUE INDEX _autnums_number ON _autnums(number); - CREATE TEMPORARY TABLE _organizations(handle text, name text) + CREATE TEMPORARY TABLE _organizations(handle text, name text NOT NULL) ON COMMIT DROP; CREATE UNIQUE INDEX _organizations_handle ON _organizations(handle); """) @@ -373,7 +373,7 @@ class CLI(object): self.db.execute(""" INSERT INTO autnums(number, name) SELECT _autnums.number, _organizations.name FROM _autnums - LEFT JOIN _organizations ON _autnums.organization = _organizations.handle + JOIN _organizations ON _autnums.organization = _organizations.handle ON CONFLICT (number) DO UPDATE SET name = excluded.name; """)