fix hashing, docs

README.md

@@ -429,7 +429,9 @@ import-borders load borders.csv     # Load borders.csv into a table
 This utility requires PostgreSQL's PG* environment variables, and optionally uses `PBF_DATA_DIR, BORDERS_PBF_FILE, BORDERS_CSV_FILE, BORDERS_TABLE_NAME`.
 
 ## Importing into Postgres
-The `import-sql` script can execute a single SQL file in Postgres when the file is given as the first parameter.
+The `run-psql` helper script will run psql with one or more files provided. It can also run them in parallel. In case of an error, `run-psql` will not start any new files, but will wait for all started files to finish. Once finished, it will re-print the last few lines of STDERR to simplify debugging. Unlike legacy `import-sql`, `run-psql` does not make any assumptions about SQL directories.
+
+The legacy `import-sql` script can execute a single SQL file in Postgres when the file is given as the first parameter. The script is obsolete and should not be used.
 
 If ran without any arguments, `import-sql` executes all of the following:
 * SQL files from `$SQL_TOOLS_DIR`  - contains all SQL files to be imported before the ones generated by OpenMapTiles project. By default, contains OMT fork of the Mapbox's [postgis-vt-util.sql](https://github.com/openmaptiles/postgis-vt-util) helper functions and contains the [sql/language.sql](sql/zzz_language.sql) script. (as `10_postgis-vt-util.sql` - the file name has to be imported before files in `/sql`)
@@ -438,7 +440,7 @@ If ran without any arguments, `import-sql` executes all of the following:
 Generating and importing SQL could be done in a single step with `&&`, e.g.
 
 ```bash
-generate-sqltomvt openmaptiles.yaml > "$SQL_DIR/mvt.sql" && import-sql
+generate-sqltomvt openmaptiles.yaml > "$SQL_DIR/mvt.sql" && run-psql "$SQL_DIR/mvt.sql" 
 ```
 
 Optionally you may pass extra arguments to `psql` by using `PSQL_OPTIONS` environment variable. For example `PSQL_OPTIONS=-a` makes psql echo all commands read from a file into stdout.

bin/run-psql

@@ -95,9 +95,9 @@ def run_psql(file: Path, params: Params):
         'PGPORT': params.pgport,
     }
 
-    sql_content = file.read_text()
+    sql_content = file.read_bytes()
     md5sum = md5(sql_content).hexdigest()
-    lines = sql_content.count('\n')
+    lines = sql_content.decode('utf-8').count('\n')
     print(f'Importing {file} (md5 {md5sum}  {lines} lines) into Postgres...')
     if params.verbose:
         print(f'   {list2cmdline(cmd)}')