mirror
/
docker-osm
kopia lustrzana https://github.com/kartoza/docker-osm
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add default schema to sql statements

pull/110/head
admire 2021-02-14 14:35:22 +02:00
rodzic 2acc3d485f
commit 4e390c75d4
1 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
docker-osmenrich/enrich.py
Wyświetl plik

@ -63,6 +63,7 @@ class Enrich(object):
'IMPORT_DONE': 'import_done', 'IMPORT_DONE': 'import_done',
'CACHE': 'cache', 'CACHE': 'cache',
'MAX_DIFF_FILE_SIZE': 100000000, 'MAX_DIFF_FILE_SIZE': 100000000,
'DBSCHEMA_PRODUCTION': 'public',
'CACHE_MODIFY_CHECK': '' 'CACHE_MODIFY_CHECK': ''
} }
self.mapping_file = None self.mapping_file = None
@ -237,7 +238,8 @@ class Enrich(object):
new_columns_postgis.append('ADD COLUMN IF NOT EXISTS %s TIMESTAMPTZ' % enrich_key) new_columns_postgis.append('ADD COLUMN IF NOT EXISTS %s TIMESTAMPTZ' % enrich_key)
if len(new_columns_postgis) > 0: if len(new_columns_postgis) > 0:
query = 'ALTER TABLE public."%s" %s;' % (table, ','.join(new_columns_postgis)) query = 'ALTER TABLE %s."%s" %s;' % (
self.default['DBSCHEMA_PRODUCTION'], table, ','.join(new_columns_postgis))
cursor.execute(query) cursor.execute(query)
connection.commit() connection.commit()
connection.close() connection.close()
@ -333,8 +335,8 @@ class Enrich(object):
connection = self.create_connection() connection = self.create_connection()
cursor = connection.cursor() cursor = connection.cursor()
try: try:
query = 'UPDATE %s SET %s WHERE %s=%s' % ( query = 'UPDATE %s.%s SET %s WHERE %s=%s' % (self.default['DBSCHEMA_PRODUCTION'],
table_name, ','.join(sets), osm_id_column, osm_id) table_name, ','.join(sets), osm_id_column, osm_id)
cursor.execute(query) cursor.execute(query)
connection.commit() connection.commit()
except ProgrammingError as e: except ProgrammingError as e:
@ -421,8 +423,8 @@ class Enrich(object):
row_batch = {} row_batch = {}
osm_ids = [] osm_ids = []
try: try:
check_sql = ''' select * from "%s" WHERE "changeset_timestamp" check_sql = ''' select * from %s."%s" WHERE "changeset_timestamp"
IS NULL AND "osm_id" IS NOT NULL ORDER BY "osm_id" ''' % table_name IS NULL AND "osm_id" IS NOT NULL ORDER BY "osm_id" ''' % (self.default['DBSCHEMA_PRODUCTION'], table_name)
cursor.execute(check_sql) cursor.execute(check_sql)
row = True row = True
while row: while row:
@ -486,8 +488,9 @@ class Enrich(object):
connection = self.create_connection() connection = self.create_connection()
cursor = connection.cursor() cursor = connection.cursor()
try: try:
validate_sql = ''' select * from "%s" WHERE "%s"=%s ''' % ( validate_sql = ''' select * from %s."%s" WHERE "%s"=%s ''' % (self.default['DBSCHEMA_PRODUCTION'],
table, table_data['osm_id_columnn'], osm_id) table, table_data['osm_id_columnn'],
osm_id)
cursor.execute(validate_sql) cursor.execute(validate_sql)
row = cursor.fetchone() row = cursor.fetchone()
if row: if row: