Prepare v0.28.0 (#1170)

* Prepare v0.28.0 release * Skip duplicate VSIXes when publishing * Fix MySQL bug occurring on result of INSERT statement
mtxr · Jun 22, 2023 · 9935305 · 9935305
1 parent ac14056
commit 9935305
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/upload-release-assets.yml b/.github/workflows/upload-release-assets.yml
@@ -53,7 +53,7 @@ jobs:
       run: |
         for FILE in *.vsix; do
           echo "Publishing $FILE"
-          npx vsce publish --packagePath $FILE
-          npx ovsx publish $FILE -p $OVSX_TOKEN
+          npx vsce publish --skip-duplicate --packagePath $FILE
+          npx ovsx publish --skip-duplicate $FILE -p $OVSX_TOKEN
           echo "Published $FILE"
         done
diff --git a/docs/src/pages/en/changelog.mdx b/docs/src/pages/en/changelog.mdx
@@ -5,6 +5,12 @@ layout: ../../layouts/MainLayout.astro
 order: 10
 ---
 
+## v0.28
+
+### v0.28.0 - (Jun 22, 2023)
+
+See https://github.com/mtxr/vscode-sqltools/releases/tag/v0.28.0
+
 ## v0.27
 
 ### v0.27.1 - (Jan 6, 2023)

diff --git a/packages/driver.mysql/README.md b/packages/driver.mysql/README.md
@@ -4,6 +4,10 @@ This package is part of [vscode-sqltools](https://vscode-sqltools.mteixeira.dev/
 
 ## Changelog
 
+### 0.6.0
+
+- Support TiDB. Support SSL / TLS options in the `Connection Assistant` panel. Switch from `mysql` library to `mysql2`. [#1113](https://github.com/mtxr/vscode-sqltools/pull/1113) - thanks [@Icemap](https://github.com/Icemap).
+
 ### 0.5.2
 
 - Handle multi-statement queries correctly. [#1140](https://github.com/mtxr/vscode-sqltools/pull/1140)

diff --git a/packages/driver.mysql/package.json b/packages/driver.mysql/package.json
@@ -2,7 +2,7 @@
   "name": "sqltools-driver-mysql",
   "displayName": "SQLTools MySQL/MariaDB/TiDB",
   "description": "SQLTools MySQL/MariaDB/TiDB",
-  "version": "0.5.2-SNAPSHOT",
+  "version": "0.6.0",
   "engines": {
     "vscode": "^1.72.0"
   },

diff --git a/packages/driver.mysql/src/ls/default.ts b/packages/driver.mysql/src/ls/default.ts
@@ -69,19 +69,27 @@ export default class MySQLDefault extends AbstractDriver<MySQLLib.Pool, MySQLLib
           if (error) return reject(error);
           try {
             const queries = queryParse(query.toString());
-            var resultAny: any = results;
+            var resultsAny: any = results;
+            var fieldsAny: any = fields;
 
-            // Shape of results and fields is different when querystring contains multiple queries
-            if (results && !Array.isArray(results[0]) && typeof results[0] !== 'undefined') {
-              resultAny = [results];
+            // Shape of results and fields is different when querystring contains multiple queries.
+            // Must also cater for the result of an INSERT, where results is not an array and fields is undefined.
+            if (results
+                && (
+                    (!Array.isArray(results[0]) && typeof results[0] !== 'undefined')
+                  ||
+                    !Array.isArray(results)
+                  )
+              ) {
+              resultsAny = [results];
             }
             if (fields && !Array.isArray(fields[0]) && typeof fields[0] !== 'undefined') {
-              fields = [fields];
+              fieldsAny = [fields];
             }
 
             return resolve(queries.map((q, i): NSDatabase.IResult => {
-              const r = resultAny[i] || [];
-              var f = fields[i] || [];
+              const r = resultsAny[i] || [];
+              var f = fieldsAny ? fieldsAny[i] || [] : undefined;
               const messages = [];
               if (r.affectedRows) {
                 messages.push(`${r.affectedRows} rows were affected.`);

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -2,7 +2,7 @@
     "name": "sqltools",
     "displayName": "SQLTools",
     "description": "Connecting users to many of the most commonly used databases. Welcome to database management done right.",
-    "version": "0.27.2-SNAPSHOT",
+    "version": "0.28.0",
     "publisher": "mtxr",
     "license": "MIT",
     "preview": false,
@@ -18,7 +18,7 @@
     "author": "Matheus Teixeira <me@mteixeira.dev>",
     "private": true,
     "engines": {
-        "vscode": "^1.72.0"
+        "vscode": "^1.78.0"
     },
     "categories": [
         "Programming Languages",

diff --git a/packages/plugins/package.json b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sqltools/plugins",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "SQLTools Plugins",
   "author": "Matheus Teixeira <me@mteixeira.dev>",
   "license": "MIT",