detecting already filled self.gis_db

wschuell · Nov 23, 2023 · ab4f601 · ab4f601
1 parent a2f54b0
commit ab4f601
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/gis_fillers/database.py b/gis_fillers/database.py
@@ -57,14 +57,16 @@ def clean_db(self, gis_data_stay=False, commit=True, extra_whitelist=[], **kwarg
             self, commit=commit, extra_whitelist=extra_whitelist, **kwargs
         )
 
-    def get_gis_db(self, schema="postgis", replace=False, fill_db=True):
+    def get_gis_db(self, schema="postgis", replace=False, fill_db=True, force=False):
         if not hasattr(self, "gis_db") or replace:
             conninfo = copy.deepcopy(self.db_conninfo)
             conninfo["db_schema"] = schema
             self.gis_db = Database(**conninfo)
             self.gis_db.init_db()
             if fill_db:
-                self.gis_db.add_filler(MetaFiller())
-                self.gis_db.fill_db()
-                self.gis_db.connection.commit()
+                self.gis_db.cursor.execute("SELECT 1 FROM geonames_zipcodes LIMIT 1;")
+                if force or not list(self.gis_db.cursor.fetchall()):
+                    self.gis_db.add_filler(MetaFiller())
+                    self.gis_db.fill_db()
+                    self.gis_db.connection.commit()
         return self.gis_db