Upgrade MySQL scripts and JDBC driver

wso2-attic · Oct 25, 2018 · 9ea6d64 · 9ea6d64
1 parent f3d0b13
commit 9ea6d64
Show file tree

Hide file tree

Showing 13 changed files with 164 additions and 158 deletions.
diff --git a/apim-is-as-km-with-analytics/Vagrantfile b/apim-is-as-km-with-analytics/Vagrantfile
@@ -32,7 +32,6 @@ if ARGV[0] == '--updates'
   TOKEN = [ERB::Util.url_encode(USERNAME), ERB::Util.url_encode(PASSWORD)].join(':')
 else
   # initializing USERNAME and PASSWORD
-  print "Using the Vagrant boxes with no updates...\n"
   USERNAME = ""
   PASSWORD = ""
 end

diff --git a/apim-is-as-km-with-analytics/apim-analytics-worker/confs/conf/worker/deployment.yaml b/apim-is-as-km-with-analytics/apim-analytics-worker/confs/conf/worker/deployment.yaml
@@ -417,7 +417,7 @@ wso2.datasources:
           jdbcUrl: 'jdbc:mysql://172.28.128.3:3306/stats_db?useSSL=false'
           username: root
           password: wso2carbon
-          driverClassName: com.mysql.jdbc.Driver
+          driverClassName: com.mysql.cj.jdbc.Driver
           maxPoolSize: 50
           idleTimeout: 60000
           connectionTestQuery: SELECT 1

diff --git a/apim-is-as-km-with-analytics/apim/confs/repository/conf/datasources/master-datasources.xml b/apim-is-as-km-with-analytics/apim/confs/repository/conf/datasources/master-datasources.xml
@@ -39,7 +39,7 @@
                     <url>jdbc:mysql://172.28.128.3:3306/carbon_db?autoReconnect=true&amp;useSSL=false</url>
                     <username>root</username>
                     <password>wso2carbon</password>
-                    <driverClassName>com.mysql.jdbc.Driver</driverClassName>
+                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>
@@ -62,7 +62,7 @@
                     <username>root</username>
                     <password>wso2carbon</password>
                     <defaultAutoCommit>true</defaultAutoCommit>
-                    <driverClassName>com.mysql.jdbc.Driver</driverClassName>
+                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>

diff --git a/...is-as-km-with-analytics/is-as-km/confs/repository/conf/datasources/master-datasources.xml b/...is-as-km-with-analytics/is-as-km/confs/repository/conf/datasources/master-datasources.xml
@@ -38,7 +38,7 @@
                     <url>jdbc:mysql://172.28.128.3:3306/carbon_db?autoReconnect=true&amp;useSSL=false</url>
                     <username>root</username>
                     <password>wso2carbon</password>
-                    <driverClassName>com.mysql.jdbc.Driver</driverClassName>
+                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>
@@ -60,7 +60,7 @@
                     <url>jdbc:mysql://172.28.128.3:3306/apimgt_db?autoReconnect=true&amp;useSSL=false</url>
                     <username>root</username>
                     <password>wso2carbon</password>
-                    <driverClassName>com.mysql.jdbc.Driver</driverClassName>
+                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>

diff --git a/apim-is-as-km-with-analytics/mysql/provisioner/db_provisioner.sh b/apim-is-as-km-with-analytics/mysql/provisioner/db_provisioner.sh
@@ -22,8 +22,8 @@ WORKING_DIRECTORY=/home/vagrant
 
 # run product db script
 echo "Execute the database scripts..."
-mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mysql.sql"
-mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/um_mysql.sql"
+mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mysql5.7.sql"
+mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/um_mysql5.7.sql"
 echo "Successfully executed the database scripts."
 
 # grants root access to MySQL server from any host

diff --git a/...km-with-analytics/mysql/scripts/mysql.sql → ...with-analytics/mysql/scripts/mysql5.7.sql b/...km-with-analytics/mysql/scripts/mysql.sql → ...with-analytics/mysql/scripts/mysql5.7.sql
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS REG_LOG (
              PRIMARY KEY (REG_LOG_ID, REG_TENANT_ID)
 )ENGINE INNODB;
 
-CREATE INDEX REG_LOG_IND_BY_REG_LOGTIME USING HASH ON REG_LOG(REG_LOGGED_TIME, REG_TENANT_ID);
+CREATE INDEX REG_LOG_IND_BY_REGLOG USING HASH ON REG_LOG(REG_LOGGED_TIME, REG_TENANT_ID);
 
 -- The REG_PATH_VALUE should be less than 767 bytes, and hence was fixed at 750.
 -- See CARBON-5917.
@@ -58,9 +58,9 @@ CREATE TABLE IF NOT EXISTS REG_RESOURCE (
             REG_VERSION         INTEGER NOT NULL AUTO_INCREMENT,
             REG_MEDIA_TYPE      VARCHAR(500),
             REG_CREATOR         VARCHAR(31) NOT NULL,
-            REG_CREATED_TIME    TIMESTAMP NOT NULL DEFAULT 0,
+            REG_CREATED_TIME    TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
             REG_LAST_UPDATOR    VARCHAR(31),
-            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL DEFAULT 0,
+            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
             REG_DESCRIPTION     VARCHAR(1000),
             REG_CONTENT_ID      INTEGER,
             REG_TENANT_ID INTEGER DEFAULT 0,
@@ -73,7 +73,7 @@ ALTER TABLE REG_RESOURCE ADD CONSTRAINT REG_RESOURCE_FK_BY_CONTENT_ID FOREIGN KE
 CREATE INDEX REG_RESOURCE_IND_BY_NAME USING HASH ON REG_RESOURCE(REG_NAME, REG_TENANT_ID);
 CREATE INDEX REG_RESOURCE_IND_BY_PATH_ID_NAME USING HASH ON REG_RESOURCE(REG_PATH_ID, REG_NAME, REG_TENANT_ID);
 CREATE INDEX REG_RESOURCE_IND_BY_UUID USING HASH ON REG_RESOURCE(REG_UUID);
-CREATE INDEX REG_RESOURCE_IND_BY_TENANT USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_UUID);
+CREATE INDEX REG_RESOURCE_IND_BY_TENAN USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_UUID);
 CREATE INDEX REG_RESOURCE_IND_BY_TYPE USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_MEDIA_TYPE);
 
 CREATE TABLE IF NOT EXISTS REG_RESOURCE_HISTORY (
@@ -82,9 +82,9 @@ CREATE TABLE IF NOT EXISTS REG_RESOURCE_HISTORY (
             REG_VERSION         INTEGER NOT NULL,
             REG_MEDIA_TYPE      VARCHAR(500),
             REG_CREATOR         VARCHAR(31) NOT NULL,
-            REG_CREATED_TIME    TIMESTAMP NOT NULL,
+            REG_CREATED_TIME    TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
             REG_LAST_UPDATOR    VARCHAR(31),
-            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL,
+            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
             REG_DESCRIPTION     VARCHAR(1000),
             REG_CONTENT_ID      INTEGER,
             REG_DELETED         SMALLINT,
@@ -306,7 +306,7 @@ CREATE TABLE UM_PERMISSION (
              UM_ACTION VARCHAR(255) NOT NULL,
              UM_TENANT_ID INTEGER DEFAULT 0,
 		UM_MODULE_ID INTEGER DEFAULT 0,
-		     		 UNIQUE(UM_RESOURCE_ID,UM_ACTION, UM_TENANT_ID),
+			       UNIQUE(UM_RESOURCE_ID,UM_ACTION, UM_TENANT_ID),
              PRIMARY KEY (UM_ID, UM_TENANT_ID)
 )ENGINE INNODB;
 
@@ -383,7 +383,6 @@ CREATE TABLE UM_USER_ATTRIBUTE (
 
 CREATE INDEX UM_USER_ID_INDEX ON UM_USER_ATTRIBUTE(UM_USER_ID);
 
-
 CREATE TABLE UM_DIALECT(
             UM_ID INTEGER NOT NULL AUTO_INCREMENT,
             UM_DIALECT_URI VARCHAR(255) NOT NULL,