Add support for MariaDB/MySQL #1229
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 20, 2017 17:11
nwmac
suggested changes
Aug 31, 2017
| dc.Port, | ||
| escapeStr(dc.Database)) | ||
|
|
||
| log.Printf("DB Connection string: %s:*********tcp(%s:%d)/%s?parseTime=true", |
There was a problem hiding this comment.
@ char missing after the starred-out password
| @@ -226,7 +267,7 @@ func Ping(db *sql.DB) error { | |||
| // SQLite uses ? | |||
| func ModifySQLStatement(sql string, databaseProvider string) string { | |||
|
|
|||
| if databaseProvider == "sqlite" { | |||
| if databaseProvider == "sqlite" || databaseProvider == "mysql" { | |||
There was a problem hiding this comment.
Can we not use the constants that were added?
components/app-core/backend/main.go
Outdated
| @@ -283,9 +286,19 @@ func initSessionStore(db *sql.DB, databaseProvider string, pc interfaces.PortalC | |||
| sessionStore.Options.Secure = true | |||
| return sessionStore, err | |||
| } | |||
| // Store depends on the DB Type | |||
| if databaseProvider == "mysql" { | |||
components/app-core/backend/main.go
Outdated
| @@ -273,6 +274,8 @@ func initConnPool(dc datastore.DatabaseConfig) (*sql.DB, error) { | |||
| func initSessionStore(db *sql.DB, databaseProvider string, pc interfaces.PortalConfig, sessionExpiry int) (HttpSessionStore, error) { | |||
| log.Debug("initSessionStore") | |||
|
|
|||
| sessionsTable := "sessions" | |||
|
|
|||
| // Store depends on the DB Type | |||
| if databaseProvider == "pgsql" { | |||
|
|
||
| _, err := txn.Exec(createTokens) | ||
| if err != nil { | ||
| fmt.Printf("Failed ot migrate due to: %v", err) |
There was a problem hiding this comment.
The function has no return params - how do we report that the migration failed - all we are doing is printing an error.
|
|
||
| _, err = txn.Exec(createCnsisTable) | ||
| if err != nil { | ||
| fmt.Printf("Failed ot migrate due to: %v", err) |
| createIndex := "CREATE INDEX tokens_user_guid ON tokens (user_guid);" | ||
| _, err = txn.Exec(createIndex) | ||
| if err != nil { | ||
| fmt.Printf("Failed ot migrate due to: %v", err) |
| createIndex = "CREATE INDEX tokens_cnsi_guid ON tokens (cnsi_guid);" | ||
| _, err = txn.Exec(createIndex) | ||
| if err != nil { | ||
| fmt.Printf("Failed ot migrate due to: %v", err) |
There was a problem hiding this comment.
Same typo - there are many, please fix!
|
|
||
| _, err := txn.Exec(consoleConfigTable) | ||
| if err != nil { | ||
| fmt.Printf("Failed ot migrate due to: %v", err) |
There was a problem hiding this comment.
Same typo - many occurrences
|
@nwmac I've addressed all comments. Once this is merged I'll update the PRs that depend on this. This should be merged without squashing, since that will simplify the other PRs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gomigrations