extend tests

* add two user
* test admin
* test first and second user

Author: Sebastian Hahn

.github/workflows/build.yml

@@ -10,14 +10,12 @@ jobs:
         include:
           - os: ubuntu-20.04
             mysql-version: 8.0
+          - os: ubuntu-20.04
+            mysql-version: 5.7
           - os: ubuntu-18.04
             mysql-version: 8.0
           - os: ubuntu-18.04
             mysql-version: 5.7
-          - os: ubuntu-16.04
-            mysql-version: 8.0
-          - os: ubuntu-16.04
-            mysql-version: 5.7
           - os: macos-11.0
             mysql-version: 8.0
           - os: macos-11.0
@@ -44,14 +42,47 @@ jobs:
             mysql-version: 5.6
     steps:
     - uses: actions/checkout@v2
-    - uses: ./.
+    
+    - name: Install mysql
+      uses: ./.
+      with:
+        mysql-version: ${{ matrix.mysql-version }}
+        database: testdb
+        username: "1234"
+        password: "abcd"
+
+    - name: Install mysql second time
+      uses: ./.
       with:
         mysql-version: ${{ matrix.mysql-version }}
         database: testdb
-    - run: mysql --version
-    - run: mysql -e 'SELECT VERSION()'
-    - run: mysql -e 'SELECT CURRENT_USER()'
-    - run: mysql -e 'SELECT DATABASE()'
-    - run: mysql -e "SHOW VARIABLES LIKE 'socket'"
-    - run: mysqladmin create testdb2
-    - run: mysql -D testdb -e 'SELECT DATABASE()'
+        username: "5678"
+        password: "efgh"
+
+    - name: Test admin
+      run: |
+        mysql --version
+        mysql -uroot -e 'SELECT * FROM mysql.user;'
+        mysql -uroot -e 'SELECT VERSION()'
+        mysql -uroot -e 'SELECT CURRENT_USER()'
+        mysql -uroot -e 'SELECT DATABASE()'
+        mysql -uroot -e "SHOW VARIABLES LIKE 'socket'"
+        mysqladmin -uroot create testdb2
+        mysql -uroot -D testdb2 -e 'SELECT DATABASE()'
+        echo Y | mysqladmin -uroot drop testdb2
+
+    - name: Test first user
+      run: |
+        mysql --version
+        mysql -u1234 -pabcd -e 'SELECT VERSION()'
+        mysql -u1234 -pabcd -e 'SELECT CURRENT_USER()'
+        mysql -u1234 -pabcd -e 'SELECT DATABASE()'
+        mysql -u1234 -pabcd -e "SHOW VARIABLES LIKE 'socket'"
+
+    - name: Test second user
+      run: |
+        mysql --version
+        mysql -u5678 -pefgh -e 'SELECT VERSION()'
+        mysql -u5678 -pefgh -e 'SELECT CURRENT_USER()'
+        mysql -u5678 -pefgh -e 'SELECT DATABASE()'
+        mysql -u5678 -pefgh -e "SHOW VARIABLES LIKE 'socket'"

action.yml

@@ -1,4 +1,5 @@
 name: Setup MySQL
+description: install and start the mysql server
 inputs:
   mysql-version:
     description: The MySQL version to download (if necessary) and use

index.js

@@ -74,6 +74,7 @@ function installMac() {
   }
   // set path
   addToPath(bin);
+  return bin;
 }
 
 function installWindwos() {
@@ -84,6 +85,7 @@ function installWindwos() {
     '5.6': '5.6.50'
   };
   installDir = "C:\\Program Files\\MySQL";
+  bin = `C:\\Program Files\\MySQL\\MySQL Server ${mysqlVersion}\\bin`;
   if (! fs.existsSync(installDir)) {
     const fullVersion = versionMap[mysqlVersion];
     useTmpDir();
@@ -93,14 +95,16 @@ function installWindwos() {
     fs.renameSync(`mysql-${fullVersion}-winx64`, `C:\\Program Files\\MySQL\\MySQL Server ${mysqlVersion}`);
 
     // start
-    bin = `C:\\Program Files\\MySQL\\MySQL Server ${mysqlVersion}\\bin`;
     if (mysqlVersion != '5.6') {
       run(`"${bin}\\mysqld" --initialize-insecure`);
     }
     run(`"${bin}\\mysqld" --install`);
     run(`net start MySQL`);
-
     addToPath(bin);
+    // create windows only user odbc
+    run(`"${bin}\\mysql" -u root -e "CREATE USER 'ODBC'@'localhost' IDENTIFIED BY ''"`);
+    run(`"${bin}\\mysql" -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'ODBC'@'localhost'"`);
+    run(`"${bin}\\mysql" -u root -e "FLUSH PRIVILEGES"`);
   }
 
   run(`"${bin}\\mysql" -u root -e "SELECT VERSION()"`);
@@ -111,6 +115,7 @@ function installWindwos() {
     run(`"${bin}\\mysql" -u root -e "GRANT ALL PRIVILEGES ON *.* TO '${username}'@'localhost'"`);
     run(`"${bin}\\mysql" -u root -e "FLUSH PRIVILEGES"`);
   }
+  return bin;
 }
 
 function installLinux() {
@@ -143,7 +148,11 @@ function installLinux() {
   run('sudo systemctl start mysql');
 
   // remove root password
-  run(`sudo mysqladmin -proot password ''`);
+  try {
+    run(`sudo mysqladmin -proot password ''`);
+  } catch (error) {
+    console.log("error on remove password: ", error);
+  }
 
   // add user
   if(username && username !== "") {
@@ -152,11 +161,12 @@ function installLinux() {
     run(`sudo mysql -e "FLUSH PRIVILEGES"`);
   }
   bin = `/usr/bin`;
+  return bin;
 }
 
 
 if (process.platform == 'darwin') {
-  installMac();
+  bin = installMac();
 } else if (process.platform == 'win32') {
   bin = installWindwos();
 } else if (process.platform == 'linux') {
@@ -166,5 +176,10 @@ if (process.platform == 'darwin') {
 }
 
 if (database) {
-  runSafe(path.join(bin, 'mysqladmin'), 'create', database);
+try {
+  run(path.join(bin, 'mysqladmin'), ' -u root create', database);
+} catch (error) {
+  console.log("error on create database: ", error);
+}
+  
 }