From 62d75f74f25367d1e8ac7ac9d67434b41cb057cd Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Fri, 21 Dec 2018 03:02:34 +0100
Subject: [PATCH] Rename Config.DbServerIP() and DbServerPort() to SqlServer*,
 see #50

---
 internal/context/config.go    | 34 +++++++++++++++++-----------------
 internal/photoprism/config.go |  4 ++--
 internal/test/config.go       |  8 ++++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/internal/context/config.go b/internal/context/config.go
index 221fdd7a6..6930219bd 100644
--- a/internal/context/config.go
+++ b/internal/context/config.go
@@ -35,8 +35,8 @@ type Config struct {
 	appCopyright   string
 	debug          bool
 	configFile     string
-	dbServerIP     string
-	dbServerPort   uint
+	sqlServerHost  string
+	sqlServerPort  uint
 	dbServerPath   string
 	serverIP       string
 	serverPort     int
@@ -82,12 +82,12 @@ func (c *Config) SetValuesFromFile(fileName string) error {
 		c.debug = debug
 	}
 
-	if dbServerIP, err := yamlConfig.Get("db-host"); err == nil {
-		c.dbServerIP = dbServerIP
+	if sqlServerHost, err := yamlConfig.Get("sql-host"); err == nil {
+		c.sqlServerHost = sqlServerHost
 	}
 
-	if dbServerPort, err := yamlConfig.GetInt("db-port"); err == nil {
-		c.dbServerPort = uint(dbServerPort)
+	if sqlServerPort, err := yamlConfig.GetInt("sql-port"); err == nil {
+		c.sqlServerPort = uint(sqlServerPort)
 	}
 
 	if dbServerPath, err := yamlConfig.Get("db-path"); err == nil {
@@ -180,12 +180,12 @@ func (c *Config) SetValuesFromCliContext(ctx *cli.Context) error {
 		c.databaseDsn = ctx.GlobalString("database-dsn")
 	}
 
-	if ctx.IsSet("db-host") || c.dbServerIP == "" {
-		c.dbServerIP = ctx.String("db-host")
+	if ctx.IsSet("sql-host") || c.sqlServerHost == "" {
+		c.sqlServerHost = ctx.String("sql-host")
 	}
 
-	if ctx.IsSet("db-port") || c.dbServerPort == 0 {
-		c.dbServerPort = ctx.Uint("db-port")
+	if ctx.IsSet("sql-port") || c.sqlServerPort == 0 {
+		c.sqlServerPort = ctx.Uint("sql-port")
 	}
 
 	if ctx.IsSet("db-path") || c.dbServerPath == "" {
@@ -321,17 +321,17 @@ func (c *Config) ConfigFile() string {
 	return c.configFile
 }
 
-// DbServerIP returns the database server IP address (empty for all).
-func (c *Config) DbServerIP() string {
-	return c.dbServerIP
+// SqlServerHost returns the built-in SQL server host name or IP address (empty for all interfaces).
+func (c *Config) SqlServerHost() string {
+	return c.sqlServerHost
 }
 
-// DbServerPort returns the database server port.
-func (c *Config) DbServerPort() uint {
-	return c.dbServerPort
+// SqlServerPort returns the built-in SQL server port.
+func (c *Config) SqlServerPort() uint {
+	return c.sqlServerPort
 }
 
-// GetServerIP returns the server IP address (empty for all).
+// GetServerIP returns the server host name or IP address (empty for all interfaces).
 func (c *Config) GetServerIP() string {
 	return c.serverIP
 }
diff --git a/internal/photoprism/config.go b/internal/photoprism/config.go
index 53957d276..f080117a8 100644
--- a/internal/photoprism/config.go
+++ b/internal/photoprism/config.go
@@ -20,8 +20,8 @@ type Config interface {
 	AppVersion() string
 	AppCopyright() string
 	Debug() bool
-	DbServerIP() string
-	DbServerPort() uint
+	SqlServerHost() string
+	SqlServerPort() uint
 	GetServerIP() string
 	GetServerPort() int
 	GetServerMode() string
diff --git a/internal/test/config.go b/internal/test/config.go
index 961686be4..5a7d9b12d 100644
--- a/internal/test/config.go
+++ b/internal/test/config.go
@@ -188,13 +188,13 @@ func (c *Config) GetServerPort() int {
 	return 80
 }
 
-// DbServerIP returns the database server IP address (empty for all).
-func (c *Config) DbServerIP() string {
+// SqlServerHost returns the database server IP address (empty for all).
+func (c *Config) SqlServerHost() string {
 	return "127.0.0.1"
 }
 
-// DbServerPort returns the database server port.
-func (c *Config) DbServerPort() uint {
+// SqlServerPort returns the database server port.
+func (c *Config) SqlServerPort() uint {
 	return 4001
 }