uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Make ers opts as struct and fix compilation errors

Browse Source
This commit is contained in:
ionutboangiu
2021-11-26 17:09:59 +02:00
committed by Dan Christian Bogos
parent 40eb832060
commit 38447e9229
39 changed files with 869 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ers/sql_test.go
View File

@@ -40,14 +40,14 @@ func TestSQLSetURL(t *testing.T) {
}
inURL := "*mysql://cgrates:CGRateS.org@127.0.0.1:3306"
outURL := "*mysql://cgrates:CGRateS.org@127.0.0.1:3306"
if err := sql.setURL(inURL, outURL, map[string]interface{}{
utils.SQLDBNameOpt: "cgrates2",
utils.SQLTableNameOpt: "cdrs2",
utils.SSLModeCfg: "enabled",
if err := sql.setURL(inURL, outURL, &config.EventReaderOpts{
SQLDBName: utils.StringPointer("cgrates2"),
SQLTableName: utils.StringPointer("cdrs2"),
SSLMode: utils.StringPointer("enabled"),
utils.SQLDBNameOpt + utils.ProcessedOpt: "cgrates3",
utils.SQLTableNameOpt + utils.ProcessedOpt: "cdrs3",
utils.SSLModeCfg + utils.ProcessedOpt: "enabled",
SQLDBNameProcessed: utils.StringPointer("cgrates3"),
SQLTableNameProcessed: utils.StringPointer("cdrs3"),
SSLModeProcessed: utils.StringPointer("enabled"),
}); err != nil {
t.Fatal(err)
} else if expsql.connString != sql.connString {
@@ -75,14 +75,14 @@ func TestSQLSetURL(t *testing.T) {
}
inURL = "*postgres://cgrates:CGRateS.org@127.0.0.1:3306"
outURL = "*postgres://cgrates:CGRateS.org@127.0.0.1:3306"
if err := sql.setURL(inURL, outURL, map[string]interface{}{
utils.SQLDBNameOpt: "cgrates2",
utils.SQLTableNameOpt: "cdrs2",
utils.SSLModeCfg: "enabled",
if err := sql.setURL(inURL, outURL, &config.EventReaderOpts{
SQLDBName: utils.StringPointer("cgrates2"),
SQLTableName: utils.StringPointer("cdrs2"),
SSLMode: utils.StringPointer("enabled"),
utils.SQLDBNameOpt + utils.ProcessedOpt: "cgrates3",
utils.SQLTableNameOpt + utils.ProcessedOpt: "cdrs3",
utils.SSLModeCfg + utils.ProcessedOpt: "enabled",
SQLDBNameProcessed: utils.StringPointer("cgrates3"),
SQLTableNameProcessed: utils.StringPointer("cdrs3"),
SSLModeProcessed: utils.StringPointer("enabled"),
}); err != nil {
t.Fatal(err)
} else if expsql.connString != sql.connString {
@@ -110,14 +110,14 @@ func TestSQLSetURL(t *testing.T) {
}
inURL = "*postgres://cgrates:CGRateS.org@127.0.0.1:3306"
outURL = ""
if err := sql.setURL(inURL, outURL, map[string]interface{}{
utils.SQLDBNameOpt: "cgrates2",
utils.SQLTableNameOpt: "cdrs2",
utils.SSLModeCfg: "enabled",
if err := sql.setURL(inURL, outURL, &config.EventReaderOpts{
SQLDBName: utils.StringPointer("cgrates2"),
SQLTableName: utils.StringPointer("cdrs2"),
SSLMode: utils.StringPointer("enabled"),
utils.SQLDBNameOpt + utils.ProcessedOpt: "cgrates2",
utils.SQLTableNameOpt + utils.ProcessedOpt: "cdrs2",
utils.SSLModeCfg + utils.ProcessedOpt: "enabled",
SQLDBNameProcessed: utils.StringPointer("cgrates2"),
SQLTableNameProcessed: utils.StringPointer("cdrs2"),
SSLModeProcessed: utils.StringPointer("enabled"),
}); err != nil {
t.Fatal(err)
} else if expsql.connString != sql.connString {
@@ -136,12 +136,12 @@ func TestSQLSetURL(t *testing.T) {
inURL = "*postgres://cgrates:CGRateS.org@127.0.0.1:3306?dbName=cgrates2&tableName=cdrs2&sslmode=enabled"
outURL = "*postgres2://cgrates:CGRateS.org@127.0.0.1:3306?dbName=cgrates2&tableName=cdrs2&sslmode=enabled"
if err := sql.setURL(inURL, outURL, make(map[string]interface{})); err == nil || err.Error() != "unknown db_type postgres2" {
if err := sql.setURL(inURL, outURL, &config.EventReaderOpts{}); err == nil || err.Error() != "unknown db_type postgres2" {
t.Errorf("Expected error: 'unknown db_type postgres2' ,received: %v", err)
}
inURL = "*postgres2://cgrates:CGRateS.org@127.0.0.1:3306?dbName=cgrates2&tableName=cdrs2&sslmode=enabled"
outURL = "*postgres://cgrates:CGRateS.org@127.0.0.1:3306?dbName=cgrates2&tableName=cdrs2&sslmode=enabled"
if err := sql.setURL(inURL, outURL, make(map[string]interface{})); err == nil || err.Error() != "unknown db_type postgres2" {
if err := sql.setURL(inURL, outURL, &config.EventReaderOpts{}); err == nil || err.Error() != "unknown db_type postgres2" {
t.Errorf("Expected error: 'unknown db_type postgres2' ,received: %v", err)
}
}