capital D

Author: beasteers

config/pg_featureserv.toml.example

@@ -69,7 +69,7 @@ WriteTimeoutSec = 30
 # FunctionIncludes = [ "postgisftw", "schema2" ]
 
 # Designate a column as the feature ID (where primary key is not available e.g. views/functions)
-# IdColumn = "id"
+# IDColumn = "id"
 
 [Paging]
 # The default number of features in a response

hugo/content/installation/configuration.md

@@ -120,7 +120,7 @@ WriteTimeoutSec = 30
 # FunctionIncludes = [ "postgisftw", "schema2" ]
 
 # Designate a column as the feature ID (where primary key is not available e.g. views/functions)
-# IdColumn = "id"
+# IDColumn = "id"
 
 [Paging]
 # The default number of features in a response
@@ -246,7 +246,7 @@ Overrides items specified in `TableIncludes`.
 A list of the schemas to publish functions from.
 The default is to publish functions in the `postgisftw` schema.
 
-#### IdColumn
+#### IDColumn
 
 The column to use as the feature ID in cases where a primary key is not available. The default is `id`.
 

internal/conf/config.go

@@ -44,7 +44,7 @@ func setDefaultConfig() {
 	viper.SetDefault("Database.TableIncludes", []string{})
 	viper.SetDefault("Database.TableExcludes", []string{})
 	viper.SetDefault("Database.FunctionIncludes", []string{"postgisftw"})
-	viper.SetDefault("Database.IdColumn", "id")
+	viper.SetDefault("Database.IDColumn", "id")
 
 	viper.SetDefault("Paging.LimitDefault", 10)
 	viper.SetDefault("Paging.LimitMax", 1000)
@@ -95,7 +95,7 @@ type Database struct {
 	TableIncludes         []string
 	TableExcludes         []string
 	FunctionIncludes      []string
-	IdColumn              string
+	IDColumn              string
 }
 
 // Metadata config

internal/data/catalog_db.go

@@ -355,9 +355,9 @@ func scanTable(rows pgx.Rows) *Table {
 	}
 
 	// detect ID column if primary key not defined.
-	if idColumn == "" && conf.Configuration.Database.IdColumn != "" {
-		if _, ok := datatypes[conf.Configuration.Database.IdColumn]; ok {
-			idColumn = conf.Configuration.Database.IdColumn
+	if idColumn == "" && conf.Configuration.Database.IDColumn != "" {
+		if _, ok := datatypes[conf.Configuration.Database.IDColumn]; ok {
+			idColumn = conf.Configuration.Database.IDColumn
 		}
 	}
 

internal/data/catalog_db_fun.go

@@ -116,9 +116,9 @@ 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
+	if conf.Configuration.Database.IDColumn != "" {
+		if _, ok := datatypes[conf.Configuration.Database.IDColumn]; ok {
+			idColumn = conf.Configuration.Database.IDColumn
 		}
 	}