From f7460a6aa6a28212bd3232b5f930b519f371d62a Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 28 May 2021 13:47:57 +0300 Subject: [PATCH] Updated storage scripts to include the ees and ers DB --- data/conf/samples/ees/cgrates.json | 4 ++-- .../scripts/mysql/create_db_with_users_extra.sql | 2 -- data/storage/mysql/create_db_with_users.sql | 6 ++++++ data/storage/postgres/create_db_with_users.sh | 4 ++++ ees/sql_it_test.go | 6 +++--- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/data/conf/samples/ees/cgrates.json b/data/conf/samples/ees/cgrates.json index 40ac5cf23..a6c424123 100644 --- a/data/conf/samples/ees/cgrates.json +++ b/data/conf/samples/ees/cgrates.json @@ -394,7 +394,7 @@ "export_path": "mysql://cgrates:CGRateS.org@127.0.0.1:3306", "attempts": 1, "opts": { - "sqlDBName": "exportedDatabase", // if dbName is not present "cgrates" will be used as default + "sqlDBName": "cgrates2", // if dbName is not present "cgrates" will be used as default "sqlTableName": "expTable", // tableName is mandatory in opts for sql exporter "maxIdleConns": "disable", "sqlMaxIdleConns": "10", @@ -415,7 +415,7 @@ "export_path": "mysql://cgrates:CGRateS.org@127.0.0.1:3306", "attempts": 1, "opts": { - "sqlDBName": "exportedDatabase", + "sqlDBName": "cgrates2", "sqlTableName": "expTable", "maxIdleConns": "disable", "sqlMaxIdleConns": "10", diff --git a/data/docker/integration/scripts/mysql/create_db_with_users_extra.sql b/data/docker/integration/scripts/mysql/create_db_with_users_extra.sql index 7aee5f429..2d9e5c601 100644 --- a/data/docker/integration/scripts/mysql/create_db_with_users_extra.sql +++ b/data/docker/integration/scripts/mysql/create_db_with_users_extra.sql @@ -4,8 +4,6 @@ -- CREATE DATABASE cgrates2; -CREATE DATABASE exportedDatabase; GRANT ALL on cgrates.* TO 'cgrates'@'127.0.0.1' IDENTIFIED BY 'CGRateS.org'; GRANT ALL on cgrates2.* TO 'cgrates'@'127.0.0.1' IDENTIFIED BY 'CGRateS.org'; -GRANT ALL on exportedDatabase.* TO 'cgrates'@'127.0.0.1' IDENTIFIED BY 'CGRateS.org'; diff --git a/data/storage/mysql/create_db_with_users.sql b/data/storage/mysql/create_db_with_users.sql index 31746b604..168504926 100644 --- a/data/storage/mysql/create_db_with_users.sql +++ b/data/storage/mysql/create_db_with_users.sql @@ -7,3 +7,9 @@ DROP DATABASE IF EXISTS cgrates; CREATE DATABASE cgrates; GRANT ALL on cgrates.* TO 'cgrates'@'localhost' IDENTIFIED BY 'CGRateS.org'; + +-- extra DB for ees and ers +DROP DATABASE IF EXISTS cgrates2; +CREATE DATABASE cgrates2; + +GRANT ALL on cgrates2.* TO 'cgrates'@'localhost' IDENTIFIED BY 'CGRateS.org'; diff --git a/data/storage/postgres/create_db_with_users.sh b/data/storage/postgres/create_db_with_users.sh index 484290ec1..03947cebd 100755 --- a/data/storage/postgres/create_db_with_users.sh +++ b/data/storage/postgres/create_db_with_users.sh @@ -7,3 +7,7 @@ sudo -u postgres dropdb -e cgrates sudo -u postgres dropuser -e cgrates sudo -u postgres psql -c "CREATE USER cgrates password 'CGRateS.org';" sudo -u postgres createdb -e -O cgrates cgrates + +# extra DB for ees and ers +sudo -u postgres dropdb -e cgrates2 +sudo -u postgres createdb -e -O cgrates cgrates2 diff --git a/ees/sql_it_test.go b/ees/sql_it_test.go index b78108643..0fed47fdd 100644 --- a/ees/sql_it_test.go +++ b/ees/sql_it_test.go @@ -76,7 +76,7 @@ type testModelSql struct { Cost float64 } -func (_ *testModelSql) TableName() string { +func (*testModelSql) TableName() string { return "expTable" } @@ -89,11 +89,11 @@ func testSqlEeCreateTable(t *testing.T) { }); err != nil { return } - if err = db2.Exec(`CREATE DATABASE IF NOT EXISTS exportedDatabase;`).Error; err != nil { + if err = db2.Exec(`CREATE DATABASE IF NOT EXISTS cgrates2;`).Error; err != nil { t.Fatal(err) } - if db2, err = gorm.Open(mysql.Open(fmt.Sprintf(dbConnString, "exportedDatabase")), &gorm.Config{ + if db2, err = gorm.Open(mysql.Open(fmt.Sprintf(dbConnString, "cgrates2")), &gorm.Config{ AllowGlobalUpdate: true, Logger: logger.Default.LogMode(logger.Silent), }); err != nil {