fix branching

Author: lonvia

scripts/osm2pgsql-replication

@@ -117,10 +117,10 @@ class DBConnection:
         if args.database and any(part in args.database for part in ['=', '://']):
             self.conn = psycopg.connect(args.database,
                                         fallback_application_name="osm2pgsql-replication")
-
-        self.conn = psycopg.connect(dbname=args.database, user=args.username,
-                                    host=args.host, port=args.port,
-                                    fallback_application_name="osm2pgsql-replication")
+        else:
+            self.conn = psycopg.connect(dbname=args.database, user=args.username,
+                                        host=args.host, port=args.port,
+                                        fallback_application_name="osm2pgsql-replication")
 
         self.name = self.conn.get_dsn_parameters()['dbname']
 
@@ -133,7 +133,7 @@ class DBConnection:
 
     def table_exists(self, table_name):
         with self.conn.cursor() as cur:
-            cur.execute('SELECT * FROM pg_tables where tablename = %s and schemaname = %s ',
+            cur.execute('SELECT * FROM pg_tables WHERE tablename = %s and schemaname = %s ',
                         (table_name, self.schema))
             return cur.rowcount > 0