move function ID logic earlier

Author: beasteers

demo/initdb/02-functions.sql

@@ -19,7 +19,7 @@ BEGIN
     dlat := (lat_max - lat_min) / num_y;
     RETURN QUERY
         SELECT
-            x.x::text || '_' || y.y::text AS fid,
+            x.x::text || '_' || y.y::text AS id,
             ST_MakeEnvelope(
                 lon_min + (x.x - 1) * dlon, lat_min + (y.y - 1) * dlat,
                 lon_min + x.x * dlon,       lat_min + y.y * dlat, 4326
@@ -35,7 +35,7 @@ COMMENT ON FUNCTION postgisftw.us_grid IS 'Generates a grid of rectangles coveri
 CREATE OR REPLACE FUNCTION postgisftw.us_grid_noid(
     num_x integer DEFAULT 10,
     num_y integer DEFAULT 10)
-RETURNS TABLE(geom geometry)
+RETURNS TABLE(value text, geom geometry)
 AS $$
 DECLARE
     lon_min CONSTANT numeric := -128;
@@ -49,6 +49,7 @@ BEGIN
     dlat := (lat_max - lat_min) / num_y;
     RETURN QUERY
         SELECT
+            x.x::text || '_' || y.y::text AS value,
             ST_MakeEnvelope(
                 lon_min + (x.x - 1) * dlon, lat_min + (y.y - 1) * dlat,
                 lon_min + x.x * dlon,       lat_min + y.y * dlat, 4326

internal/data/catalog_db_fun.go

@@ -115,6 +115,13 @@ func scanFunctionDef(rows pgx.Rows) *Function {
 
 	geomCol := geometryColumn(outNames, datatypes)
 
+	idColumn := ""
+	if conf.Configuration.Database.IdColumn != "" {
+		if _, ok := datatypes[conf.Configuration.Database.IdColumn]; ok {
+			idColumn = conf.Configuration.Database.IdColumn
+		}
+	}
+
 	funDef := Function{
 		ID:             id,
 		Schema:         schema,
@@ -130,6 +137,7 @@ func scanFunctionDef(rows pgx.Rows) *Function {
 		OutJSONTypes:   outJSONTypes,
 		Types:          datatypes,
 		GeometryColumn: geomCol,
+		IDColumn:       idColumn,
 	}
 	//fmt.Printf("DEBUG: Function definitions: %v\n", funDef)
 	return &funDef
@@ -190,7 +198,7 @@ func (cat *catalogDB) FunctionFeatures(ctx context.Context, name string, args ma
 		return nil, errArg
 	}
 	propCols := removeNames(param.Columns, fn.GeometryColumn, "")
-	idColIndex := indexOfName(propCols, conf.Configuration.Database.IdColumn)
+	idColIndex := indexOfName(propCols, fn.IDColumn)
 	sql, argValues := sqlGeomFunction(fn, args, propCols, param)
 	log.Debugf("Function features query: %v", sql)
 	log.Debugf("Function %v Args: %v", name, argValues)

internal/service/handler.go

@@ -636,7 +636,7 @@ func writeFunItemsHTML(w http.ResponseWriter, name string, query string, urlBase
 	context.Group = "Functions"
 	context.Title = fn.ID
 	context.Function = fn
-	context.IDColumn = conf.Configuration.Database.IdColumn
+	context.IDColumn = fn.IDColumn
 
 	// features are not needed for items page (page queries for them)
 	return writeHTML(w, nil, context, ui.PageFunctionItems())