From ff299c4e47fe88e6c7d17ed48caa760e82cb6c21 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Mon, 4 Jun 2018 04:12:23 -0400 Subject: [PATCH 01/12] add initial changes for postgres support --- build.gradle | 7 +++++++ grails-app/domain/streama/User.groovy | 2 ++ 2 files changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index 4ddccb589..d4a171951 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ ext { repositories { mavenLocal() maven { url "https://repo.grails.org/grails/core" } + jcenter() } dependencyManagement { @@ -99,6 +100,12 @@ dependencies { compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' + compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' + //runtime 'org.postgresql:postgresql:42.1.4' + // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md + compile 'org.grails.plugins:postgresql-extensions:5.2.0' + //provided 'org.postgresql:postgresql:42.1.4' + } task wrapper(type: Wrapper) { diff --git a/grails-app/domain/streama/User.groovy b/grails-app/domain/streama/User.groovy index 39ef9c5bf..72243d36c 100644 --- a/grails-app/domain/streama/User.groovy +++ b/grails-app/domain/streama/User.groovy @@ -37,6 +37,8 @@ class User { } static mapping = { + //User is reserved keyword in some systems, like PostgreSQL + table 'users' password column: '`password`' cache true } From 26524e68d46f98152e5dec62af973ed0e7f95313 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 09:07:26 -0400 Subject: [PATCH 02/12] update postgresql connector --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d4a171951..84d7a2c19 100644 --- a/build.gradle +++ b/build.gradle @@ -100,10 +100,10 @@ dependencies { compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' - compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' - //runtime 'org.postgresql:postgresql:42.1.4' + //compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' + runtime 'org.postgresql:postgresql:42.2.2' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md - compile 'org.grails.plugins:postgresql-extensions:5.2.0' + //compile 'org.grails.plugins:postgresql-extensions:5.2.0' //provided 'org.postgresql:postgresql:42.1.4' } From 4949f77d44260bad6506dc21d561ee462497a387 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 10:10:54 -0400 Subject: [PATCH 03/12] update PostgreSQL JDBC Driver to version 42.2.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 84d7a2c19..1a5202b77 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ dependencies { compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' //compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' - runtime 'org.postgresql:postgresql:42.2.2' + runtime 'org.postgresql:postgresql:42.2.3' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md //compile 'org.grails.plugins:postgresql-extensions:5.2.0' //provided 'org.postgresql:postgresql:42.1.4' From fcebcf3c99cfc38b582ecdf87a6f4e08c1bfcac2 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 11:31:10 -0400 Subject: [PATCH 04/12] add mysql table migration script --- .../mysql-table-user-to-users.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 migration-scripts/mysql-table-user-to-users.sh diff --git a/migration-scripts/mysql-table-user-to-users.sh b/migration-scripts/mysql-table-user-to-users.sh new file mode 100755 index 000000000..18fe182aa --- /dev/null +++ b/migration-scripts/mysql-table-user-to-users.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# get streama database user name, password and DB name for mysql +echo input mysql user name for streama database: +read -s USER +echo '' +echo input mysql user password for streama database: +read -s PASS +echo '' +echo input mysql database name for streama database: +read -s D +echo '' + +# check for 'user'/'users' table +if [ -z "$(mysql -u $USER --password=$PASS -D $DB -e "show tables like 'user'")" ]; then + echo "'user' table does not exist" + if [ -z "$(mysql -u $USER --password=$PASS -D $DB -e "show tables like 'users'")" ]; then + echo "'users' table does not exist either" + echo "there is an issue with your streama database" + else + echo "'users table exists'" + echo "no need to rename table" + fi + +else + echo "'user' table exists" + echo "renaming 'user' table to 'users'" + mysql -u $USER --password=$PASS -D $DB -e "ALTER TABLE user RENAME users" + if [ -z "$(mysql -u $USER --password=$PASS -D $DB -e "show tables like 'users'")" ]; then + echo "rename failed" + else + echo "rename succeeded" + fi + +fi + +echo "" +echo "finished" From b25250245f5d8d26270a83980e0db0d80aa3bbee Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 11:46:41 -0400 Subject: [PATCH 05/12] revert breaking changes before submitting to master repo --- build.gradle | 6 ++++-- grails-app/domain/streama/User.groovy | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1a5202b77..8daee89bc 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ ext { repositories { mavenLocal() maven { url "https://repo.grails.org/grails/core" } - jcenter() } dependencyManagement { @@ -100,12 +99,15 @@ dependencies { compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' +<<<<<<< HEAD //compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' - runtime 'org.postgresql:postgresql:42.2.3' + //runtime 'org.postgresql:postgresql:42.2.3' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md //compile 'org.grails.plugins:postgresql-extensions:5.2.0' //provided 'org.postgresql:postgresql:42.1.4' +======= +>>>>>>> parent of ff299c4... add initial changes for postgres support } task wrapper(type: Wrapper) { diff --git a/grails-app/domain/streama/User.groovy b/grails-app/domain/streama/User.groovy index 72243d36c..39ef9c5bf 100644 --- a/grails-app/domain/streama/User.groovy +++ b/grails-app/domain/streama/User.groovy @@ -37,8 +37,6 @@ class User { } static mapping = { - //User is reserved keyword in some systems, like PostgreSQL - table 'users' password column: '`password`' cache true } From 1e3f4058481c8607d5107b7ae0792c9cda4e0289 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 11:48:20 -0400 Subject: [PATCH 06/12] clean up build.gradle before subit to upstream repo --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8daee89bc..e4a130ebf 100644 --- a/build.gradle +++ b/build.gradle @@ -99,15 +99,12 @@ dependencies { compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' -<<<<<<< HEAD //compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' //runtime 'org.postgresql:postgresql:42.2.3' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md //compile 'org.grails.plugins:postgresql-extensions:5.2.0' //provided 'org.postgresql:postgresql:42.1.4' -======= ->>>>>>> parent of ff299c4... add initial changes for postgres support } task wrapper(type: Wrapper) { From 8e0bc6c263187388582ebed39275f80c8ccf529b Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 12:00:30 -0400 Subject: [PATCH 07/12] clean up postgresql dependencies --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e4a130ebf..bfdb409d4 100644 --- a/build.gradle +++ b/build.gradle @@ -99,11 +99,13 @@ dependencies { compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' runtime 'mysql:mysql-connector-java:5.1.36' - //compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4' + // runtime for postgresql works fine + // but compile group kept for testing as per closed pull request #368 + //compile group: 'org.postgresql', name: 'postgresql', version: '42.2.3' //runtime 'org.postgresql:postgresql:42.2.3' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md + // streama seems to work fine without it though //compile 'org.grails.plugins:postgresql-extensions:5.2.0' - //provided 'org.postgresql:postgresql:42.1.4' } From 6692d8d459fc70274f38260e65bf442b029789aa Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Sun, 15 Jul 2018 12:12:35 -0400 Subject: [PATCH 08/12] fix DB var name --- migration-scripts/mysql-table-user-to-users.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration-scripts/mysql-table-user-to-users.sh b/migration-scripts/mysql-table-user-to-users.sh index 18fe182aa..fcc8b4fc4 100755 --- a/migration-scripts/mysql-table-user-to-users.sh +++ b/migration-scripts/mysql-table-user-to-users.sh @@ -8,7 +8,7 @@ echo input mysql user password for streama database: read -s PASS echo '' echo input mysql database name for streama database: -read -s D +read -s DB echo '' # check for 'user'/'users' table From e41f54722fbfa034c66cc9efe4d8f7e86e83d402 Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Tue, 29 Jan 2019 15:20:58 -0500 Subject: [PATCH 09/12] update postgresql driver --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bfdb409d4..30091dd90 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ dependencies { runtime 'mysql:mysql-connector-java:5.1.36' // runtime for postgresql works fine // but compile group kept for testing as per closed pull request #368 - //compile group: 'org.postgresql', name: 'postgresql', version: '42.2.3' + //compile group: 'org.postgresql', name: 'postgresql', version: '42.2.5' //runtime 'org.postgresql:postgresql:42.2.3' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md // streama seems to work fine without it though From 3d7a425495fe12f0e8d456d407a74012b2bf63cc Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Thu, 31 Jan 2019 12:47:47 -0500 Subject: [PATCH 10/12] update runtime postgresql driver --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 30091dd90..d30bfdee2 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ dependencies { // runtime for postgresql works fine // but compile group kept for testing as per closed pull request #368 //compile group: 'org.postgresql', name: 'postgresql', version: '42.2.5' - //runtime 'org.postgresql:postgresql:42.2.3' + //runtime 'org.postgresql:postgresql:42.2.5' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md // streama seems to work fine without it though //compile 'org.grails.plugins:postgresql-extensions:5.2.0' From 5b83ada0d37444aec379be88195cbf415568056e Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Thu, 31 Jan 2019 12:51:11 -0500 Subject: [PATCH 11/12] update postgresql extensions to 6.1.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d30bfdee2..50cabbfcc 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,7 @@ dependencies { //runtime 'org.postgresql:postgresql:42.2.5' // as per instructions @ https://github.com/kaleidos/grails-postgresql-extensions/blob/master/README.md // streama seems to work fine without it though - //compile 'org.grails.plugins:postgresql-extensions:5.2.0' + //compile 'org.grails.plugins:postgresql-extensions:6.1.0' } From 26fa462e7053e76fd53fbc881cc8da630acf0e8c Mon Sep 17 00:00:00 2001 From: DerVerruckteFuchs Date: Tue, 26 Mar 2019 21:14:12 -0400 Subject: [PATCH 12/12] update mysql-connector-java to 8.0.12 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 50cabbfcc..186fafd19 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ dependencies { compile "org.grails.plugins:mail:2.0.0.RC4" compile "org.grails.plugins:grails-spring-websocket:2.3.0" compile group: 'eu.bitwalker', name: 'UserAgentUtils', version: '1.20' - runtime 'mysql:mysql-connector-java:5.1.36' + runtime 'mysql:mysql-connector-java:8.0.12' // runtime for postgresql works fine // but compile group kept for testing as per closed pull request #368 //compile group: 'org.postgresql', name: 'postgresql', version: '42.2.5'