From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: location@lists.ipfire.org Subject: [PATCH 1/3] location-importer.in: avoid violating NOT NULL constraints during JOIN Date: Sun, 06 Sep 2020 09:47:59 +0000 Message-ID: <3e511a13-07cc-d5a2-1bd4-2bfc7285990d@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6015153227111996742==" List-Id: --===============6015153227111996742== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Peter M=C3=BCller --- src/python/location-importer.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); =20 - 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 =3D _organizations.h= andle + JOIN _organizations ON _autnums.organization =3D _organizations.handle ON CONFLICT (number) DO UPDATE SET name =3D excluded.name; """) =20 --=20 2.20.1 --===============6015153227111996742==--