From 28ab0d835878bf1ad72dbae914ca112acfbe490d Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 22 Feb 2016 16:31:19 -0800 Subject: Fixing postgres --- store/sql_store.go | 4 ++-- store/sql_store_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'store') diff --git a/store/sql_store.go b/store/sql_store.go index 9e22191b4..de23f4db3 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -389,7 +389,7 @@ func (ss SqlStore) GetMaxLengthOfColumnIfExists(tableName string, columnName str if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { result, err = ss.GetMaster().SelectStr("SELECT CHARACTER_MAXIMUM_LENGTH FROM information_schema.columns WHERE table_name = '" + tableName + "' AND COLUMN_NAME = '" + columnName + "'") } else if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { - result, err = ss.GetMaster().SelectStr("SELECT character_maximum_length FROM information_schema.columns WHERE table_name = '" + tableName + "' AND column_name = '" + columnName + "'") + result, err = ss.GetMaster().SelectStr("SELECT character_maximum_length FROM information_schema.columns WHERE table_name = '" + strings.ToLower(tableName) + "' AND column_name = '" + strings.ToLower(columnName) + "'") } if err != nil { @@ -410,7 +410,7 @@ func (ss SqlStore) AlterColumnTypeIfExists(tableName string, columnName string, if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { _, err = ss.GetMaster().Exec("ALTER TABLE " + tableName + " MODIFY " + columnName + " " + mySqlColType) } else if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { - _, err = ss.GetMaster().Exec("ALTER TABLE " + tableName + " ALTER COLUMN " + columnName + " TYPE " + mySqlColType) + _, err = ss.GetMaster().Exec("ALTER TABLE " + strings.ToLower(tableName) + " ALTER COLUMN " + strings.ToLower(columnName) + " TYPE " + postgresColType) } if err != nil { diff --git a/store/sql_store_test.go b/store/sql_store_test.go index 783d72b83..474a68ac7 100644 --- a/store/sql_store_test.go +++ b/store/sql_store_test.go @@ -106,7 +106,7 @@ func TestAlertDbCmds(t *testing.T) { maxLen := sqlStore.GetMaxLengthOfColumnIfExists("Systems", "Test") if maxLen != "50" { - t.Fatal("Failed to get max length") + t.Fatal("Failed to get max length found " + maxLen) } if !sqlStore.AlterColumnTypeIfExists("Systems", "Test", "VARCHAR(25)", "VARCHAR(25)") { -- cgit v1.2.3-1-g7c22