perform id fallback in go instead of sql

Author: beasteers

internal/data/catalog_db.go

@@ -262,7 +262,7 @@ func tablesSorted(tableMap map[string]*Table) []*Table {
 
 func (cat *catalogDB) readTables(db *pgxpool.Pool) map[string]*Table {
 	log.Debugf("Load table catalog:\n%v", sqlTables)
-	rows, err := db.Query(context.Background(), sqlTables, conf.Configuration.Database.IdColumn)
+	rows, err := db.Query(context.Background(), sqlTables)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -354,6 +354,13 @@ func scanTable(rows pgx.Rows) *Table {
 		colDesc[i] = props.Elements[elmPos+2].String
 	}
 
+	// default ID column if primary key not defined. check if conf.Configuration.Database.IdColumn is among columns
+	if idColumn == "" && conf.Configuration.Database.IdColumn != "" {
+		if _, ok := datatypes[conf.Configuration.Database.IdColumn]; ok {
+			idColumn = conf.Configuration.Database.IdColumn
+		}
+	}
+
 	// Synthesize a title for now
 	title := id
 	// synthesize a description if none provided

internal/data/db_sql.go

@@ -31,7 +31,7 @@ const sqlTables = `SELECT
 	a.attname AS geometry_column,
 	postgis_typmod_srid(a.atttypmod) AS srid,
 	postgis_typmod_type(a.atttypmod) AS geometry_type,
-	coalesce(ia.attname, fid.attname, '') AS id_column,
+	coalesce(ia.attname, '') AS id_column,
 	(
 		SELECT array_agg(ARRAY[sa.attname, st.typname, coalesce(da.description,''), sa.attnum::text]::text[] ORDER BY sa.attnum)
 		FROM pg_attribute sa
@@ -50,7 +50,6 @@ LEFT JOIN pg_description d ON (c.oid = d.objoid AND d.objsubid = 0)
 LEFT JOIN pg_index i ON (c.oid = i.indrelid AND i.indisprimary
 AND i.indnatts = 1)
 LEFT JOIN pg_attribute ia ON (ia.attrelid = i.indexrelid)
-LEFT JOIN pg_attribute fid ON (fid.attrelid = c.oid AND fid.attname = $1 AND fid.attnum > 0 AND NOT fid.attisdropped)
 LEFT JOIN pg_type it ON (ia.atttypid = it.oid AND it.typname in ('int2', 'int4', 'int8'))
 WHERE c.relkind IN ('r', 'v', 'm', 'p', 'f')
 AND t.typname IN ('geometry', 'geography')