Use GENERATED AS IDENTITY instead of serial column type

And make re-creating the tables work that use this.

Author: joto

lua/themepark.lua

@@ -285,7 +285,7 @@ function themepark:add_table(data)
     if themepark.options.unique_id then
         table.insert(data.columns, {
             column = themepark.options.unique_id,
-            sql_type = 'bigserial',
+            sql_type = 'bigint GENERATED BY DEFAULT AS IDENTITY',
             create_only = true
         })
         table.insert(data.indexes, {

themes/shortbread_v1_gen/topics/boundaries.lua

@@ -193,15 +193,15 @@ end)
 local function gen_commands(sql, level)
     local c = gen_config[level]
 
-    table.insert(sql, 'CREATE TABLE {schema}.boundaries_' .. level .. '_new (LIKE {schema}.boundaries_' .. level .. ')')
+    table.insert(sql, 'CREATE TABLE {schema}.boundaries_' .. level .. '_new (LIKE {schema}.boundaries_' .. level .. ' INCLUDING IDENTITY)')
 
     table.insert(sql, [[
 WITH simplified AS (
     SELECT way_ids, relation_ids, admin_level, maritime, disputed, ST_SimplifyVW(geom, ]] .. c.simplify .. [[) AS geom
         FROM {schema}.boundaries ]] .. c.condition .. [[
 )
-INSERT INTO {schema}.boundaries_]] .. level .. [[_new
-    SELECT * FROM simplified WHERE ST_Length(geom) > ]] .. c.minlength)
+INSERT INTO {schema}.boundaries_]] .. level .. [[_new (way_ids, relation_ids, admin_level, maritime, disputed, geom)
+    SELECT way_ids, relation_ids, admin_level, maritime, disputed, geom FROM simplified WHERE ST_Length(geom) > ]] .. c.minlength)
 
     table.insert(sql, 'ANALYZE {schema}.boundaries_' .. level .. '_new')
     table.insert(sql, 'CREATE INDEX ON {schema}.boundaries_' .. level .. '_new USING GIST (geom)')
@@ -211,7 +211,7 @@ end
 
 themepark:add_proc('gen', function(data)
     local sql = {
-        'CREATE TABLE {schema}.boundaries_new (LIKE {schema}.boundaries)',
+        'CREATE TABLE {schema}.boundaries_new (LIKE {schema}.boundaries INCLUDING IDENTITY)',
         [[
 WITH multigeom AS (
 SELECT array_agg(way_id ORDER BY way_id) AS way_ids,
@@ -224,7 +224,7 @@ SELECT array_agg(way_id ORDER BY way_id) AS way_ids,
         WHERE closure_segment IS FALSE
         GROUP BY relation_ids, maritime OR coastline, disputed
 )
-INSERT INTO {schema}.boundaries_new
+INSERT INTO {schema}.boundaries_new (way_ids, relation_ids, admin_level, maritime, disputed, geom)
 SELECT way_ids, relation_ids, admin_level, maritime, disputed, (ST_Dump(geom)).geom AS geom
     FROM multigeom ]],
         'ANALYZE {schema}.boundaries_new',

themes/shortbread_v1_gen/topics/streets.lua

@@ -424,7 +424,7 @@ themepark:add_proc('gen', function(data)
         description = 'Merge street lines for medium zoom levels',
         transaction = true,
         sql = {
-            themepark.expand_template('CREATE TABLE {schema}.streets_med_new (LIKE {schema}.streets_med)'),
+            themepark.expand_template('CREATE TABLE {schema}.streets_med_new (LIKE {schema}.streets_med INCLUDING IDENTITY)'),
             themepark.expand_template([[
 CREATE OR REPLACE FUNCTION osm2pgsql_shortbread_streets_med() RETURNS void AS $$
 DECLARE
@@ -469,7 +469,7 @@ $$ LANGUAGE plpgsql]]),
         description = 'Merge street lines for low zoom levels',
         transaction = true,
         sql = {
-            themepark.expand_template('CREATE TABLE {schema}.streets_low_new (LIKE {schema}.streets_low)'),
+            themepark.expand_template('CREATE TABLE {schema}.streets_low_new (LIKE {schema}.streets_low INCLUDING IDENTITY)'),
             themepark.expand_template([[
 WITH
 merged AS

themes/shortbread_v1_gen/topics/water.lua

@@ -268,7 +268,7 @@ themepark:add_proc('gen', function(data)
         if_has_rows = themepark.expand_template('SELECT 1 FROM {schema}.expire_water_lines LIMIT 1'),
         transaction = true,
         sql = {
-            themepark.expand_template('CREATE TABLE {schema}.water_lines_gen_new (LIKE {schema}.water_lines_gen)'),
+            themepark.expand_template('CREATE TABLE {schema}.water_lines_gen_new (LIKE {schema}.water_lines_gen INCLUDING IDENTITY)'),
             themepark.expand_template([[
 WITH merged AS
     (SELECT ]] .. name_list .. [[, kind, tunnel, bridge, ST_LineMerge(ST_Collect(geom)) AS geom