author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
141,908 |
11.04.2020 17:16:42
| -28,800 |
14b7f18e6766f0749067b3706dc6e3a12c951d18
|
regex enhance
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableDetecherChain.ts",
"new_path": "src/provider/Complection/chain/tableDetecherChain.ts",
"diff": "@@ -5,7 +5,7 @@ export class TableDetecherChain implements ComplectionChain {\npublic getComplection(complectionContext: ComplectionContext): vscode.CompletionItem[] | Promise<vscode.CompletionItem[]> {\n- const tableMatch = new RegExp('\\b(from|join)\\b\\\\s*((\\\\w|\\\\.)+)( *)?(\\\\w+)?', 'ig');\n+ const tableMatch = new RegExp('\\\\b(from|join)\\\\b\\\\s*((\\\\w|\\\\.)+)( *)?(\\\\w+)?', 'ig');\nif (\n(complectionContext.preWord && complectionContext.preWord.match(/\\b(select|HAVING|\\(|on|where|and|,|=|<|>)\\b/ig))\n||\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/complectionContext.ts",
"new_path": "src/provider/Complection/complectionContext.ts",
"diff": "@@ -25,7 +25,7 @@ export class ComplectionContext {\nconst prePostion = position.character === 0 ? position : new vscode.Position(position.line, position.character - 1);\nconst preChart = position.character === 0 ? null : document.getText(new vscode.Range(prePostion, position));\n- const wordMatch = currentSql.match(/(\\w|-|\\_)+/g);\n+ const wordMatch = currentSql.match(/(\\w|-|\\_|\\*)+/g);\nif (wordMatch) {\nif ((preChart == null || preChart == \" \" || preChart == \".\") && wordMatch.length >= 1) {\ncontext.preWord = wordMatch[wordMatch.length - 1]\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
regex enhance
|
141,908 |
11.04.2020 17:50:46
| -28,800 |
18114b04fa6711300a471ab7133f316a8ef3cbbd
|
fix page load bug
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "</el-table-column>\n<!-- table view without tale column -->\n<el-table-column :label=\"key\" v-for=\"(value,key) in result.data[0]\" :key=\"key\" align=\"center\"\n- v-if=\"!result.columnList\" :width=\"computeWidth(key,0,toolbar.filter[column.name])\">\n+ v-if=\"!result.columnList\" :width=\"computeWidth(key,0,toolbar.filter[key])\">\n<template slot-scope=\"scope\">\n<span v-html='dataformat(scope.row[key])'></span>\n</template>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix page load bug
|
141,908 |
11.04.2020 18:26:59
| -28,800 |
cb1be847fd4beb11d2aec1be843e1be343bd7fd6
|
fix column regex
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -9,7 +9,7 @@ export class ColumnChain implements ComplectionChain {\nif (complectionContext.preChart === \".\") {\nlet subComplectionItems = await this.generateColumnComplectionItem(complectionContext.preWord);\n- const tableReg = new RegExp(\"\\\\b(from|join)\\\\b\\\\s*`{0,1}(\\\\w|\\.|-)+`{0,1}(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\n+ const tableReg = new RegExp(\"\\\\b(from|join)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\nlet result = tableReg.exec(complectionContext.currentSqlFull);\nfor (; result != null && subComplectionItems.length === 0;) {\nsubComplectionItems = await this.generateColumnComplectionItem(\n@@ -30,15 +30,15 @@ export class ColumnChain implements ComplectionChain {\nreturn true;\n}\n- private async generateColumnComplectionItem(inputWord: string): Promise<vscode.CompletionItem[]> {\n+ private async generateColumnComplectionItem(tableName: string): Promise<vscode.CompletionItem[]> {\n- if (!inputWord) {\n+ if (!tableName) {\nreturn [];\n}\nlet columnNodes: ColumnNode[] = [];\nfor (const tableNode of DatabaseCache.getTableNodeList()) {\n- if (tableNode.table === inputWord) {\n+ if (tableNode.table === tableName) {\ncolumnNodes = (await tableNode.getChildren()) as ColumnNode[];\nbreak;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix column regex
|
141,908 |
11.04.2020 18:27:14
| -28,800 |
eb9d5421f32b783451f1d572cfbf009d05410a15
|
update to 1.7.14
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"name\": \"vscode-mysql-client\",\n- \"displayName\": \"MySQL Client\",\n- \"description\": \"MySQL client for vscode, provide the most convenient operation for mysql manager\",\n- \"version\": \"1.7.11\",\n+ \"displayName\": \"MySQL\",\n+ \"description\": \"MySQL Client for vscode\",\n+ \"version\": \"1.7.14\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.7.14
|
141,908 |
14.04.2020 22:16:46
| -28,800 |
d59810a2f34034c565bf4a9fb09ae3ff9fb8c648
|
convinent for change active database
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.7.14\",\n+ \"version\": \"1.7.15\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n],\n\"view/title\": [\n{\n- \"command\": \"mysql.newQuery\",\n+ \"command\": \"mysql.addConnection\",\n\"when\": \"view == github.cweijan.mysql\",\n\"group\": \"navigation@3\"\n},\n{\n- \"command\": \"mysql.addConnection\",\n+ \"command\": \"mysql.refresh\",\n\"when\": \"view == github.cweijan.mysql\",\n\"group\": \"navigation@2\"\n},\n{\n- \"command\": \"mysql.refresh\",\n+ \"command\": \"mysql.newQuery\",\n\"when\": \"view == github.cweijan.mysql\",\n\"group\": \"navigation@1\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "v-if=\"result.primaryKey\">\n</el-button>\n</el-cow>\n+ <el-cow v-if=\"result.table\">\n+ {{result.table}}\n+ </el-cow>\n<el-cow>\n<el-input v-model=\"table.search\" style=\"width:200px\" placeholder=\"Type to search\" />\n</el-cow>\n<el-table-column fixed=\"left\" label=\"Operations\" width=\"100\" v-if=\"result.primaryKey\" align=\"center\">\n<template slot-scope=\"scope\">\n<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n- Filter : <el-button @click=\"resetFilter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\" circle title=\"Reset\">\n+ Reset : <el-button @click=\"resetFilter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\" circle title=\"Reset\">\n</el-button>\n</div>\n<div v-if=\"scope.row[result.primaryKey]\">\nalign=\"center\" sortable v-if=\"result.columnList\"\n:width=\"computeWidth(column.name,0,toolbar.filter[column.name])\">\n<template slot-scope=\"scope\">\n- <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[column.name]\"\n+ <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[column.name]\" placeholder=\"filter\"\n@blur=\"filter($event,column.name)\" v-on:keyup.enter.native=\"filter($event,column.name)\">\n</el-input>\n<span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[column.name])'></span>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "import * as fs from \"fs\";\nimport * as mysql from \"mysql\";\n-import { IConnection } from \"../model/Connection\";\n-import { Console } from \"../common/OutputChannel\";\nimport { Global } from \"../common/Global\";\n+import { Console } from \"../common/OutputChannel\";\n+import { IConnection } from \"../model/Connection\";\nimport { QueryUnit } from \"./QueryUnit\";\nexport class ConnectionManager {\n@@ -76,14 +76,5 @@ export class ConnectionManager {\n}\n- public static tryOpenQuery() {\n- if (!this.lastConnectionOption) {\n- Console.log(\"Not active connection found!\")\n- } else {\n- //TODO open selelct\n- QueryUnit.createSQLTextDocument();\n- ConnectionManager.getConnection(this.lastConnectionOption)\n- }\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "import * as vscode from \"vscode\";\nimport { QueryUnit } from \"./database/QueryUnit\";\nimport { ConnectionNode } from \"./model/ConnectionNode\";\n+import { ConnectionManager } from \"./database/ConnectionManager\";\nimport { DatabaseNode } from \"./model/database/databaseNode\";\nimport { TableNode } from \"./model/table/tableNode\";\nimport { MySQLTreeDataProvider } from \"./provider/MysqlTreeDataProvider\";\n@@ -24,7 +25,6 @@ import { CommandKey } from \"./common/Constants\";\nimport { TableHoverProvider } from \"./provider/TableHoverProvider\";\nimport { TableGroup } from \"./model/table/tableGroup\";\nimport { MysqlSetting } from \"./extension/MysqlSetting\";\n-import { ConnectionManager } from \"./database/ConnectionManager\";\nexport function activate(context: vscode.ExtensionContext) {\n@@ -104,7 +104,7 @@ export function activate(context: vscode.ExtensionContext) {\nif (databaseOrConnectionNode) {\ndatabaseOrConnectionNode.newQuery();\n} else {\n- ConnectionManager.tryOpenQuery()\n+ ConnectionNode.tryOpenQuery();\n}\n}),\nvscode.commands.registerCommand(\"mysql.template.sql\", (tableNode: TableNode, run: boolean) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/HistoryManager.ts",
"new_path": "src/extension/HistoryManager.ts",
"diff": "@@ -5,13 +5,13 @@ export class HistoryManager {\nconstructor(private context: vscode.ExtensionContext) {\n}\n- showHistory() {\n- var historyPath = this.context['globalStoragePath'] + '/history.sql'\n+ public showHistory() {\n+ const historyPath = this.context['globalStoragePath'] + '/history.sql';\nif (!fs.existsSync(historyPath)) {\n- fs.appendFileSync(historyPath, \"\")\n+ fs.appendFileSync(historyPath, \"\");\n}\n- var openPath = vscode.Uri.file(historyPath);\n- vscode.workspace.openTextDocument(openPath).then(doc => {\n+ const openPath = vscode.Uri.file(historyPath);\n+ vscode.workspace.openTextDocument(openPath).then((doc) => {\nvscode.window.showTextDocument(doc);\n});\n}\n@@ -19,7 +19,7 @@ export class HistoryManager {\npublic recordHistory(sql: string, costTime: number) {\nif (!sql) { return; }\nreturn new Promise(() => {\n- var gsPath = this.context['globalStoragePath']\n+ const gsPath = this.context['globalStoragePath'];\nif (!fs.existsSync(gsPath)) {\nfs.mkdirSync(gsPath);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -15,40 +15,40 @@ import { INode } from \"./INode\";\nexport class ConnectionNode implements INode, IConnection {\n- identify: string;\n- database?: string;\n- multipleStatements?: boolean;\n- type: string = ModelType.CONNECTION;\n+ public identify: string;\n+ public database?: string;\n+ public multipleStatements?: boolean;\n+ public type: string = ModelType.CONNECTION;\nconstructor(readonly id: string, readonly host: string, readonly user: string,\nreadonly password: string, readonly port: string,\nreadonly certPath: string) {\n}\npublic getTreeItem(): vscode.TreeItem {\n- this.identify = `${this.host}_${this.port}_${this.user}`\n+ this.identify = `${this.host}_${this.port}_${this.user}`;\nreturn {\nlabel: this.identify,\nid: this.host,\ncollapsibleState: DatabaseCache.getElementState(this),\ncontextValue: ModelType.CONNECTION,\n- iconPath: path.join(Constants.RES_PATH, \"server.png\")\n+ iconPath: path.join(Constants.RES_PATH, \"server.png\"),\n};\n}\npublic async getChildren(isRresh: boolean = false): Promise<INode[]> {\n- this.identify = `${this.host}_${this.port}_${this.user}`\n- let databaseNodes = DatabaseCache.getDatabaseListOfConnection(this.identify)\n+ this.identify = `${this.host}_${this.port}_${this.user}`;\n+ let databaseNodes = DatabaseCache.getDatabaseListOfConnection(this.identify);\nif (databaseNodes && !isRresh) {\n- return databaseNodes\n+ return databaseNodes;\n}\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), \"SHOW DATABASES\")\n.then((databases) => {\ndatabaseNodes = databases.map<DatabaseNode>((database) => {\nreturn new DatabaseNode(this.host, this.user, this.password, this.port, database.Database, this.certPath);\n- })\n- databaseNodes.unshift(new UserGroup(this.host, this.user, this.password, this.port,'mysql', this.certPath))\n- DatabaseCache.setDataBaseListOfConnection(this.identify, databaseNodes)\n+ });\n+ databaseNodes.unshift(new UserGroup(this.host, this.user, this.password, this.port, 'mysql', this.certPath));\n+ DatabaseCache.setDataBaseListOfConnection(this.identify, databaseNodes);\nreturn databaseNodes;\n})\n@@ -59,18 +59,18 @@ export class ConnectionNode implements INode, IConnection {\npublic async newQuery() {\nQueryUnit.createSQLTextDocument();\n- ConnectionManager.getConnection(this)\n+ ConnectionManager.getConnection(this);\n}\npublic createDatabase() {\n- vscode.window.showInputBox({ placeHolder: 'Input you want to create new database name.' }).then(async inputContent => {\n- if(!inputContent)return;\n+ vscode.window.showInputBox({ placeHolder: 'Input you want to create new database name.' }).then(async (inputContent) => {\n+ if (!inputContent) { return; }\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `create database \\`${inputContent}\\` default character set = 'utf8' `).then(() => {\n- DatabaseCache.clearDatabaseCache(this.identify)\n- MySQLTreeDataProvider.refresh()\n- vscode.window.showInformationMessage(`create database ${inputContent} success!`)\n- })\n- })\n+ DatabaseCache.clearDatabaseCache(this.identify);\n+ MySQLTreeDataProvider.refresh();\n+ vscode.window.showInformationMessage(`create database ${inputContent} success!`);\n+ });\n+ });\n}\npublic async deleteConnection(context: vscode.ExtensionContext) {\n@@ -81,11 +81,30 @@ export class ConnectionNode implements INode, IConnection {\nMySQLTreeDataProvider.refresh();\n}\n- importData(fsPath: string) {\n- Console.log(`Doing import ${this.host}:${this.port}...`)\n- ConnectionManager.getConnection(this).then(connection => {\n- QueryUnit.runFile(connection,fsPath)\n- })\n+ public importData(fsPath: string) {\n+ Console.log(`Doing import ${this.host}:${this.port}...`);\n+ ConnectionManager.getConnection(this).then((connection) => {\n+ QueryUnit.runFile(connection, fsPath);\n+ });\n+ }\n+\n+ public static async tryOpenQuery() {\n+ const lcp = ConnectionManager.getLastConnectionOption();\n+ if (!lcp) {\n+ Console.log(\"Not active connection found!\");\n+ } else {\n+ await QueryUnit.showSQLTextDocument();\n+ const key = `${lcp.host}_${lcp.port}_${lcp.user}`;\n+ const dbNameList = DatabaseCache.getDatabaseListOfConnection(key).filter((databaseNode) => !(databaseNode instanceof UserGroup)).map((databaseNode) => databaseNode.database);\n+ await vscode.window.showQuickPick(dbNameList, { placeHolder: \"active database\" }).then(async (dbName) => {\n+ if (dbName) {\n+ await ConnectionManager.getConnection({\n+ host: lcp.host, port: lcp.port, password: lcp.password,\n+ user: lcp.user, database: dbName, certPath: null,\n+ }, true);\n+ }\n+ });\n+ }\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
convinent for change active database
|
141,908 |
15.04.2020 18:35:08
| -28,800 |
dc11934de7650aebe93307be50ca09dc76e43f06
|
show error message when import sql occur error.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.addDatabase\",\n- \"title\": \"Add Database\",\n+ \"title\": \"New Database\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n\"dark\": \"resources/dark/add.svg\"\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n\"group\": \"2_mysql@1\"\n},\n+ {\n+ \"command\": \"mysql.addDatabase\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n+ \"group\": \"2_mysql@0\"\n+ },\n{\n\"command\": \"mysql.data.import\",\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n},\n\"devDependencies\": {\n\"@types/mocha\": \"^2.2.42\",\n+ \"@types/mysql\": \"^2.15.9\",\n\"@types/node\": \"^7.0.43\",\n\"tslint\": \"^5.8.0\",\n\"typescript\": \"^3.3.1\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -8,7 +8,7 @@ import { QueryUnit } from \"./QueryUnit\";\nexport class ConnectionManager {\nprivate static lastConnectionOption: IConnection;\n- private static activeConnection = {};\n+ private static activeConnection: { [key: string]: mysql.Connection } = {};\npublic static getLastConnectionOption() {\nreturn this.lastConnectionOption;\n@@ -25,7 +25,7 @@ export class ConnectionManager {\n}\n- public static getConnection(connectionOptions: IConnection, changeActive: boolean = false): Promise<any> {\n+ public static getConnection(connectionOptions: IConnection, changeActive: boolean = false): Promise<mysql.Connection> {\nconnectionOptions.multipleStatements = true;\nthis.lastConnectionOption = connectionOptions;\n@@ -62,7 +62,7 @@ export class ConnectionManager {\n}\n- public static createConnection(connectionOptions: IConnection): any {\n+ public static createConnection(connectionOptions: IConnection): mysql.Connection {\nconst newConnectionOptions: any = Object.assign({ useConnectionPooling: true }, connectionOptions);\nif (connectionOptions.certPath && fs.existsSync(connectionOptions.certPath)) {\nnewConnectionOptions.ssl = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "\"use strict\";\nimport * as fs from \"fs\";\n+import { Connection } from \"mysql\";\nimport * as vscode from \"vscode\";\n-import { CommandKey, Cursor, MessageType, ConfigKey } from \"../common/Constants\";\n+import { CommandKey, ConfigKey, Cursor, MessageType } from \"../common/Constants\";\n+import { Global } from \"../common/Global\";\nimport { Console } from \"../common/OutputChannel\";\nimport { Util } from \"../common/util\";\nimport { IConnection } from \"../model/Connection\";\nimport { QueryPage } from \"../view/result/query\";\n+import { DataResponse, DMLResponse, ErrorResponse, RunResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\n-import { ErrorResponse, DataResponse, RunResponse, DMLResponse } from \"../view/result/queryResponse\";\n-import { Global } from \"../common/Global\";\n+const { once } = require('events');\nexport class QueryUnit {\n@@ -137,29 +139,44 @@ export class QueryUnit {\nreturn this.sqlDocument;\n}\n- public static runFile(connection: any, fsPath: string) {\n+ public static async runFile(connection: Connection, fsPath: string) {\nconst stats = fs.statSync(fsPath);\nconst startTime = new Date();\nconst fileSize = stats[\"size\"];\n- let success = true;\nif (fileSize > 1024 * 1024 * 100) {\n- success = this.executeByLine(connection, fsPath);\n+ vscode.window.showErrorMessage(`Import sql exceed max limit 100M!`)\n+ return;\n+ // if (await this.executeByLine(connection, fsPath)) {\n+ // Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n+ // }\n} else {\nconst fileContent = fs.readFileSync(fsPath, 'utf8');\n- connection.query(fileContent, (err, data) => {\n+ const sqlList = fileContent.split(\";\")\n+ for (let sql of sqlList) {\n+ if (!(sql = sql.trim())) continue;\n+ // TODO break when break;\n+ await new Promise(resolve => {\n+ connection.query(sql, (err, data) => {\nif (err) {\n- Console.log(err);\n- success = false;\n+ Console.log(`Execute sql fail:\\n ${err.sql}\\n code: ${err.sqlState} message : ${err.message}`)\n+ } else {\n+ resolve();\n}\n});\n+ })\n}\n- if (success) {\nConsole.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n}\n+ vscode.commands.executeCommand(CommandKey.Refresh)\n}\n- private static executeByLine(connection: any, fsPath: string) {\n+ /**\n+ * TODO: have problem, fail\n+ * @param connection\n+ * @param fsPath\n+ */\n+ private static async executeByLine(connection: any, fsPath: string) {\nconst readline = require('readline');\nconst rl = readline.createInterface({\ninput: fs.createReadStream(fsPath.replace(\"\\\\\", \"/\")),\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
show error message when import sql occur error.
|
141,908 |
15.04.2020 21:04:46
| -28,800 |
b104d22b86aa2ccca57e0b780eeee6283ce50590
|
remeber sql list for node
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -10,7 +10,6 @@ import { ConnectionInfo } from \"../model/interface/connection\";\nimport { QueryPage } from \"../view/result/query\";\nimport { DataResponse, DMLResponse, ErrorResponse, RunResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\n-const { once } = require('events');\nexport class QueryUnit {\n@@ -120,8 +119,9 @@ export class QueryUnit {\n}\npublic static async createSQLTextDocument(sql: string = \"\") {\n- const textDocument = await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" });\n- return vscode.window.showTextDocument(textDocument);\n+ return vscode.window.showTextDocument(\n+ await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" })\n+ );\n}\n@@ -133,8 +133,9 @@ export class QueryUnit {\neditBuilder.replace(Cursor.getRangeStartTo(Util.getDocumentLastPosition(this.sqlDocument.document)), sql);\n});\n} else {\n- const textDocument = await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" });\n- this.sqlDocument = await vscode.window.showTextDocument(textDocument);\n+ this.sqlDocument = await vscode.window.showTextDocument(\n+ await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" })\n+ );\n}\nreturn this.sqlDocument;\n}\n@@ -153,9 +154,9 @@ export class QueryUnit {\nconst fileContent = fs.readFileSync(fsPath, 'utf8');\nconst sqlList = fileContent.split(\";\")\nfor (let sql of sqlList) {\n- if (!(sql = sql.trim())) continue;\n+ if (!(sql = sql.trim())) { continue };\n// TODO break when break;\n- await new Promise(resolve => {\n+ await new Promise((resolve) => {\nconnection.query(sql, (err, data) => {\nif (err) {\nConsole.log(`Execute sql fail:\\n ${err.sql}\\n code: ${err.sqlState} message : ${err.message}`)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "\"use strict\";\n+// Don't change import order, it will occur circular reference\nimport * as vscode from \"vscode\";\nimport { QueryUnit } from \"./database/QueryUnit\";\nimport { ConnectionNode } from \"./model/ConnectionNode\";\n-import { ConnectionManager } from \"./database/ConnectionManager\";\nimport { DatabaseNode } from \"./model/database/databaseNode\";\nimport { TableNode } from \"./model/table/tableNode\";\nimport { MySQLTreeDataProvider } from \"./provider/MysqlTreeDataProvider\";\n@@ -26,14 +26,15 @@ import { TableHoverProvider } from \"./provider/TableHoverProvider\";\nimport { TableGroup } from \"./model/table/tableGroup\";\nimport { MysqlSetting } from \"./extension/MysqlSetting\";\nimport { CopyAble } from \"./model/interface/copyAble\";\n+import { FileManager } from \"./extension/FileManager\";\nexport function activate(context: vscode.ExtensionContext) {\nDatabaseCache.initCache(context);\nSqlViewManager.initExtesnsionPath(context.extensionPath);\n- const historyManager = new HistoryManager(context);\n+ FileManager.init(context)\nconst mysqlTreeDataProvider = new MySQLTreeDataProvider(context);\nconst treeview = vscode.window.createTreeView(\"github.cweijan.mysql\", {\ntreeDataProvider: mysqlTreeDataProvider,\n@@ -53,10 +54,10 @@ export function activate(context: vscode.ExtensionContext) {\nmysqlTreeDataProvider.init();\n}),\nvscode.commands.registerCommand(\"mysql.history.open\", () => {\n- historyManager.showHistory();\n+ HistoryManager.showHistory();\n}),\nvscode.commands.registerCommand(CommandKey.RecordHistory, (sql: string, costTime: number) => {\n- historyManager.recordHistory(sql, costTime);\n+ HistoryManager.recordHistory(sql, costTime);\n}),\nvscode.commands.registerCommand(\"mysql.addDatabase\", (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/extension/FileManager.ts",
"diff": "+import * as fs from \"fs\";\n+import * as vscode from \"vscode\";\n+\n+export class FileManager {\n+ private static context: vscode.ExtensionContext;\n+ public static init(context: vscode.ExtensionContext) {\n+ this.context = context;\n+ }\n+ public static show(fileName: string) {\n+ if (!this.context) { vscode.window.showErrorMessage(\"FileManager is not init!\") }\n+ if (!fileName) { return; }\n+ const historyPath = `${this.context['globalStoragePath']}/${fileName}`;\n+ if (!fs.existsSync(historyPath)) {\n+ fs.appendFileSync(historyPath, \"\");\n+ }\n+ const openPath = vscode.Uri.file(historyPath);\n+ return new Promise((resolve) => {\n+ vscode.workspace.openTextDocument(openPath).then(async (doc) => {\n+ resolve(await vscode.window.showTextDocument(doc));\n+ });\n+ })\n+\n+ }\n+\n+ public static record(fileName: string, content: string) {\n+ if (!this.context) { vscode.window.showErrorMessage(\"FileManager is not init!\") }\n+ if (!fileName || !content) { return; }\n+ return new Promise(() => {\n+ const gsPath = this.context['globalStoragePath'];\n+ if (!fs.existsSync(gsPath)) {\n+ fs.mkdirSync(gsPath);\n+ }\n+ fs.appendFileSync(`${content}\\n`, { encoding: 'utf8' });\n+\n+ });\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/HistoryManager.ts",
"new_path": "src/extension/HistoryManager.ts",
"diff": "-import * as fs from \"fs\";\n-import * as vscode from \"vscode\";\n+import { FileManager } from \"./FileManager\";\nexport class HistoryManager {\n- constructor(private context: vscode.ExtensionContext) {\n+ public static showHistory() {\n+ FileManager.show('history.sql')\n}\n- public showHistory() {\n- const historyPath = this.context['globalStoragePath'] + '/history.sql';\n- if (!fs.existsSync(historyPath)) {\n- fs.appendFileSync(historyPath, \"\");\n- }\n- const openPath = vscode.Uri.file(historyPath);\n- vscode.workspace.openTextDocument(openPath).then((doc) => {\n- vscode.window.showTextDocument(doc);\n- });\n- }\n-\n- public recordHistory(sql: string, costTime: number) {\n+ public static recordHistory(sql: string, costTime: number) {\nif (!sql) { return; }\n- return new Promise(() => {\n- const gsPath = this.context['globalStoragePath'];\n- if (!fs.existsSync(gsPath)) {\n- fs.mkdirSync(gsPath);\n- }\n- fs.appendFileSync(gsPath + '/history.sql', `/* ${this.getNowDate()} [${costTime} ms] */ ${sql.replace(/[\\r\\n]/g, \" \")}\\n`, { encoding: 'utf8' });\n-\n- });\n+ FileManager.record('history.sql', `/* ${this.getNowDate()} [${costTime} ms] */ ${sql.replace(/[\\r\\n]/g, \" \")}\\n`);\n}\n- private getNowDate(): string {\n+ private static getNowDate(): string {\nconst date = new Date();\nlet month: string | number = date.getMonth() + 1;\nlet strDate: string | number = date.getDate();\n@@ -45,7 +27,7 @@ export class HistoryManager {\n+ this.pad(date.getHours(), 2) + \":\" + this.pad(date.getMinutes(), 2) + \":\" + this.pad(date.getSeconds(), 2);\n}\n- public pad(n: any, width: number, z?: any): number {\n+ public static pad(n: any, width: number, z?: any): number {\nz = z || '0';\nn = n + '';\nreturn n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -6,14 +6,15 @@ import { ConnectionManager } from \"../database/ConnectionManager\";\nimport { DatabaseCache } from \"../database/DatabaseCache\";\nimport { QueryUnit } from \"../database/QueryUnit\";\nimport { MySQLTreeDataProvider } from \"../provider/MysqlTreeDataProvider\";\n-import { IConnection } from \"./interface/connection\";\n+import { ConnectionInfo } from \"./interface/connection\";\nimport { DatabaseNode } from \"./database/databaseNode\";\nimport { UserGroup } from \"./database/userGroup\";\nimport { InfoNode } from \"./InfoNode\";\nimport { Node } from \"./interface/node\";\n+import { FileManager } from \"../extension/FileManager\";\n-export class ConnectionNode implements Node, IConnection {\n+export class ConnectionNode implements Node, ConnectionInfo {\npublic identify: string;\npublic database?: string;\n@@ -58,8 +59,8 @@ export class ConnectionNode implements Node, IConnection {\n}\npublic async newQuery() {\n- QueryUnit.createSQLTextDocument();\nConnectionManager.getConnection(this);\n+ ConnectionNode.tryOpenQuery()\n}\npublic createDatabase() {\n@@ -74,7 +75,7 @@ export class ConnectionNode implements Node, IConnection {\n}\npublic async deleteConnection(context: vscode.ExtensionContext) {\n- const connections = context.globalState.get<{ [key: string]: IConnection }>(CacheKey.ConectionsKey);\n+ const connections = context.globalState.get<{ [key: string]: ConnectionInfo }>(CacheKey.ConectionsKey);\ndelete connections[this.id];\nawait context.globalState.update(CacheKey.ConectionsKey, connections);\n@@ -93,8 +94,8 @@ export class ConnectionNode implements Node, IConnection {\nif (!lcp) {\nConsole.log(\"Not active connection found!\");\n} else {\n- await QueryUnit.showSQLTextDocument();\nconst key = `${lcp.host}_${lcp.port}_${lcp.user}`;\n+ await FileManager.show(`${key}.sql`);\nconst dbNameList = DatabaseCache.getDatabaseListOfConnection(key).filter((databaseNode) => !(databaseNode instanceof UserGroup)).map((databaseNode) => databaseNode.database);\nawait vscode.window.showQuickPick(dbNameList, { placeHolder: \"active database\" }).then(async (dbName) => {\nif (dbName) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -17,6 +17,7 @@ import { TriggerGroup } from \"../other/triggerGroup\";\nimport { TableGroup } from \"../table/tableGroup\";\nimport { ViewGroup } from \"../table/viewGroup\";\nimport { Util } from '../../common/util';\n+import { FileManager } from '../../extension/FileManager';\nexport class DatabaseNode implements Node, ConnectionInfo, CopyAble {\n@@ -104,7 +105,8 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\npublic async newQuery() {\n- QueryUnit.createSQLTextDocument();\n+ FileManager.show(`${this.identify}-query.sql`)\n+ // QueryUnit.createSQLTextDocument();\nConnectionManager.getConnection(this, true);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tslint.json",
"new_path": "tslint.json",
"diff": "true,\n500\n],\n+ \"trailing-comma\":false,\n\"semicolon\":false,\n\"no-empty\": false,\n\"object-literal-sort-keys\": false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
remeber sql list for node
|
141,908 |
15.04.2020 21:10:23
| -28,800 |
8ba30128aada3a97d9a4dc1e8d3694cd0718b7e5
|
only show active database tables
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableChain.ts",
"new_path": "src/provider/Complection/chain/tableChain.ts",
"diff": "@@ -5,6 +5,7 @@ import { Node } from \"../../../model/interface/node\";\nimport { TableNode } from \"../../../model/table/tableNode\";\nimport { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nimport { Util } from \"../../../common/util\";\n+import { ConnectionManager } from \"../../../database/ConnectionManager\";\nexport class TableChain implements ComplectionChain {\n@@ -32,6 +33,10 @@ export class TableChain implements ComplectionChain {\nlet tableNodes: Node[] = [];\nconst tableNames: string[] = [];\n+ const lcp = ConnectionManager.getLastConnectionOption();\n+ if (!inputWord && lcp && lcp.database) {\n+ inputWord = lcp.database\n+ }\nif (inputWord) {\nDatabaseCache.getDatabaseNodeList().forEach((databaseNode) => {\nif (databaseNode.database === inputWord) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
only show active database tables
|
141,908 |
16.04.2020 20:11:22
| -28,800 |
4c88e1b89c134bd740c4bb6c8026bbd92f973ecf
|
update to 1.7.21, reduce package size
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -3,4 +3,3 @@ node_modules\n.idea/\n.vscode-test/\n*.vsix\n\\ No newline at end of file\n-package-lock.json\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "package-lock.json",
"diff": "+{\n+ \"name\": \"vscode-mysql-client\",\n+ \"version\": \"1.7.21\",\n+ \"lockfileVersion\": 1,\n+ \"requires\": true,\n+ \"dependencies\": {\n+ \"@babel/code-frame\": {\n+ \"version\": \"7.8.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz?cache=0&sync_timestamp=1578953126105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.8.3.tgz\",\n+ \"integrity\": \"sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"@babel/highlight\": \"^7.8.3\"\n+ }\n+ },\n+ \"@babel/helper-validator-identifier\": {\n+ \"version\": \"7.9.5\",\n+ \"resolved\": \"https://registry.npm.taobao.org/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.9.5.tgz\",\n+ \"integrity\": \"sha1-kJd6jm+/a0MafcMXUu7iM78FLYA=\",\n+ \"dev\": true\n+ },\n+ \"@babel/highlight\": {\n+ \"version\": \"7.9.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.9.0.tgz\",\n+ \"integrity\": \"sha1-TptFzLgreWBycbKXmtgse2gWMHk=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"@babel/helper-validator-identifier\": \"^7.9.0\",\n+ \"chalk\": \"^2.0.0\",\n+ \"js-tokens\": \"^4.0.0\"\n+ }\n+ },\n+ \"@types/mysql\": {\n+ \"version\": \"2.15.9\",\n+ \"resolved\": \"https://registry.npm.taobao.org/@types/mysql/download/@types/mysql-2.15.9.tgz\",\n+ \"integrity\": \"sha1-L9SqpdubraiMnTbKqyIAghS4RlM=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"@types/node\": \"*\"\n+ }\n+ },\n+ \"@types/node\": {\n+ \"version\": \"7.0.48\",\n+ \"resolved\": \"https://registry.npmjs.org/@types/node/-/node-7.0.48.tgz\",\n+ \"integrity\": \"sha512-LLlXafM3BD52MH056tHxTXO8JFCnpJJQkdzIU3+m8ew+CXJY/5zIXgDNb4TK/QFvlI8QexLS5tL+sE0Qhegr1w==\",\n+ \"dev\": true\n+ },\n+ \"agent-base\": {\n+ \"version\": \"4.2.1\",\n+ \"resolved\": \"https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz\",\n+ \"integrity\": \"sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"es6-promisify\": \"^5.0.0\"\n+ }\n+ },\n+ \"ajv\": {\n+ \"version\": \"6.10.0\",\n+ \"resolved\": \"https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz\",\n+ \"integrity\": \"sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"fast-deep-equal\": \"^2.0.1\",\n+ \"fast-json-stable-stringify\": \"^2.0.0\",\n+ \"json-schema-traverse\": \"^0.4.1\",\n+ \"uri-js\": \"^4.2.2\"\n+ }\n+ },\n+ \"ansi-styles\": {\n+ \"version\": \"3.2.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz\",\n+ \"integrity\": \"sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"color-convert\": \"^1.9.0\"\n+ }\n+ },\n+ \"argparse\": {\n+ \"version\": \"1.0.10\",\n+ \"resolved\": \"https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz\",\n+ \"integrity\": \"sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"sprintf-js\": \"~1.0.2\"\n+ }\n+ },\n+ \"asn1\": {\n+ \"version\": \"0.2.4\",\n+ \"resolved\": \"https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz\",\n+ \"integrity\": \"sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"safer-buffer\": \"~2.1.0\"\n+ }\n+ },\n+ \"assert-plus\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz\",\n+ \"integrity\": \"sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=\",\n+ \"dev\": true\n+ },\n+ \"asynckit\": {\n+ \"version\": \"0.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz\",\n+ \"integrity\": \"sha1-x57Zf380y48robyXkLzDZkdLS3k=\",\n+ \"dev\": true\n+ },\n+ \"aws-sign2\": {\n+ \"version\": \"0.7.0\",\n+ \"resolved\": \"https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz\",\n+ \"integrity\": \"sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=\",\n+ \"dev\": true\n+ },\n+ \"aws4\": {\n+ \"version\": \"1.8.0\",\n+ \"resolved\": \"https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz\",\n+ \"integrity\": \"sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==\",\n+ \"dev\": true\n+ },\n+ \"balanced-match\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz\",\n+ \"integrity\": \"sha1-ibTRmasr7kneFk6gK4nORi1xt2c=\",\n+ \"dev\": true\n+ },\n+ \"bcrypt-pbkdf\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz\",\n+ \"integrity\": \"sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"tweetnacl\": \"^0.14.3\"\n+ }\n+ },\n+ \"bignumber.js\": {\n+ \"version\": \"4.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz\",\n+ \"integrity\": \"sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg==\"\n+ },\n+ \"brace-expansion\": {\n+ \"version\": \"1.1.8\",\n+ \"resolved\": \"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz\",\n+ \"integrity\": \"sha1-wHshHHyVLsH479Uad+8NHTmQopI=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"balanced-match\": \"^1.0.0\",\n+ \"concat-map\": \"0.0.1\"\n+ }\n+ },\n+ \"browser-stdout\": {\n+ \"version\": \"1.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz\",\n+ \"integrity\": \"sha1-81HTKWnTL6XXpVZxVCY9korjvR8=\",\n+ \"dev\": true\n+ },\n+ \"buffer-from\": {\n+ \"version\": \"1.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz\",\n+ \"integrity\": \"sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==\",\n+ \"dev\": true\n+ },\n+ \"builtin-modules\": {\n+ \"version\": \"1.1.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz\",\n+ \"integrity\": \"sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=\",\n+ \"dev\": true\n+ },\n+ \"caseless\": {\n+ \"version\": \"0.12.0\",\n+ \"resolved\": \"https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz\",\n+ \"integrity\": \"sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=\",\n+ \"dev\": true\n+ },\n+ \"chalk\": {\n+ \"version\": \"2.4.2\",\n+ \"resolved\": \"https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz\",\n+ \"integrity\": \"sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"ansi-styles\": \"^3.2.1\",\n+ \"escape-string-regexp\": \"^1.0.5\",\n+ \"supports-color\": \"^5.3.0\"\n+ }\n+ },\n+ \"color-convert\": {\n+ \"version\": \"1.9.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz?cache=0&sync_timestamp=1566248870121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolor-convert%2Fdownload%2Fcolor-convert-1.9.3.tgz\",\n+ \"integrity\": \"sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"color-name\": \"1.1.3\"\n+ }\n+ },\n+ \"color-name\": {\n+ \"version\": \"1.1.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz\",\n+ \"integrity\": \"sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=\",\n+ \"dev\": true\n+ },\n+ \"combined-stream\": {\n+ \"version\": \"1.0.7\",\n+ \"resolved\": \"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz\",\n+ \"integrity\": \"sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"delayed-stream\": \"~1.0.0\"\n+ }\n+ },\n+ \"commander\": {\n+ \"version\": \"2.11.0\",\n+ \"resolved\": \"https://registry.npmjs.org/commander/-/commander-2.11.0.tgz\",\n+ \"integrity\": \"sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==\",\n+ \"dev\": true\n+ },\n+ \"concat-map\": {\n+ \"version\": \"0.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz\",\n+ \"integrity\": \"sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=\",\n+ \"dev\": true\n+ },\n+ \"core-util-is\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz\",\n+ \"integrity\": \"sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=\"\n+ },\n+ \"dashdash\": {\n+ \"version\": \"1.14.1\",\n+ \"resolved\": \"https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz\",\n+ \"integrity\": \"sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"assert-plus\": \"^1.0.0\"\n+ }\n+ },\n+ \"debug\": {\n+ \"version\": \"3.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/debug/-/debug-3.1.0.tgz\",\n+ \"integrity\": \"sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"ms\": \"2.0.0\"\n+ }\n+ },\n+ \"deepmerge\": {\n+ \"version\": \"2.2.1\",\n+ \"resolved\": \"https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz\",\n+ \"integrity\": \"sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==\"\n+ },\n+ \"delayed-stream\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz\",\n+ \"integrity\": \"sha1-3zrhmayt+31ECqrgsp4icrJOxhk=\",\n+ \"dev\": true\n+ },\n+ \"denque\": {\n+ \"version\": \"1.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/denque/-/denque-1.4.0.tgz\",\n+ \"integrity\": \"sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==\"\n+ },\n+ \"diff\": {\n+ \"version\": \"3.3.1\",\n+ \"resolved\": \"https://registry.npmjs.org/diff/-/diff-3.3.1.tgz\",\n+ \"integrity\": \"sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==\",\n+ \"dev\": true\n+ },\n+ \"ecc-jsbn\": {\n+ \"version\": \"0.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz\",\n+ \"integrity\": \"sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"jsbn\": \"~0.1.0\",\n+ \"safer-buffer\": \"^2.1.0\"\n+ }\n+ },\n+ \"es6-promise\": {\n+ \"version\": \"4.2.6\",\n+ \"resolved\": \"https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz\",\n+ \"integrity\": \"sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==\",\n+ \"dev\": true\n+ },\n+ \"es6-promisify\": {\n+ \"version\": \"5.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz\",\n+ \"integrity\": \"sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"es6-promise\": \"^4.0.3\"\n+ }\n+ },\n+ \"escape-string-regexp\": {\n+ \"version\": \"1.0.5\",\n+ \"resolved\": \"https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz\",\n+ \"integrity\": \"sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=\",\n+ \"dev\": true\n+ },\n+ \"esprima\": {\n+ \"version\": \"4.0.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz\",\n+ \"integrity\": \"sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=\",\n+ \"dev\": true\n+ },\n+ \"extend\": {\n+ \"version\": \"3.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/extend/-/extend-3.0.2.tgz\",\n+ \"integrity\": \"sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==\",\n+ \"dev\": true\n+ },\n+ \"extsprintf\": {\n+ \"version\": \"1.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz\",\n+ \"integrity\": \"sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=\",\n+ \"dev\": true\n+ },\n+ \"fast-deep-equal\": {\n+ \"version\": \"2.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz\",\n+ \"integrity\": \"sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=\",\n+ \"dev\": true\n+ },\n+ \"fast-json-stable-stringify\": {\n+ \"version\": \"2.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz\",\n+ \"integrity\": \"sha1-1RQsDK7msRifh9OnYREGT4bIu/I=\",\n+ \"dev\": true\n+ },\n+ \"forever-agent\": {\n+ \"version\": \"0.6.1\",\n+ \"resolved\": \"https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz\",\n+ \"integrity\": \"sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=\",\n+ \"dev\": true\n+ },\n+ \"form-data\": {\n+ \"version\": \"2.3.3\",\n+ \"resolved\": \"https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz\",\n+ \"integrity\": \"sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"asynckit\": \"^0.4.0\",\n+ \"combined-stream\": \"^1.0.6\",\n+ \"mime-types\": \"^2.1.12\"\n+ }\n+ },\n+ \"fs.realpath\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz\",\n+ \"integrity\": \"sha1-FQStJSMVjKpA20onh8sBQRmU6k8=\",\n+ \"dev\": true\n+ },\n+ \"generate-function\": {\n+ \"version\": \"2.3.1\",\n+ \"resolved\": \"https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz\",\n+ \"integrity\": \"sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==\",\n+ \"requires\": {\n+ \"is-property\": \"^1.0.2\"\n+ }\n+ },\n+ \"getpass\": {\n+ \"version\": \"0.1.7\",\n+ \"resolved\": \"https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz\",\n+ \"integrity\": \"sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"assert-plus\": \"^1.0.0\"\n+ }\n+ },\n+ \"glob\": {\n+ \"version\": \"7.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/glob/-/glob-7.1.2.tgz\",\n+ \"integrity\": \"sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"fs.realpath\": \"^1.0.0\",\n+ \"inflight\": \"^1.0.4\",\n+ \"inherits\": \"2\",\n+ \"minimatch\": \"^3.0.4\",\n+ \"once\": \"^1.3.0\",\n+ \"path-is-absolute\": \"^1.0.0\"\n+ }\n+ },\n+ \"growl\": {\n+ \"version\": \"1.10.3\",\n+ \"resolved\": \"https://registry.npmjs.org/growl/-/growl-1.10.3.tgz\",\n+ \"integrity\": \"sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==\",\n+ \"dev\": true\n+ },\n+ \"har-schema\": {\n+ \"version\": \"2.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz\",\n+ \"integrity\": \"sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=\",\n+ \"dev\": true\n+ },\n+ \"har-validator\": {\n+ \"version\": \"5.1.3\",\n+ \"resolved\": \"https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz\",\n+ \"integrity\": \"sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"ajv\": \"^6.5.5\",\n+ \"har-schema\": \"^2.0.0\"\n+ }\n+ },\n+ \"has-flag\": {\n+ \"version\": \"2.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz\",\n+ \"integrity\": \"sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=\",\n+ \"dev\": true\n+ },\n+ \"he\": {\n+ \"version\": \"1.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/he/-/he-1.1.1.tgz\",\n+ \"integrity\": \"sha1-k0EP0hsAlzUVH4howvJx80J+I/0=\",\n+ \"dev\": true\n+ },\n+ \"http-proxy-agent\": {\n+ \"version\": \"2.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz\",\n+ \"integrity\": \"sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"agent-base\": \"4\",\n+ \"debug\": \"3.1.0\"\n+ }\n+ },\n+ \"http-signature\": {\n+ \"version\": \"1.2.0\",\n+ \"resolved\": \"https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz\",\n+ \"integrity\": \"sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"assert-plus\": \"^1.0.0\",\n+ \"jsprim\": \"^1.2.2\",\n+ \"sshpk\": \"^1.7.0\"\n+ }\n+ },\n+ \"https-proxy-agent\": {\n+ \"version\": \"2.2.1\",\n+ \"resolved\": \"https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz\",\n+ \"integrity\": \"sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"agent-base\": \"^4.1.0\",\n+ \"debug\": \"^3.1.0\"\n+ }\n+ },\n+ \"iconv-lite\": {\n+ \"version\": \"0.4.24\",\n+ \"resolved\": \"https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz\",\n+ \"integrity\": \"sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==\",\n+ \"requires\": {\n+ \"safer-buffer\": \">= 2.1.2 < 3\"\n+ }\n+ },\n+ \"inflight\": {\n+ \"version\": \"1.0.6\",\n+ \"resolved\": \"https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz\",\n+ \"integrity\": \"sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"once\": \"^1.3.0\",\n+ \"wrappy\": \"1\"\n+ }\n+ },\n+ \"inherits\": {\n+ \"version\": \"2.0.3\",\n+ \"resolved\": \"https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz\",\n+ \"integrity\": \"sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=\"\n+ },\n+ \"is-property\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz\",\n+ \"integrity\": \"sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=\"\n+ },\n+ \"is-typedarray\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz\",\n+ \"integrity\": \"sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=\",\n+ \"dev\": true\n+ },\n+ \"isarray\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz\",\n+ \"integrity\": \"sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=\"\n+ },\n+ \"isstream\": {\n+ \"version\": \"0.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz\",\n+ \"integrity\": \"sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=\",\n+ \"dev\": true\n+ },\n+ \"js-tokens\": {\n+ \"version\": \"4.0.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1586796260005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz\",\n+ \"integrity\": \"sha1-GSA/tZmR35jjoocFDUZHzerzJJk=\",\n+ \"dev\": true\n+ },\n+ \"js-yaml\": {\n+ \"version\": \"3.13.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.13.1.tgz\",\n+ \"integrity\": \"sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"argparse\": \"^1.0.7\",\n+ \"esprima\": \"^4.0.0\"\n+ }\n+ },\n+ \"jsbn\": {\n+ \"version\": \"0.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz\",\n+ \"integrity\": \"sha1-peZUwuWi3rXyAdls77yoDA7y9RM=\",\n+ \"dev\": true\n+ },\n+ \"json-schema\": {\n+ \"version\": \"0.2.3\",\n+ \"resolved\": \"https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz\",\n+ \"integrity\": \"sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=\",\n+ \"dev\": true\n+ },\n+ \"json-schema-traverse\": {\n+ \"version\": \"0.4.1\",\n+ \"resolved\": \"https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz\",\n+ \"integrity\": \"sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==\",\n+ \"dev\": true\n+ },\n+ \"json-stringify-safe\": {\n+ \"version\": \"5.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz\",\n+ \"integrity\": \"sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=\",\n+ \"dev\": true\n+ },\n+ \"jsprim\": {\n+ \"version\": \"1.4.1\",\n+ \"resolved\": \"https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz\",\n+ \"integrity\": \"sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"assert-plus\": \"1.0.0\",\n+ \"extsprintf\": \"1.3.0\",\n+ \"json-schema\": \"0.2.3\",\n+ \"verror\": \"1.10.0\"\n+ }\n+ },\n+ \"lodash\": {\n+ \"version\": \"4.17.15\",\n+ \"resolved\": \"https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz\",\n+ \"integrity\": \"sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=\"\n+ },\n+ \"long\": {\n+ \"version\": \"4.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/long/-/long-4.0.0.tgz\",\n+ \"integrity\": \"sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==\"\n+ },\n+ \"lru-cache\": {\n+ \"version\": \"4.1.5\",\n+ \"resolved\": \"https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz\",\n+ \"integrity\": \"sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==\",\n+ \"requires\": {\n+ \"pseudomap\": \"^1.0.2\",\n+ \"yallist\": \"^2.1.2\"\n+ }\n+ },\n+ \"mime-db\": {\n+ \"version\": \"1.38.0\",\n+ \"resolved\": \"https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz\",\n+ \"integrity\": \"sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==\",\n+ \"dev\": true\n+ },\n+ \"mime-types\": {\n+ \"version\": \"2.1.22\",\n+ \"resolved\": \"https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz\",\n+ \"integrity\": \"sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"mime-db\": \"~1.38.0\"\n+ }\n+ },\n+ \"minimatch\": {\n+ \"version\": \"3.0.4\",\n+ \"resolved\": \"https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz\",\n+ \"integrity\": \"sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"brace-expansion\": \"^1.1.7\"\n+ }\n+ },\n+ \"minimist\": {\n+ \"version\": \"0.0.8\",\n+ \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz\",\n+ \"integrity\": \"sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=\",\n+ \"dev\": true\n+ },\n+ \"mkdirp\": {\n+ \"version\": \"0.5.1\",\n+ \"resolved\": \"https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz\",\n+ \"integrity\": \"sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"minimist\": \"0.0.8\"\n+ }\n+ },\n+ \"mocha\": {\n+ \"version\": \"4.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz\",\n+ \"integrity\": \"sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"browser-stdout\": \"1.3.0\",\n+ \"commander\": \"2.11.0\",\n+ \"debug\": \"3.1.0\",\n+ \"diff\": \"3.3.1\",\n+ \"escape-string-regexp\": \"1.0.5\",\n+ \"glob\": \"7.1.2\",\n+ \"growl\": \"1.10.3\",\n+ \"he\": \"1.1.1\",\n+ \"mkdirp\": \"0.5.1\",\n+ \"supports-color\": \"4.4.0\"\n+ },\n+ \"dependencies\": {\n+ \"supports-color\": {\n+ \"version\": \"4.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz\",\n+ \"integrity\": \"sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"has-flag\": \"^2.0.0\"\n+ }\n+ }\n+ }\n+ },\n+ \"ms\": {\n+ \"version\": \"2.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/ms/-/ms-2.0.0.tgz\",\n+ \"integrity\": \"sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=\",\n+ \"dev\": true\n+ },\n+ \"mysql\": {\n+ \"version\": \"2.15.0\",\n+ \"resolved\": \"https://registry.npmjs.org/mysql/-/mysql-2.15.0.tgz\",\n+ \"integrity\": \"sha512-C7tjzWtbN5nzkLIV+E8Crnl9bFyc7d3XJcBAvHKEVkjrYjogz3llo22q6s/hw+UcsE4/844pDob9ac+3dVjQSA==\",\n+ \"requires\": {\n+ \"bignumber.js\": \"4.0.4\",\n+ \"readable-stream\": \"2.3.3\",\n+ \"safe-buffer\": \"5.1.1\",\n+ \"sqlstring\": \"2.3.0\"\n+ }\n+ },\n+ \"mysql2\": {\n+ \"version\": \"1.6.5\",\n+ \"resolved\": \"https://registry.npmjs.org/mysql2/-/mysql2-1.6.5.tgz\",\n+ \"integrity\": \"sha512-zedaOOyb3msuuZcJJnxIX/EGOpmljDG7B+UevRH5lqcv+yhy9eCwkArBz8/AO+/rlY3/oCsOdG8R5oD6k0hNfg==\",\n+ \"requires\": {\n+ \"denque\": \"^1.4.0\",\n+ \"generate-function\": \"^2.3.1\",\n+ \"iconv-lite\": \"^0.4.24\",\n+ \"long\": \"^4.0.0\",\n+ \"lru-cache\": \"^4.1.3\",\n+ \"named-placeholders\": \"^1.1.2\",\n+ \"seq-queue\": \"^0.0.5\",\n+ \"sqlstring\": \"^2.3.1\"\n+ },\n+ \"dependencies\": {\n+ \"sqlstring\": {\n+ \"version\": \"2.3.1\",\n+ \"resolved\": \"https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz\",\n+ \"integrity\": \"sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=\"\n+ }\n+ }\n+ },\n+ \"mysqldump\": {\n+ \"version\": \"2.2.1\",\n+ \"resolved\": \"https://registry.npmjs.org/mysqldump/-/mysqldump-2.2.1.tgz\",\n+ \"integrity\": \"sha512-6Lo8pADtE+17Fe0i+WvqtlDeFpboVPfalJxn/E+Uz1E89FAbg4oOV9CDTRmk2ysoxNvjtI9h6DLGznYmO8WTOQ==\",\n+ \"requires\": {\n+ \"deepmerge\": \"^2.1.1\",\n+ \"mysql2\": \"^1.5.3\",\n+ \"sql-formatter\": \"^2.3.1\",\n+ \"sqlstring\": \"^2.3.1\"\n+ },\n+ \"dependencies\": {\n+ \"sqlstring\": {\n+ \"version\": \"2.3.1\",\n+ \"resolved\": \"https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz\",\n+ \"integrity\": \"sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=\"\n+ }\n+ }\n+ },\n+ \"named-placeholders\": {\n+ \"version\": \"1.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz\",\n+ \"integrity\": \"sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==\",\n+ \"requires\": {\n+ \"lru-cache\": \"^4.1.3\"\n+ }\n+ },\n+ \"oauth-sign\": {\n+ \"version\": \"0.9.0\",\n+ \"resolved\": \"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz\",\n+ \"integrity\": \"sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==\",\n+ \"dev\": true\n+ },\n+ \"once\": {\n+ \"version\": \"1.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/once/-/once-1.4.0.tgz\",\n+ \"integrity\": \"sha1-WDsap3WWHUsROsF9nFC6753Xa9E=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"wrappy\": \"1\"\n+ }\n+ },\n+ \"path-is-absolute\": {\n+ \"version\": \"1.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz\",\n+ \"integrity\": \"sha1-F0uSaHNVNP+8es5r9TpanhtcX18=\",\n+ \"dev\": true\n+ },\n+ \"path-parse\": {\n+ \"version\": \"1.0.6\",\n+ \"resolved\": \"https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz\",\n+ \"integrity\": \"sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=\",\n+ \"dev\": true\n+ },\n+ \"performance-now\": {\n+ \"version\": \"2.1.0\",\n+ \"resolved\": \"https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz\",\n+ \"integrity\": \"sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=\",\n+ \"dev\": true\n+ },\n+ \"process-nextick-args\": {\n+ \"version\": \"1.0.7\",\n+ \"resolved\": \"https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz\",\n+ \"integrity\": \"sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=\"\n+ },\n+ \"pseudomap\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz\",\n+ \"integrity\": \"sha1-8FKijacOYYkX7wqKw0wa5aaChrM=\"\n+ },\n+ \"psl\": {\n+ \"version\": \"1.1.31\",\n+ \"resolved\": \"https://registry.npmjs.org/psl/-/psl-1.1.31.tgz\",\n+ \"integrity\": \"sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==\",\n+ \"dev\": true\n+ },\n+ \"punycode\": {\n+ \"version\": \"2.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz\",\n+ \"integrity\": \"sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==\",\n+ \"dev\": true\n+ },\n+ \"qs\": {\n+ \"version\": \"6.5.2\",\n+ \"resolved\": \"https://registry.npmjs.org/qs/-/qs-6.5.2.tgz\",\n+ \"integrity\": \"sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==\",\n+ \"dev\": true\n+ },\n+ \"querystringify\": {\n+ \"version\": \"2.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz\",\n+ \"integrity\": \"sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==\",\n+ \"dev\": true\n+ },\n+ \"readable-stream\": {\n+ \"version\": \"2.3.3\",\n+ \"resolved\": \"https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz\",\n+ \"integrity\": \"sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==\",\n+ \"requires\": {\n+ \"core-util-is\": \"~1.0.0\",\n+ \"inherits\": \"~2.0.3\",\n+ \"isarray\": \"~1.0.0\",\n+ \"process-nextick-args\": \"~1.0.6\",\n+ \"safe-buffer\": \"~5.1.1\",\n+ \"string_decoder\": \"~1.0.3\",\n+ \"util-deprecate\": \"~1.0.1\"\n+ }\n+ },\n+ \"request\": {\n+ \"version\": \"2.88.0\",\n+ \"resolved\": \"https://registry.npmjs.org/request/-/request-2.88.0.tgz\",\n+ \"integrity\": \"sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"aws-sign2\": \"~0.7.0\",\n+ \"aws4\": \"^1.8.0\",\n+ \"caseless\": \"~0.12.0\",\n+ \"combined-stream\": \"~1.0.6\",\n+ \"extend\": \"~3.0.2\",\n+ \"forever-agent\": \"~0.6.1\",\n+ \"form-data\": \"~2.3.2\",\n+ \"har-validator\": \"~5.1.0\",\n+ \"http-signature\": \"~1.2.0\",\n+ \"is-typedarray\": \"~1.0.0\",\n+ \"isstream\": \"~0.1.2\",\n+ \"json-stringify-safe\": \"~5.0.1\",\n+ \"mime-types\": \"~2.1.19\",\n+ \"oauth-sign\": \"~0.9.0\",\n+ \"performance-now\": \"^2.1.0\",\n+ \"qs\": \"~6.5.2\",\n+ \"safe-buffer\": \"^5.1.2\",\n+ \"tough-cookie\": \"~2.4.3\",\n+ \"tunnel-agent\": \"^0.6.0\",\n+ \"uuid\": \"^3.3.2\"\n+ },\n+ \"dependencies\": {\n+ \"safe-buffer\": {\n+ \"version\": \"5.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz\",\n+ \"integrity\": \"sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==\",\n+ \"dev\": true\n+ },\n+ \"uuid\": {\n+ \"version\": \"3.3.2\",\n+ \"resolved\": \"https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz\",\n+ \"integrity\": \"sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==\",\n+ \"dev\": true\n+ }\n+ }\n+ },\n+ \"requires-port\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz\",\n+ \"integrity\": \"sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=\",\n+ \"dev\": true\n+ },\n+ \"resolve\": {\n+ \"version\": \"1.16.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/resolve/download/resolve-1.16.0.tgz?cache=0&sync_timestamp=1586994575637&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.16.0.tgz\",\n+ \"integrity\": \"sha1-Bj3HBPo0E+E6wdDRdWp8v+ld0ac=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"path-parse\": \"^1.0.6\"\n+ }\n+ },\n+ \"safe-buffer\": {\n+ \"version\": \"5.1.1\",\n+ \"resolved\": \"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz\",\n+ \"integrity\": \"sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==\"\n+ },\n+ \"safer-buffer\": {\n+ \"version\": \"2.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz\",\n+ \"integrity\": \"sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==\"\n+ },\n+ \"semver\": {\n+ \"version\": \"5.4.1\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-5.4.1.tgz\",\n+ \"integrity\": \"sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==\",\n+ \"dev\": true\n+ },\n+ \"seq-queue\": {\n+ \"version\": \"0.0.5\",\n+ \"resolved\": \"https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz\",\n+ \"integrity\": \"sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=\"\n+ },\n+ \"source-map\": {\n+ \"version\": \"0.6.1\",\n+ \"resolved\": \"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz\",\n+ \"integrity\": \"sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==\",\n+ \"dev\": true\n+ },\n+ \"source-map-support\": {\n+ \"version\": \"0.5.11\",\n+ \"resolved\": \"https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz\",\n+ \"integrity\": \"sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"buffer-from\": \"^1.0.0\",\n+ \"source-map\": \"^0.6.0\"\n+ }\n+ },\n+ \"sprintf-js\": {\n+ \"version\": \"1.0.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz\",\n+ \"integrity\": \"sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=\",\n+ \"dev\": true\n+ },\n+ \"sql-formatter\": {\n+ \"version\": \"2.3.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/sql-formatter/download/sql-formatter-2.3.3.tgz\",\n+ \"integrity\": \"sha1-kQ70hPu5iKXlEL6kFhFX47gLL2I=\",\n+ \"requires\": {\n+ \"lodash\": \"^4.16.0\"\n+ }\n+ },\n+ \"sqlstring\": {\n+ \"version\": \"2.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.0.tgz\",\n+ \"integrity\": \"sha1-UluKT9Jtb3GqYegipsr5dtMa0qg=\"\n+ },\n+ \"sshpk\": {\n+ \"version\": \"1.16.1\",\n+ \"resolved\": \"https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz\",\n+ \"integrity\": \"sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"asn1\": \"~0.2.3\",\n+ \"assert-plus\": \"^1.0.0\",\n+ \"bcrypt-pbkdf\": \"^1.0.0\",\n+ \"dashdash\": \"^1.12.0\",\n+ \"ecc-jsbn\": \"~0.1.1\",\n+ \"getpass\": \"^0.1.1\",\n+ \"jsbn\": \"~0.1.0\",\n+ \"safer-buffer\": \"^2.0.2\",\n+ \"tweetnacl\": \"~0.14.0\"\n+ }\n+ },\n+ \"string_decoder\": {\n+ \"version\": \"1.0.3\",\n+ \"resolved\": \"https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz\",\n+ \"integrity\": \"sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==\",\n+ \"requires\": {\n+ \"safe-buffer\": \"~5.1.0\"\n+ }\n+ },\n+ \"supports-color\": {\n+ \"version\": \"5.5.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz\",\n+ \"integrity\": \"sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"has-flag\": \"^3.0.0\"\n+ },\n+ \"dependencies\": {\n+ \"has-flag\": {\n+ \"version\": \"3.0.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz\",\n+ \"integrity\": \"sha1-tdRU3CGZriJWmfNGfloH87lVuv0=\",\n+ \"dev\": true\n+ }\n+ }\n+ },\n+ \"tough-cookie\": {\n+ \"version\": \"2.4.3\",\n+ \"resolved\": \"https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz\",\n+ \"integrity\": \"sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"psl\": \"^1.1.24\",\n+ \"punycode\": \"^1.4.1\"\n+ },\n+ \"dependencies\": {\n+ \"punycode\": {\n+ \"version\": \"1.4.1\",\n+ \"resolved\": \"https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz\",\n+ \"integrity\": \"sha1-wNWmOycYgArY4esPpSachN1BhF4=\",\n+ \"dev\": true\n+ }\n+ }\n+ },\n+ \"tslib\": {\n+ \"version\": \"1.11.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/tslib/download/tslib-1.11.1.tgz\",\n+ \"integrity\": \"sha1-6xXRKIJ/vuKEFUnhcfRe0zisfjU=\",\n+ \"dev\": true\n+ },\n+ \"tslint\": {\n+ \"version\": \"5.20.1\",\n+ \"resolved\": \"https://registry.npm.taobao.org/tslint/download/tslint-5.20.1.tgz\",\n+ \"integrity\": \"sha1-5AHortoBUrxE3QfmFANPP4DGe30=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"@babel/code-frame\": \"^7.0.0\",\n+ \"builtin-modules\": \"^1.1.1\",\n+ \"chalk\": \"^2.3.0\",\n+ \"commander\": \"^2.12.1\",\n+ \"diff\": \"^4.0.1\",\n+ \"glob\": \"^7.1.1\",\n+ \"js-yaml\": \"^3.13.1\",\n+ \"minimatch\": \"^3.0.4\",\n+ \"mkdirp\": \"^0.5.1\",\n+ \"resolve\": \"^1.3.2\",\n+ \"semver\": \"^5.3.0\",\n+ \"tslib\": \"^1.8.0\",\n+ \"tsutils\": \"^2.29.0\"\n+ },\n+ \"dependencies\": {\n+ \"commander\": {\n+ \"version\": \"2.20.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz\",\n+ \"integrity\": \"sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=\",\n+ \"dev\": true\n+ },\n+ \"diff\": {\n+ \"version\": \"4.0.2\",\n+ \"resolved\": \"https://registry.npm.taobao.org/diff/download/diff-4.0.2.tgz?cache=0&sync_timestamp=1578890967183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdiff%2Fdownload%2Fdiff-4.0.2.tgz\",\n+ \"integrity\": \"sha1-YPOuy4nV+uUgwRqhnvwruYKq3n0=\",\n+ \"dev\": true\n+ }\n+ }\n+ },\n+ \"tsutils\": {\n+ \"version\": \"2.29.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/tsutils/download/tsutils-2.29.0.tgz\",\n+ \"integrity\": \"sha1-MrSIUBRnrL7dS4VJhnOggSrKC5k=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"tslib\": \"^1.8.1\"\n+ }\n+ },\n+ \"tunnel-agent\": {\n+ \"version\": \"0.6.0\",\n+ \"resolved\": \"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz\",\n+ \"integrity\": \"sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"safe-buffer\": \"^5.0.1\"\n+ }\n+ },\n+ \"tweetnacl\": {\n+ \"version\": \"0.14.5\",\n+ \"resolved\": \"https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz\",\n+ \"integrity\": \"sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=\",\n+ \"dev\": true\n+ },\n+ \"typescript\": {\n+ \"version\": \"3.3.4000\",\n+ \"resolved\": \"https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz\",\n+ \"integrity\": \"sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==\",\n+ \"dev\": true\n+ },\n+ \"uri-js\": {\n+ \"version\": \"4.2.2\",\n+ \"resolved\": \"https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz\",\n+ \"integrity\": \"sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"punycode\": \"^2.1.0\"\n+ }\n+ },\n+ \"url-parse\": {\n+ \"version\": \"1.4.4\",\n+ \"resolved\": \"https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz\",\n+ \"integrity\": \"sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"querystringify\": \"^2.0.0\",\n+ \"requires-port\": \"^1.0.0\"\n+ }\n+ },\n+ \"util-deprecate\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz\",\n+ \"integrity\": \"sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=\"\n+ },\n+ \"verror\": {\n+ \"version\": \"1.10.0\",\n+ \"resolved\": \"https://registry.npmjs.org/verror/-/verror-1.10.0.tgz\",\n+ \"integrity\": \"sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"assert-plus\": \"^1.0.0\",\n+ \"core-util-is\": \"1.0.2\",\n+ \"extsprintf\": \"^1.2.0\"\n+ }\n+ },\n+ \"vscode\": {\n+ \"version\": \"1.1.33\",\n+ \"resolved\": \"https://registry.npmjs.org/vscode/-/vscode-1.1.33.tgz\",\n+ \"integrity\": \"sha512-sXedp2oF6y4ZvqrrFiZpeMzaCLSWV+PpYkIxjG/iYquNZ9KrLL2LujltGxPLvzn49xu2sZkyC+avVNFgcJD1Iw==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"glob\": \"^7.1.2\",\n+ \"mocha\": \"^4.0.1\",\n+ \"request\": \"^2.88.0\",\n+ \"semver\": \"^5.4.1\",\n+ \"source-map-support\": \"^0.5.0\",\n+ \"url-parse\": \"^1.4.4\",\n+ \"vscode-test\": \"^0.1.4\"\n+ }\n+ },\n+ \"vscode-test\": {\n+ \"version\": \"0.1.5\",\n+ \"resolved\": \"https://registry.npmjs.org/vscode-test/-/vscode-test-0.1.5.tgz\",\n+ \"integrity\": \"sha512-s+lbF1Dtasc0yXVB9iQTexBe2JK6HJAUJe3fWezHKIjq+xRw5ZwCMEMBaonFIPy7s95qg2HPTRDR5W4h4kbxGw==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"http-proxy-agent\": \"^2.1.0\",\n+ \"https-proxy-agent\": \"^2.2.1\"\n+ }\n+ },\n+ \"wrappy\": {\n+ \"version\": \"1.0.2\",\n+ \"resolved\": \"https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz\",\n+ \"integrity\": \"sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=\",\n+ \"dev\": true\n+ },\n+ \"yallist\": {\n+ \"version\": \"2.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz\",\n+ \"integrity\": \"sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=\"\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.7.2\",\n+ \"version\": \"1.7.21\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n\"tslint\": \"tslint -t verbose src/**/*.ts\"\n},\n\"devDependencies\": {\n- \"@types/mocha\": \"^2.2.42\",\n\"@types/mysql\": \"^2.15.9\",\n\"@types/node\": \"^7.0.43\",\n\"tslint\": \"^5.8.0\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.7.21, reduce package size
|
141,908 |
16.04.2020 20:34:44
| -28,800 |
c06c59477e677838a775f5f636b95fa64e6223b0
|
fix index column name error
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableNode.ts",
"new_path": "src/model/table/tableNode.ts",
"diff": "@@ -128,7 +128,7 @@ ADD\nQueryUnit.showSQLTextDocument(`-- ALTER TABLE \\`${this.database}\\`.\\`${this.table}\\` DROP INDEX [indexName];\n-- ALTER TABLE \\`${this.database}\\`.\\`${this.table}\\` ADD [UNIQUE|KEY|PRIMARY KEY] INDEX ([column]);`);\nsetTimeout(() => {\n- QueryUnit.runQuery(`SELECT name,table_schema,index_name,non_unique FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${this.database}' and table_name='${this.table}';`, this);\n+ QueryUnit.runQuery(`SELECT COLUMN_NAME name,table_schema,index_name,non_unique FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${this.database}' and table_name='${this.table}';`, this);\n}, 10);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix index column name error
|
141,908 |
16.04.2020 21:16:57
| -28,800 |
4943bf75d33fd0c3712290986fbe7fa2b601952c
|
change query file name
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -105,7 +105,7 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\npublic async newQuery() {\n- FileManager.show(`${this.identify}-query.sql`)\n+ FileManager.show(`${this.identify}.sql`)\n// QueryUnit.createSQLTextDocument();\nConnectionManager.getConnection(this, true);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
change query file name
|
141,908 |
17.04.2020 13:01:08
| -28,800 |
f616125e7512059a288ce8520e527f027686745e
|
fix form validate error
|
[
{
"change_type": "MODIFY",
"old_path": ".vscodeignore",
"new_path": ".vscodeignore",
"diff": ".vscode-test/**\nout/test/**\nout/**/*.map\n+.idea/**\nsrc/**\nimages/**\n.gitignore\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "</el-table>\n</div>\n<el-dialog :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n- <el-form :rules=\"info.rule\" :ref=\"infoForm\">\n+ <el-form :rules=\"info.rule\" :ref=\"infoForm\" :model=\"update.currentNew\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\n<span>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix form validate error
|
141,908 |
17.04.2020 20:09:27
| -28,800 |
db7d95bf03d795e7100daf2713e04542570a45c0
|
update export file name
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"assert-plus\": \"^1.0.0\"\n}\n},\n+ \"date-format\": {\n+ \"version\": \"3.0.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/date-format/download/date-format-3.0.0.tgz?cache=0&sync_timestamp=1572558653136&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-format%2Fdownload%2Fdate-format-3.0.0.tgz\",\n+ \"integrity\": \"sha1-64eANlx9KxURB4+0keZHl4DzrZU=\"\n+ },\n\"debug\": {\n\"version\": \"3.1.0\",\n\"resolved\": \"https://registry.npmjs.org/debug/-/debug-3.1.0.tgz\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"vscode\": \"^1.1.33\"\n},\n\"dependencies\": {\n+ \"date-format\": \"^3.0.0\",\n\"mysql\": \"^2.15.0\",\n\"mysqldump\": \"^2.2.1\",\n\"sql-formatter\": \"^2.3.3\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -18,6 +18,7 @@ import { TableGroup } from \"../table/tableGroup\";\nimport { ViewGroup } from \"../table/viewGroup\";\nimport { Util } from '../../common/util';\nimport { FileManager } from '../../extension/FileManager';\n+import format = require('date-format');\nexport class DatabaseNode implements Node, ConnectionInfo, CopyAble {\n@@ -77,7 +78,7 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\nengine: false,\n},\n},\n- dumpToFile: `${exportPath}\\\\${this.database}_${this.host}.sql`,\n+ dumpToFile: `${exportPath}\\\\${this.database}_${format('yyyy-MM-dd_hhmmss', new Date())}.sql`,\n}).then(() => {\nvscode.window.showInformationMessage(`Backup ${this.host}_${this.database} success!`);\n}).catch((err) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableNode.ts",
"new_path": "src/model/table/tableNode.ts",
"diff": "@@ -13,6 +13,7 @@ import { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { MySQLTreeDataProvider } from \"../../provider/MysqlTreeDataProvider\";\nimport { Util } from \"../../common/util\";\nimport { CopyAble } from \"../interface/copyAble\";\n+import format = require('date-format');\nexport class TableNode implements Node, ConnectionInfo, CopyAble {\n@@ -211,7 +212,7 @@ ADD\nengine: false,\n},\n},\n- dumpToFile: `${exportPath}\\\\${this.database}.${this.table}_${this.host}.sql`,\n+ dumpToFile: `${exportPath}\\\\${this.database}_${this.table}_${format('yyyy-MM-dd_hhmmss', new Date())}.sql`,\n}).then(() => {\nvscode.window.showInformationMessage(`Backup ${this.host}_${this.database}_${this.table} success!`);\n}).catch((err) => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update export file name
|
141,908 |
17.04.2020 20:49:02
| -28,800 |
8cb8e381d97f023537adebacae9a89cbe4ccc4fb
|
intellij code when input update
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -7,6 +7,11 @@ export class Constants {\npublic static DEFAULT_SIZE = 100;\n}\n+export enum Pattern {\n+ TABLE_PATTERN = \"\\\\b(from|join|update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\",\n+ UPDATE_PATTERN = \"\\\\b(update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\"\n+}\n+\nexport class CacheKey {\npublic static ConectionsKey = \"mysql.connections\";\npublic static CollapseSate = \"mysql.database.cache.collapseState\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "import { Position, TextDocument } from \"vscode\";\nimport * as vscode from \"vscode\";\n+import { Pattern } from \"./Constants\";\nexport class Util {\n+ public static getTableName(sql: string, tablePattern: Pattern): string {\n+\n+ const tableMatch = new RegExp(tablePattern).exec(sql)\n+ if (tableMatch) {\n+ return tableMatch[0].replace(/\\bfrom|join|update\\b/i, \"\") // remove keyword\n+ .replace(/(\\w|\\s)*\\./, \"\") // remove table name\n+ .replace(/`/ig, \"\").trim() // remove `\n+ }\n+\n+ return null;\n+ }\n+\n/**\n* wrap origin with ` if is unusual identifier\n* @param origin any string\n*/\npublic static wrap(origin: string) {\n- if (origin == null) return origin;\n+ if (origin == null) { return origin; }\nif (origin.match(/\\b[-\\.]\\b/ig)\n|| origin.match(/^if|key|name|user|desc|length$/i)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -2,34 +2,44 @@ import * as vscode from \"vscode\";\nimport { DatabaseCache } from \"../../../database/DatabaseCache\";\nimport { ColumnNode } from \"../../../model/table/columnNode\";\nimport { ComplectionChain, ComplectionContext } from \"../complectionContext\";\n+import { Util } from \"../../../common/util\";\n+import { Pattern } from \"../../../common/Constants\";\nexport class ColumnChain implements ComplectionChain {\n+ private tablePatternStr = \"\\\\b(from|join|update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\";\n+ private needStop = true;\npublic async getComplection(complectionContext: ComplectionContext): Promise<vscode.CompletionItem[]> {\nif (complectionContext.preChart === \".\") {\nlet subComplectionItems = await this.generateColumnComplectionItem(complectionContext.preWord);\n- const tableReg = new RegExp(\"\\\\b(from|join)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\n+ const tableReg = new RegExp(this.tablePatternStr + \"(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\nlet result = tableReg.exec(complectionContext.currentSqlFull);\nfor (; result != null && subComplectionItems.length === 0;) {\nsubComplectionItems = await this.generateColumnComplectionItem(\n- result[0].replace(/\\bfrom|join\\b/, \"\")\n- .replace(/(\\w|\\s)*\\./, \"\")\n- .replace(/`/ig, \"\").trim(),\n+ Util.getTableName(result[0], Pattern.TABLE_PATTERN)\n);\nif (subComplectionItems.length > 0) {\nbreak;\n}\n+ this.needStop = true;\nresult = tableReg.exec(complectionContext.currentSqlFull);\n}\nreturn subComplectionItems;\n}\n+ const tableName = Util.getTableName(complectionContext.currentSql, Pattern.UPDATE_PATTERN)\n+ if (tableName && complectionContext.currentSql.match(/\\bset\\b/i)) {\n+ this.needStop = false;\n+ return await this.generateColumnComplectionItem(tableName);\n+ }\n+\n+\nreturn null;\n}\npublic stop(): boolean {\n- return true;\n+ return this.needStop;\n}\nprivate async generateColumnComplectionItem(tableName: string): Promise<vscode.CompletionItem[]> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,7 +3,7 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class KeywordChain implements ComplectionChain {\n- private keywordList: string[] = [\"JOIN\", \"SELECT\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\"];\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
intellij code when input update
|
141,908 |
17.04.2020 21:38:16
| -28,800 |
992f1511500414bec2239ca875eb77fae8f15227
|
can update or create when execute sql
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "</el-row>\n<!-- info panel -->\n<div v-if=\"info.visible \">\n- <div v-if=\"info.error\" class=\"info-panel\" style=\"color:red\" v-html=\"info.message\"></div>\n- <div v-if=\"!info.error\" class=\"info-panel\" style=\"color: green;\" v-html=\"info.message\"></div>\n+ <div v-if=\"info.error\" class=\"info-panel\" style=\"color:red\" v-text=\"info.message\"></div>\n+ <div v-if=\"!info.error\" class=\"info-panel\" style=\"color: green;\" v-text=\"info.message\"></div>\n</div>\n</div>\n<!-- talbe result -->\n</div>\n</template>\n</el-table-column>\n- <!-- table view with table column -->\n- <el-table-column :label=\"column.name\" v-for=\"column in result.columnList\" :key=\"column.name\"\n+ <el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\"\nalign=\"center\" sortable v-if=\"result.columnList\"\n- :width=\"computeWidth(column.name,0,toolbar.filter[column.name])\">\n+ :width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n- <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[column.name]\" placeholder=\"filter\"\n- @blur=\"filter($event,column.name)\" v-on:keyup.enter.native=\"filter($event,column.name)\">\n+ <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"filter\"\n+ @blur=\"filter($event,field.name)\" v-on:keyup.enter.native=\"filter($event,field.name)\">\n</el-input>\n- <span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[column.name])'></span>\n+ <span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[field.name])'></span>\n</template>\n</el-table-column>\n- <!-- table view without tale column -->\n- <el-table-column :label=\"key\" v-for=\"(value,key) in result.data[0]\" :key=\"key\" align=\"center\"\n- v-if=\"!result.columnList\" :width=\"computeWidth(key,0,toolbar.filter[key])\">\n- <template slot-scope=\"scope\">\n- <span v-html='dataformat(scope.row[key])'></span>\n- </template>\n- </el-table-column>\n-\n</el-table>\n</div>\n<el-dialog :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n- <el-form :rules=\"info.rule\" :ref=\"infoForm\" :model=\"update.currentNew\">\n+ <el-form :ref=\"infoForm\" :model=\"update.currentNew\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\n<span>\n- {{column.name}} : {{column.type}} : <span style=\"color: red;\">{{column.key}}</span>\n+ {{column.name}} : {{column.type}} : <span style=\"color: red;\">{{column.key}}{{column.nullable=='YES'?'':' Required'}}</span>\n</span>\n<el-input v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\nmessage: null,\nvisible: false,\nerror: false,\n- rule: {}\n+ // rule have bug, disable it.\n+ // rule: {}\n},\nupdate: {\ncurrent: {},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -88,7 +88,7 @@ export class QueryUnit {\nreturn;\n}\nif (Array.isArray(data)) {\n- QueryPage.send({ type: MessageType.DATA, connection: connectionOptions, res: { sql, costTime, data } as DataResponse });\n+ QueryPage.send({ type: MessageType.DATA, connection: connectionOptions, res: { sql, costTime, data, fields } as DataResponse });\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -25,7 +25,7 @@ export class QueryPage {\nswitch (queryParam.type) {\ncase MessageType.DATA:\n- await this.loadTableInfo(queryParam);\n+ await this.loadColumnList(queryParam);\nbreak;\ncase MessageType.DML:\ncase MessageType.DDL:\n@@ -71,12 +71,12 @@ export class QueryPage {\n});\n}\n- private static async loadTableInfo(queryParam: QueryParam<DataResponse>) {\n+ private static async loadColumnList(queryParam: QueryParam<DataResponse>) {\n+ const fields = queryParam.res.fields;\nconst conn = queryParam.connection;\n- const info = this.getTable(queryParam.res.sql);\n- if (!info) { return; }\n- const tableName = info.table;\n- const database = info.database;\n+ if (!fields || fields.length == 0) { return; }\n+ const tableName = fields[0].orgTable;\n+ const database = fields[0].db;\nif (tableName == null || conn == null) { return; }\n// load table infomation\nconst tableNode = DatabaseCache.getTable(`${conn.host}_${conn.port}_${conn.user}_${database ? database : conn.database}`, tableName);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/queryResponse.ts",
"new_path": "src/view/result/queryResponse.ts",
"diff": "+import * as mysql from \"mysql\";\n+\nexport class RunResponse {\npublic sql: string;\n}\n@@ -10,6 +12,7 @@ export class DataResponse {\npublic database?: string;\npublic table: string | null;\npublic data: any[];\n+ public fields: mysql.FieldInfo[];\n}\nexport class ErrorResponse {\npublic sql: string;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
can update or create when execute sql
|
141,908 |
17.04.2020 21:50:25
| -28,800 |
b57d09ccb0de9080fa4212064b6ea87fac111946
|
intellij code when input insert
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -8,8 +8,8 @@ export class Constants {\n}\nexport enum Pattern {\n- TABLE_PATTERN = \"\\\\b(from|join|update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\",\n- UPDATE_PATTERN = \"\\\\b(update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\"\n+ TABLE_PATTERN = \"\\\\b(from|join|update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\",\n+ DML_PATTERN = \"\\\\b(update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\"\n}\nexport class CacheKey {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -7,9 +7,9 @@ export class Util {\npublic static getTableName(sql: string, tablePattern: Pattern): string {\n- const tableMatch = new RegExp(tablePattern).exec(sql)\n+ const tableMatch = new RegExp(tablePattern, 'img').exec(sql)\nif (tableMatch) {\n- return tableMatch[0].replace(/\\bfrom|join|update\\b/i, \"\") // remove keyword\n+ return tableMatch[0].replace(/\\bfrom|join|update|into\\b/i, \"\") // remove keyword\n.replace(/(\\w|\\s)*\\./, \"\") // remove table name\n.replace(/`/ig, \"\").trim() // remove `\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -28,8 +28,8 @@ export class ColumnChain implements ComplectionChain {\nreturn subComplectionItems;\n}\n- const tableName = Util.getTableName(complectionContext.currentSql, Pattern.UPDATE_PATTERN)\n- if (tableName && complectionContext.currentSql.match(/\\bset\\b/i)) {\n+ const tableName = Util.getTableName(complectionContext.currentSql, Pattern.DML_PATTERN)\n+ if (tableName) {\nthis.needStop = false;\nreturn await this.generateColumnComplectionItem(tableName);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/complectionContext.ts",
"new_path": "src/provider/Complection/complectionContext.ts",
"diff": "@@ -27,7 +27,7 @@ export class ComplectionContext {\nconst wordMatch = currentSql.match(/(\\w|-|\\_|\\*)+/g);\nif (wordMatch) {\n- if ((preChart == null || preChart == \" \" || preChart == \".\") && wordMatch.length >= 1) {\n+ if ((preChart == null || preChart.match(/[\\. \\(\\)\\[\\]\\'\\\"]/)) && wordMatch.length >= 1) {\ncontext.preWord = wordMatch[wordMatch.length - 1];\n} else {\ncontext.preWord = wordMatch[wordMatch.length - 2];\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
intellij code when input insert
|
141,908 |
17.04.2020 22:01:42
| -28,800 |
97d43cddbb2e2d1dee48bb02e5028af6d178041f
|
fix insert fail with quote
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": ".el-table .edit-row {\nbackground: oldlace;\n}\n-\n</style>\n</head>\n</el-row>\n<!-- info panel -->\n<div v-if=\"info.visible \">\n- <div v-if=\"info.error\" class=\"info-panel\" style=\"color:red\" v-text=\"info.message\"></div>\n- <div v-if=\"!info.error\" class=\"info-panel\" style=\"color: green;\" v-text=\"info.message\"></div>\n+ <div v-if=\"info.error\" class=\"info-panel\" style=\"color:red\" v-html=\"info.message\"></div>\n+ <div v-if=\"!info.error\" class=\"info-panel\" style=\"color: green;\" v-html=\"info.message\"></div>\n</div>\n</div>\n<!-- talbe result -->\n<el-table-column fixed=\"left\" label=\"Operations\" width=\"100\" v-if=\"result.primaryKey\" align=\"center\">\n<template slot-scope=\"scope\">\n<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n- Reset : <el-button @click=\"resetFilter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\" circle title=\"Reset\">\n+ Reset : <el-button @click=\"resetFilter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\"\n+ circle title=\"Reset\">\n</el-button>\n</div>\n<div v-if=\"scope.row[result.primaryKey]\">\n</div>\n</template>\n</el-table-column>\n- <el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\"\n- align=\"center\" sortable v-if=\"result.columnList\"\n- :width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n+ <el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\" align=\"center\"\n+ sortable v-if=\"result.columnList\" :width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n<el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"filter\"\n@blur=\"filter($event,field.name)\" v-on:keyup.enter.native=\"filter($event,field.name)\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\n<span>\n- {{column.name}} : {{column.type}} : <span style=\"color: red;\">{{column.key}}{{column.nullable=='YES'?'':' Required'}}</span>\n+ {{column.name}} : {{column.type}} : <span\n+ style=\"color: red;\">{{column.key}}{{column.nullable=='YES'?'':' Required'}}</span>\n</span>\n<el-input v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\nconst newEle = this.update.currentNew[key];\nif (newEle) {\ncolumns += `${key},`;\n- values += `'${newEle}',`;\n+ values += `'${newEle.replace(/'/g, \"\\\\'\")}',`;\n}\n}\nif (values) {\nconst oldEle = this.update.current[key];\nconst newEle = this.update.currentNew[key];\nif (oldEle != newEle) {\n- change += `${key}='${newEle}',`\n+ change += `${key}='${newEle.replace(/'/g, \"\\\\'\")}',`\n}\n}\nif (change) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix insert fail with quote
|
141,908 |
17.04.2020 22:29:07
| -28,800 |
16275e3306bd320869934f9b4ecd384cff1274a8
|
switch active database when switch query file
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "import * as fs from \"fs\";\n+import * as path from \"path\";\nimport * as mysql from \"mysql\";\n+import * as vscode from \"vscode\";\nimport { Global } from \"../common/Global\";\nimport { Console } from \"../common/OutputChannel\";\nimport { ConnectionInfo } from \"../model/interface/connection\";\n@@ -20,6 +22,17 @@ export class ConnectionManager {\nreturn undefined;\n}\n+ if (vscode.window.activeTextEditor) {\n+ const fileName = vscode.window.activeTextEditor.document.fileName;\n+ if (fileName.includes('cweijan.vscode-mysql-client')) {\n+\n+ const queryName = path.basename(fileName, path.extname(fileName))\n+ const [host, port, user, database] = queryName.split('_')\n+ return this.getConnection({\n+ multipleStatements: true, host, port, user, database, certPath: null\n+ }, true)\n+ }\n+ }\nreturn this.getConnection(Object.assign({ multipleStatements: true }, this.lastConnectionOption));\n@@ -30,7 +43,7 @@ export class ConnectionManager {\nconnectionOptions.multipleStatements = true;\nthis.lastConnectionOption = connectionOptions;\nif (changeActive) { Global.updateStatusBarItems(connectionOptions); }\n- const key = `${connectionOptions.host}_${connectionOptions.port}_${connectionOptions.user}_${connectionOptions.password}`;\n+ const key = `${connectionOptions.host}_${connectionOptions.port}_${connectionOptions.user}`;\nreturn new Promise((resolve, reject) => {\nconst connection = this.activeConnection[key];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableChain.ts",
"new_path": "src/provider/Complection/chain/tableChain.ts",
"diff": "@@ -10,6 +10,7 @@ import { ConnectionManager } from \"../../../database/ConnectionManager\";\nexport class TableChain implements ComplectionChain {\npublic getComplection(complectionContext: ComplectionContext): vscode.CompletionItem[] {\n+ ConnectionManager.getLastActiveConnection()\nif (complectionContext.preChart == \".\") {\nconst temp = this.generateTableComplectionItem(complectionContext.preWord);\nif (temp.length == 0) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
switch active database when switch query file
|
141,908 |
17.04.2020 22:31:33
| -28,800 |
60c728ac26bfe9903c6ff1033f085f5f86a5d816
|
update to 1.7.30
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.7.21\",\n+ \"version\": \"1.7.30\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n},\n{\n\"command\": \"mysql.newQuery\",\n- \"title\": \"New Query\",\n+ \"title\": \"Open Query\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/query.svg\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.7.30
|
141,908 |
17.04.2020 22:45:47
| -28,800 |
e47a83ca20b531c05233073b225ab6c6573dc171
|
show comment when edit
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "<template>\n<span>\n{{column.name}} : {{column.type}} : <span\n- style=\"color: red;\">{{column.key}}{{column.nullable=='YES'?'':' Required'}}</span>\n+ style=\"color: red;\">{{column.key}}{{column.nullable=='YES'?'':' Required'}}</span> \n+ {{column.comment?column.comment:''}}\n</span>\n<el-input v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,7 +3,7 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class KeywordChain implements ComplectionChain {\n- private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\"];\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\",\"COMMENT\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
show comment when edit
|
141,908 |
17.04.2020 22:46:18
| -28,800 |
8e5028d203379489a7bf541b814f2aa13691fd3d
|
update to 1.7.31
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "-## 1.7.30 (2020/4/17)\n+## 1.7.31 (2020/4/17)\n- Switch active database using open query.\n- support insert or update in any query result page.\n- intellij insert|update code.\n+- show comment when edit.\n- fix bugs.\n## 1.7.2 (2020/4/15)\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.7.30\",\n+ \"version\": \"1.7.31\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.7.31
|
141,908 |
18.04.2020 18:23:40
| -28,800 |
149233b59890b01500a857da3e33ad38e7b60437
|
fix connect to same host fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -29,7 +29,7 @@ export class ConnectionNode implements Node, ConnectionInfo {\nthis.identify = `${this.host}_${this.port}_${this.user}`;\nreturn {\nlabel: this.identify,\n- id: this.host,\n+ id: this.identify,\ncollapsibleState: DatabaseCache.getElementState(this),\ncontextValue: ModelType.CONNECTION,\niconPath: path.join(Constants.RES_PATH, \"server.png\"),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -34,6 +34,7 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\nthis.identify = `${this.host}_${this.port}_${this.user}_${this.database}`;\nreturn {\nlabel: this.database,\n+ id: this.identify,\ncollapsibleState: DatabaseCache.getElementState(this),\ncontextValue: ModelType.DATABASE,\niconPath: path.join(Constants.RES_PATH, \"database.svg\"),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -50,7 +50,7 @@ export class UserGroup extends DatabaseNode {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE USER 'username'@'host' IDENTIFIED BY 'password';`);\n+ QueryUnit.createSQLTextDocument(`CREATE USER 'username'@'%' IDENTIFIED BY 'password';`);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/function.ts",
"new_path": "src/model/other/function.ts",
"diff": "@@ -16,14 +16,14 @@ export class FunctionNode implements Node, ConnectionInfo {\nconstructor(readonly host: string, readonly user: string, readonly password: string,\nreadonly port: string, readonly database: string, readonly name: string,\nreadonly certPath: string) {\n+ this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`;\n}\npublic getTreeItem(): vscode.TreeItem {\n- this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`;\nreturn {\nlabel: this.name,\n- // collapsibleState: DatabaseCache.getElementState(this),\n+ id: this.identify,\ncontextValue: ModelType.FUNCTION,\niconPath: path.join(Constants.RES_PATH, \"function.svg\"),\ncommand: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/functionGroup.ts",
"new_path": "src/model/other/functionGroup.ts",
"diff": "@@ -21,6 +21,7 @@ export class FunctionGroup implements Node, ConnectionInfo {\npublic getTreeItem(): vscode.TreeItem {\nreturn {\nlabel: \"FUNCTION\",\n+ id: this.identify,\ncollapsibleState: DatabaseCache.getElementState(this),\ncontextValue: ModelType.FUNCTION_GROUP,\niconPath: path.join(Constants.RES_PATH, \"function.svg\"),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/procedure.ts",
"new_path": "src/model/other/procedure.ts",
"diff": "@@ -16,14 +16,13 @@ export class ProcedureNode implements Node, ConnectionInfo {\nconstructor(readonly host: string, readonly user: string, readonly password: string,\nreadonly port: string, readonly database: string, readonly name: string,\nreadonly certPath: string) {\n+ this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`\n}\npublic getTreeItem(): vscode.TreeItem {\n-\n- this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`\nreturn {\nlabel: this.name,\n- // collapsibleState: DatabaseCache.getElementState(this),\n+ id: this.identify,\ncontextValue: ModelType.PROCEDURE,\niconPath: path.join(Constants.RES_PATH, \"procedure.svg\"),\ncommand: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/trigger.ts",
"new_path": "src/model/other/trigger.ts",
"diff": "@@ -15,14 +15,13 @@ export class TriggerNode implements Node, ConnectionInfo {\nconstructor(readonly host: string, readonly user: string, readonly password: string,\nreadonly port: string, readonly database: string, readonly name: string,\nreadonly certPath: string) {\n+ this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`\n}\npublic getTreeItem(): vscode.TreeItem {\n-\n- this.identify = `${this.host}_${this.port}_${this.user}_${this.database}_${this.name}`\nreturn {\nlabel: this.name,\n- // collapsibleState: DatabaseCache.getElementState(this),\n+ id: this.identify,\ncontextValue: ModelType.TRIGGER,\niconPath: path.join(Constants.RES_PATH, \"trigger.svg\"),\ncommand: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/triggerGroup.ts",
"new_path": "src/model/other/triggerGroup.ts",
"diff": "@@ -5,7 +5,6 @@ import { InfoNode } from \"../InfoNode\";\nimport { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\n-import { TableNode } from \"../table/tableNode\";\nimport { ConnectionInfo } from \"../interface/connection\";\nimport { Constants, ModelType } from \"../../common/Constants\";\nimport { TriggerNode } from \"./Trigger\";\n@@ -22,6 +21,7 @@ export class TriggerGroup implements Node, ConnectionInfo {\npublic getTreeItem(): vscode.TreeItem {\nreturn {\nlabel: \"TRIGGER\",\n+ id: this.identify,\ncollapsibleState: DatabaseCache.getElementState(this),\ncontextValue: ModelType.TRIGGER_GROUP,\niconPath: path.join(Constants.RES_PATH, \"trigger.svg\"),\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix connect to same host fail.
|
141,908 |
18.04.2020 18:24:31
| -28,800 |
0cba6a3e7704000cb08f176856a6cfef724607f0
|
update to 1.7.32
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "+## 1.7.32 (2020/4/18)\n+- Fix legacy bug: connect to same host fail.\n+\n## 1.7.31 (2020/4/17)\n- Switch active database using open query.\n- support insert or update in any query result page.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.7.31\",\n+ \"version\": \"1.7.32\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.7.32
|
141,908 |
19.04.2020 11:44:59
| -28,800 |
c1a885efc189c521e47cdad83e5583192d9798b3
|
order table correct
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableGroup.ts",
"new_path": "src/model/table/tableGroup.ts",
"diff": "@@ -34,7 +34,7 @@ export class TableGroup implements Node, ConnectionInfo {\nreturn tableNodes;\n}\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this),\n- `SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${this.database}' and TABLE_TYPE<>'VIEW' LIMIT ${QueryUnit.maxTableCount} ;`)\n+ `SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${this.database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`)\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\nreturn new TableNode(this.host, this.user, this.password, this.port, this.database, table.TABLE_NAME, this.certPath);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
order table correct
|
141,908 |
21.04.2020 20:20:35
| -28,800 |
df71af763d5d39fa74e42d6ebd60a52053cc426e
|
improve drop operation
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -34,6 +34,10 @@ export class Cursor {\n}\n}\n+export enum Confirm {\n+ YES = \"YES\", NO = \"NO\"\n+}\n+\nexport class ModelType {\npublic static CONNECTION = \"connection\";\npublic static DATABASE = \"database\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "import { Position, TextDocument } from \"vscode\";\nimport * as vscode from \"vscode\";\n-import { Pattern } from \"./Constants\";\n+import { Pattern, Confirm } from \"./Constants\";\nexport class Util {\n@@ -56,4 +56,12 @@ export class Util {\n});\n}\n+ public static confirm(placeHolder: string, callback: () => void) {\n+ vscode.window.showQuickPick([Confirm.YES, Confirm.NO], { placeHolder }).then((res) => {\n+ if (res == Confirm.YES) {\n+ callback()\n+ }\n+ })\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -63,7 +63,7 @@ export function activate(context: vscode.ExtensionContext) {\nconnectionNode.createDatabase();\n}),\nvscode.commands.registerCommand(\"mysql.deleteDatabase\", (databaseNode: DatabaseNode) => {\n- databaseNode.deleteDatatabase();\n+ databaseNode.dropDatatabase();\n}),\nvscode.commands.registerCommand(\"mysql.addConnection\", () => {\nSqlViewManager.showConnectPage();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -89,19 +89,16 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\n}\n- public deleteDatatabase() {\n- vscode.window.showInputBox({ prompt: `Are you want to Delete Database ${this.database} ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ public dropDatatabase() {\n+\n+ Util.confirm(`Are you want to Drop Database ${this.database} ? `, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP DATABASE \\`${this.database}\\``).then(() => {\nDatabaseCache.clearDatabaseCache(`${this.host}_${this.port}_${this.user}`);\nMySQLTreeDataProvider.refresh();\nvscode.window.showInformationMessage(`Delete database ${this.database} success!`);\n});\n- } else {\n- vscode.window.showInformationMessage(`Cancel delete database ${this.database}!`);\n- }\n- });\n+ })\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -90,18 +90,13 @@ export class UserNode implements Node, ConnectionInfo, CopyAble {\n}\npublic drop() {\n- ConnectionManager.getConnection(this, true);\n- vscode.window.showInputBox({ prompt: `Are you want to drop user ${this.user} ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+\n+ Util.confirm(`Are you want to drop user ${this.user} ?`, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP user ${this.name}`).then(() => {\nMySQLTreeDataProvider.refresh();\nvscode.window.showInformationMessage(`Drop user ${this.name} success!`);\n});\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop user ${this.name}!`);\n- }\n- });\n+ })\n}\npublic changePasswordTemplate() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/function.ts",
"new_path": "src/model/other/function.ts",
"diff": "@@ -7,6 +7,7 @@ import { ModelType, Constants } from \"../../common/Constants\";\nimport { ConnectionInfo } from \"../interface/connection\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { MySQLTreeDataProvider } from \"../../provider/MysqlTreeDataProvider\";\n+import { Util } from \"../../common/util\";\nexport class FunctionNode implements Node, ConnectionInfo {\n@@ -50,18 +51,13 @@ export class FunctionNode implements Node, ConnectionInfo {\npublic drop() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop function ${this.name} ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to drop function ${this.name} ?`, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP function \\`${this.database}\\`.\\`${this.name}\\``).then(() => {\nDatabaseCache.clearTableCache(`${this.host}_${this.port}_${this.user}_${this.database}_${ModelType.FUNCTION_GROUP}`);\nMySQLTreeDataProvider.refresh();\nvscode.window.showInformationMessage(`Drop function ${this.name} success!`);\n});\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop function ${this.name}!`);\n- }\n- });\n+ })\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/procedure.ts",
"new_path": "src/model/other/procedure.ts",
"diff": "@@ -7,6 +7,7 @@ import { ModelType, Constants } from \"../../common/Constants\";\nimport { ConnectionInfo } from \"../interface/connection\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { MySQLTreeDataProvider } from \"../../provider/MysqlTreeDataProvider\";\n+import { Util } from \"../../common/util\";\nexport class ProcedureNode implements Node, ConnectionInfo {\n@@ -49,17 +50,12 @@ export class ProcedureNode implements Node, ConnectionInfo {\npublic drop() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop procedure ${this.name} ? `, placeHolder: 'Input y to confirm.' }).then(async inputContent => {\n- if (!inputContent) return;\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to drop procedure ${this.name} ? `, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP procedure \\`${this.database}\\`.\\`${this.name}\\``).then(() => {\nDatabaseCache.clearTableCache(`${this.host}_${this.port}_${this.user}_${this.database}_${ModelType.PROCEDURE_GROUP}`)\nMySQLTreeDataProvider.refresh()\nvscode.window.showInformationMessage(`Drop procedure ${this.name} success!`)\n})\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop procedure ${this.name}!`)\n- }\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/trigger.ts",
"new_path": "src/model/other/trigger.ts",
"diff": "@@ -7,6 +7,7 @@ import { ModelType, Constants } from \"../../common/Constants\";\nimport { ConnectionInfo } from \"../interface/connection\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { MySQLTreeDataProvider } from \"../../provider/MysqlTreeDataProvider\";\n+import { Util } from \"../../common/util\";\nexport class TriggerNode implements Node, ConnectionInfo {\nidentify: string;\n@@ -48,17 +49,12 @@ export class TriggerNode implements Node, ConnectionInfo {\npublic drop() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop trigger ${this.name} ? `, placeHolder: 'Input y to confirm.' }).then(async inputContent => {\n- if (!inputContent) return;\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to drop trigger ${this.name} ?`, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP trigger \\`${this.database}\\`.\\`${this.name}\\``).then(() => {\nDatabaseCache.clearTableCache(`${this.host}_${this.port}_${this.user}_${this.database}_${ModelType.TRIGGER_GROUP}`)\nMySQLTreeDataProvider.refresh()\nvscode.window.showInformationMessage(`Drop trigger ${this.name} success!`)\n})\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop trigger ${this.name}!`)\n- }\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableNode.ts",
"new_path": "src/model/table/tableNode.ts",
"diff": "@@ -6,7 +6,7 @@ import { ColumnNode } from \"./columnNode\";\nimport { InfoNode } from \"../InfoNode\";\nimport { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\n-import { ModelType, Constants } from \"../../common/Constants\";\n+import { ModelType, Constants, Confirm } from \"../../common/Constants\";\nimport { ConnectionInfo } from \"../interface/connection\";\nimport { Console } from \"../../common/OutputChannel\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\n@@ -94,33 +94,24 @@ ADD\npublic dropTable() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop table ${this.table} ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to drop table ${this.table} ? `, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP TABLE \\`${this.database}\\`.\\`${this.table}\\``).then(() => {\nDatabaseCache.clearTableCache(`${this.host}_${this.port}_${this.user}_${this.database}`);\nMySQLTreeDataProvider.refresh();\nvscode.window.showInformationMessage(`Drop table ${this.table} success!`);\n});\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop table ${this.table}!`);\n- }\n- });\n+ })\n}\npublic truncateTable() {\n- vscode.window.showInputBox({ prompt: `Are you want to clear table ${this.table} all data ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to clear table ${this.table} all data ?`, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `truncate table \\`${this.database}\\`.\\`${this.table}\\``).then(() => {\nvscode.window.showInformationMessage(`Clear table ${this.table} all data success!`);\n});\n- }\n- });\n-\n+ })\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/viewNode.ts",
"new_path": "src/model/table/viewNode.ts",
"diff": "@@ -6,6 +6,7 @@ import { ModelType, Constants } from \"../../common/Constants\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { QueryUnit } from \"../../database/QueryUnit\";\nimport { MySQLTreeDataProvider } from \"../../provider/MysqlTreeDataProvider\";\n+import { Util } from \"../../common/util\";\nexport class ViewNode extends TableNode {\npublic type: string = ModelType.VIEW;\n@@ -28,18 +29,13 @@ export class ViewNode extends TableNode {\npublic drop() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop view ${this.table} ? `, placeHolder: 'Input y to confirm.' }).then(async (inputContent) => {\n- if (!inputContent) { return; }\n- if (inputContent.toLocaleLowerCase() == 'y') {\n+ Util.confirm(`Are you want to drop view ${this.table} ? `, async () => {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP view \\`${this.database}\\`.\\`${this.table}\\``).then(() => {\nDatabaseCache.clearTableCache(`${this.host}_${this.port}_${this.user}_${this.database}`);\nMySQLTreeDataProvider.refresh();\nvscode.window.showInformationMessage(`Drop view ${this.table} success!`);\n});\n- } else {\n- vscode.window.showInformationMessage(`Cancel drop view ${this.table}!`);\n- }\n- });\n+ })\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
improve drop operation
|
141,908 |
21.04.2020 20:58:38
| -28,800 |
b72681b99308c6bdc8cfdb377beeff75ed510d45
|
support hide columns
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "</el-row>\n<!-- tool panel -->\n<el-row>\n- <el-cow>\n+ <w>\n+ <el-input v-model=\"table.search\" style=\"width:200px\" placeholder=\"Type to search\" />\n+ </w>\n+ <w>\n+ <el-button type=\"primary\" @click='execute(toolbar.sql);info.visible = false;'>Execute</el-button>\n+ <span v-if=\"result.table\">\n+ {{result.table}}\n+ </span>\n+ </w>\n+ </el-row>\n+ <el-row v-if=\"result.table\">\n+ <el-col>\n<el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\"\nv-if=\"result.primaryKey\">\n</el-button>\n- </el-cow>\n- <el-cow v-if=\"result.table\">\n- {{result.table}}\n- </el-cow>\n- <el-cow>\n- <el-input v-model=\"table.search\" style=\"width:200px\" placeholder=\"Type to search\" />\n- </el-cow>\n- <el-cow>\n- <el-button type=\"primary\" @click='execute(toolbar.sql);info.visible = false;'>Execute</el-button>\n- </el-cow>\n- <el-cow>\n<span>CostTime: </span><span v-text=\"toolbar.costTime\"></span>ms\n<span v-if=\"result.table\">, Row: {{result.data.length}}, Col: {{columnCount}}</span>\n- </el-cow>\n+ </el-col>\n</el-row>\n<!-- info panel -->\n<div v-if=\"info.visible \">\n<el-table-column fixed=\"left\" label=\"Operations\" width=\"100\" v-if=\"result.primaryKey\" align=\"center\">\n<template slot-scope=\"scope\">\n<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n- Reset : <el-button @click=\"resetFilter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\"\n+ <el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n+ <el-checkbox-group v-model=\"toolbar.showColumns\">\n+ <el-checkbox v-for=\"(column) in result.columnList\" :label=\"column.name\" :key=\"column.name\">\n+ {{column.name}}\n+ </el-checkbox>\n+ </el-checkbox-group>\n+ <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\" slot=\"reference\"></el-button>\n+ </el-popover>\n+ <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\"\ncircle title=\"Reset\">\n</el-button>\n</div>\n</div>\n</template>\n</el-table-column>\n+ <!-- data -->\n<el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\" align=\"center\"\n- sortable v-if=\"result.columnList\" :width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n+ sortable v-if=\"result.columnList && toolbar.showColumns.includes(field.name)\"\n+ :width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n<el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"filter\"\n@blur=\"filter($event,field.name)\" v-on:keyup.enter.native=\"filter($event,field.name)\">\n</el-table>\n</div>\n<el-dialog :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n- <el-form :ref=\"infoForm\" :model=\"update.currentNew\">\n+ <el-form ref=\"infoForm\" :model=\"update.currentNew\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\n<span>\nsql: null,\ncostTime: 0,\nisRefrsh: false,\n- filter: {}\n+ filter: {},\n+ showColumns: []\n},\neditor: {\nvisible: false,\n}\n}\nreturn objClone;\n+ }, initShowColumn(columnList) {\n+ this.toolbar.showColumns = []\n+ for (let i = 0; i < columnList.length; i++) {\n+ this.toolbar.showColumns.push(columnList[i].name);\n}\n+ }\n+\n},\ncomputed: {\ncolumnCount() {\nvue.uploadRole()\n// add filter row\nvue.result.data.unshift({ isFilter: true, content: '' })\n+ vue.initShowColumn(vue.result.columnList)\n}\nif (vue.toolbar.isRefrsh) {\nvue.toolbar.isRefrsh = false;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support hide columns
|
141,908 |
21.04.2020 21:03:05
| -28,800 |
685cb7991301edb218c433dfdb122da8f188d666
|
only show column in insert
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -30,7 +30,7 @@ export class ColumnChain implements ComplectionChain {\nconst tableName = Util.getTableName(complectionContext.currentSql, Pattern.DML_PATTERN)\nif (tableName) {\n- this.needStop = false;\n+ this.needStop = complectionContext.currentSql.match(/\\binsert\\b/ig) != null;\nreturn await this.generateColumnComplectionItem(tableName);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
only show column in insert
|
141,908 |
21.04.2020 21:46:35
| -28,800 |
24a8599a4ab905c607bac403c61f73eb3701b6b4
|
rollback when batch execute sql occur error
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.table.truncate\",\n- \"title\": \"Clear Table Data\",\n+ \"title\": \"Truncate Table\",\n\"category\": \"MySQL\"\n},\n{\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_mysql@0\"\n},\n+ {\n+ \"command\": \"mysql.name.copy\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"group\": \"1_inline@-1\"\n+ },\n{\n\"command\": \"mysql.changeTableName\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_inline@3\"\n},\n- {\n- \"command\": \"mysql.name.copy\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n- \"group\": \"1_inline@4\"\n- },\n+\n{\n\"command\": \"mysql.copy.insert\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-checkbox-group v-model=\"toolbar.showColumns\">\n- <el-checkbox v-for=\"(column) in result.columnList\" :label=\"column.name\" :key=\"column.name\">\n+ <el-checkbox v-for=\"(column) in result.columnList\" :label=\"column.name\"\n+ :key=\"column.name\">\n{{column.name}}\n</el-checkbox>\n</el-checkbox-group>\n- <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\" slot=\"reference\"></el-button>\n+ <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\"\n+ slot=\"reference\"></el-button>\n</el-popover>\n- <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\"\n- circle title=\"Reset\">\n+ <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\"\n+ icon=\"el-icon-refresh\" circle title=\"Reset\">\n</el-button>\n</div>\n<div v-if=\"scope.row[result.primaryKey]\">\nhandlerCommon(response)\nvue.info.error = true\nbreak;\n+ case \"MESSAGE\":\n+ vue.$message(response.msg)\n+ break;\ndefault:\nvue.$message(JSON.stringify(event.data));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -63,7 +63,8 @@ export enum MessageType {\nDML = 'DML',\nDDL = 'DDL',\nERROR = \"ERROR\",\n- RUN = \"RUN\"\n+ RUN = \"RUN\",\n+ MESSAGE = \"MESSAGE\",\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -16,13 +16,14 @@ export class QueryUnit {\npublic static readonly maxTableCount = Global.getConfig<number>(ConfigKey.MAX_TABLE_COUNT);\n- public static queryPromise<T>(connection, sql: string): Promise<T> {\n+ public static queryPromise<T>(connection: mysql.Connection, sql: string): Promise<T> {\nreturn new Promise((resolve, reject) => {\n// Console.log(`Execute SQL:${sql}`)\nconnection.query(sql, (err, rows) => {\nif (err) {\n+ Console.log(`Execute sql fail : ${sql}`);\nConsole.log(err);\n- reject(\"Error: \" + err.message);\n+ reject(err);\n} else {\nresolve(rows);\n}\n@@ -69,6 +70,13 @@ export class QueryUnit {\nif (isDDL == null && isDML == null) {\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n}\n+ const sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '').map((s) => s.trim())\n+\n+ if (sqlList.length > 1) {\n+ this.runBatch(connection, sqlList)\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { msg: \"Batch execute sql success!\" } });\n+ return;\n+ }\nconnection.query(sql, (err: mysql.MysqlError, data, fields?: mysql.FieldInfo[]) => {\nif (err) {\nQueryPage.send({ type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\n@@ -93,6 +101,19 @@ export class QueryUnit {\n});\n}\n+ private static runBatch(connection: mysql.Connection, sqlList: string[]) {\n+ connection.beginTransaction(async () => {\n+ try {\n+ for (const sql of sqlList) {\n+ await this.queryPromise(connection, sql)\n+ }\n+ connection.commit()\n+ } catch (err) {\n+ connection.rollback()\n+ }\n+ })\n+\n+ }\nprivate static batchPattern = /\\s+(TRIGGER|PROCEDURE|FUNCTION)\\s+/ig;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -10,6 +10,9 @@ import { DataResponse } from \"./queryResponse\";\nexport class QueryParam<T> {\npublic type: MessageType;\n+ /**\n+ * using in loadColumnList\n+ */\npublic connection?: ConnectionInfo;\npublic res: T;\n}\n@@ -71,6 +74,7 @@ export class QueryPage {\n});\n}\n+\nprivate static async loadColumnList(queryParam: QueryParam<DataResponse>) {\nconst fields = queryParam.res.fields;\nconst conn = queryParam.connection;\n@@ -95,21 +99,6 @@ export class QueryPage {\nqueryParam.res.database = conn.database;\n}\n- private static getTable(sql: string): TableInfo {\n- if (!sql) { return null; }\n- const tableInfo = new TableInfo();\n- let baseMatch: string[];\n- if (sql && (baseMatch = (sql + \" \").match(/select\\s+\\*\\s+from\\s*(.+?)(?=[\\s;])/i)) && !sql.match(/\\bjoin\\b/ig)) {\n- const expectTable: string = baseMatch[1].replace(/`/g, \"\");\n- const temp: string[] = expectTable.split(\".\");\n- if (temp.length == 2) {\n- tableInfo.database = temp[0];\n- tableInfo.table = temp[1];\n- }\n- return tableInfo;\n- }\n- }\n-\n}\nclass TableInfo {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
rollback when batch execute sql occur error
|
141,908 |
21.04.2020 21:53:25
| -28,800 |
dc21ee3c789137b1dc4cb69f413b917648b15956
|
rollback when import data occur error
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"command\": \"mysql.data.export\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n- \"group\": \"mysql@5\"\n- },\n- {\n- \"command\": \"mysql.refresh\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n- \"group\": \"3_mysql@4\"\n+ \"group\": \"2_mysql@5\"\n},\n{\n\"command\": \"mysql.changeColumnName\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -70,7 +70,7 @@ export class QueryUnit {\nif (isDDL == null && isDML == null) {\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n}\n- const sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '').map((s) => s.trim())\n+ const sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '')\nif (sqlList.length > 1) {\nthis.runBatch(connection, sqlList)\n@@ -104,7 +104,9 @@ export class QueryUnit {\nprivate static runBatch(connection: mysql.Connection, sqlList: string[]) {\nconnection.beginTransaction(async () => {\ntry {\n- for (const sql of sqlList) {\n+ for (let sql of sqlList) {\n+ sql = sql.trim()\n+ if (!sql) { continue }\nawait this.queryPromise(connection, sql)\n}\nconnection.commit()\n@@ -166,7 +168,7 @@ export class QueryUnit {\npublic static async runFile(connection: Connection, fsPath: string) {\nconst stats = fs.statSync(fsPath);\nconst startTime = new Date();\n- const fileSize = stats[\"size\"];\n+ const fileSize = stats.size;\nif (fileSize > 1024 * 1024 * 100) {\nvscode.window.showErrorMessage(`Import sql exceed max limit 100M!`)\nreturn;\n@@ -176,19 +178,7 @@ export class QueryUnit {\n} else {\nconst fileContent = fs.readFileSync(fsPath, 'utf8');\nconst sqlList = fileContent.split(\";\")\n- for (let sql of sqlList) {\n- if (!(sql = sql.trim())) { continue };\n- // TODO break when break;\n- await new Promise((resolve) => {\n- connection.query(sql, (err, data) => {\n- if (err) {\n- Console.log(`Execute sql fail:\\n ${err.sql}\\n code: ${err.sqlState} message : ${err.message}`)\n- } else {\n- resolve();\n- }\n- });\n- })\n- }\n+ this.runBatch(connection, sqlList)\nConsole.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n}\nvscode.commands.executeCommand(CommandKey.Refresh)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
rollback when import data occur error
|
141,908 |
21.04.2020 22:28:22
| -28,800 |
0d577075f31659a4ba89a64e22870c26ba979b6b
|
support change active db in menu
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"Update SQL\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.db.active\",\n+ \"title\": \"Change Active Database\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.table.truncate\",\n\"title\": \"Truncate Table\",\n{\n\"command\": \"mysql.runQuery\",\n\"when\": \"editorLangId == sql\",\n- \"group\": \"navigation\"\n+ \"group\": \"navigation@0\"\n+ },\n+ {\n+ \"command\": \"mysql.db.active\",\n+ \"when\": \"editorLangId == sql\",\n+ \"group\": \"navigation@1\"\n}\n],\n\"editor/title\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -74,6 +74,9 @@ export function activate(context: vscode.ExtensionContext) {\nvscode.commands.registerCommand(\"mysql.index.template\", (tableNode: TableNode) => {\ntableNode.indexTemplate();\n}),\n+ vscode.commands.registerCommand(\"mysql.db.active\", () => {\n+ mysqlTreeDataProvider.activeDb();\n+ }),\nvscode.commands.registerCommand(\"mysql.table.truncate\", (tableNode: TableNode) => {\ntableNode.truncateTable();\n}),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -23,10 +23,10 @@ export class ConnectionNode implements Node, ConnectionInfo {\nconstructor(readonly id: string, readonly host: string, readonly user: string,\nreadonly password: string, readonly port: string,\nreadonly certPath: string) {\n+ this.identify = `${this.host}_${this.port}_${this.user}`;\n}\npublic getTreeItem(): vscode.TreeItem {\n- this.identify = `${this.host}_${this.port}_${this.user}`;\nreturn {\nlabel: this.identify,\nid: this.identify,\n@@ -37,7 +37,6 @@ export class ConnectionNode implements Node, ConnectionInfo {\n}\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- this.identify = `${this.host}_${this.port}_${this.user}`;\nlet databaseNodes = DatabaseCache.getDatabaseListOfConnection(this.identify);\nif (databaseNodes && !isRresh) {\nreturn databaseNodes;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/mysqlTreeDataProvider.ts",
"new_path": "src/provider/mysqlTreeDataProvider.ts",
"diff": "import * as vscode from \"vscode\";\n+import * as path from \"path\";\nimport { CacheKey } from \"../common/Constants\";\nimport { ConnectionInfo } from \"../model/interface/connection\";\nimport { ConnectionNode } from \"../model/ConnectionNode\";\nimport { Node } from \"../model/interface/node\";\nimport { DatabaseCache } from \"../database/DatabaseCache\";\n+import { DatabaseNode } from \"../model/database/databaseNode\";\n+import { QueryUnit } from \"../database/QueryUnit\";\n+import { ConnectionManager } from \"../database/ConnectionManager\";\nexport class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\n+\npublic _onDidChangeTreeData: vscode.EventEmitter<Node> = new vscode.EventEmitter<Node>();\npublic readonly onDidChangeTreeData: vscode.Event<Node> = this._onDidChangeTreeData.event;\npublic static instance: MySQLTreeDataProvider\n@@ -20,9 +25,9 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\n* reload treeview context\n*/\nasync init() {\n- await (await this.getConnectionNodes()).forEach(async connectionNode => {\n- (await connectionNode.getChildren(true)).forEach(async databaseNode => {\n- (await databaseNode.getChildren(true)).forEach(async tableNode => {\n+ await (await this.getConnectionNodes()).forEach(async (connectionNode) => {\n+ (await connectionNode.getChildren(true)).forEach(async (databaseNode) => {\n+ (await databaseNode.getChildren(true)).forEach(async (tableNode) => {\ntableNode.getChildren(true)\n})\n})\n@@ -74,4 +79,31 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\n}\nreturn connectionNodes;\n}\n+\n+ public async activeDb() {\n+\n+ const fileName = vscode.window.activeTextEditor.document.fileName;\n+ if (fileName.includes('cweijan.vscode-mysql-client') && path.basename(fileName, path.extname(fileName)).split('_')[3] != null) {\n+ vscode.window.showErrorMessage(\"You in query file, not support change.\")\n+ } else {\n+ const dbIdList: string[] = [];\n+ const dbIdMap = new Map<string, DatabaseNode>();\n+ for (const dbNode of DatabaseCache.getDatabaseNodeList()) {\n+ dbIdList.push(dbNode.identify)\n+ dbIdMap.set(dbNode.identify, dbNode)\n+ }\n+ if (dbIdList) {\n+ vscode.window.showQuickPick(dbIdList).then(async (dbId) => {\n+ if (dbId) {\n+ const dbNode = dbIdMap.get(dbId);\n+ await ConnectionManager.getConnection(dbNode, true)\n+ vscode.window.showInformationMessage(`Change active database to ${dbNode.database} success!`)\n+ }\n+\n+ })\n+ }\n+ }\n+\n+ }\n+\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support change active db in menu
|
141,908 |
21.04.2020 23:00:42
| -28,800 |
72e2e6e49c75186f60a34a53fcc7f891a8da2edc
|
remove cache when remove connection
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -16,6 +16,21 @@ export class ConnectionManager {\nreturn this.lastConnectionOption;\n}\n+ public static removeConnection(id: string) {\n+\n+ const lcp = this.lastConnectionOption;\n+ const key = `${lcp.host}_${lcp.port}_${lcp.user}`;\n+ if (key == id) {\n+ delete this.lastConnectionOption\n+ }\n+ const activeConnect = this.activeConnection[id];\n+ if (activeConnect) {\n+ this.activeConnection[id] = null\n+ activeConnect.end()\n+ }\n+\n+ }\n+\npublic static getLastActiveConnection(): Promise<mysql.Connection> {\nif (!this.activeConnection) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -12,6 +12,7 @@ import { UserGroup } from \"./database/userGroup\";\nimport { InfoNode } from \"./InfoNode\";\nimport { Node } from \"./interface/node\";\nimport { FileManager } from \"../extension/FileManager\";\n+import { Util } from \"../common/util\";\nexport class ConnectionNode implements Node, ConnectionInfo {\n@@ -42,7 +43,7 @@ export class ConnectionNode implements Node, ConnectionInfo {\nreturn databaseNodes;\n}\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), \"SHOW DATABASES\")\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), \"show databases\")\n.then((databases) => {\ndatabaseNodes = databases.map<DatabaseNode>((database) => {\nreturn new DatabaseNode(this.host, this.user, this.password, this.port, database.Database, this.certPath);\n@@ -74,11 +75,16 @@ export class ConnectionNode implements Node, ConnectionInfo {\n}\npublic async deleteConnection(context: vscode.ExtensionContext) {\n+\n+ Util.confirm(`Are you want to Delete Connection ${this.id} ? `, async () => {\nconst connections = context.globalState.get<{ [key: string]: ConnectionInfo }>(CacheKey.ConectionsKey);\n+ ConnectionManager.removeConnection(this.id)\n+ DatabaseCache.clearDatabaseCache(this.id)\ndelete connections[this.id];\nawait context.globalState.update(CacheKey.ConectionsKey, connections);\n-\nMySQLTreeDataProvider.refresh();\n+ })\n+\n}\npublic importData(fsPath: string) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
remove cache when remove connection
|
141,908 |
21.04.2020 23:03:09
| -28,800 |
9a27e920e541dd77aa07256413c6ea37f1438d24
|
show msg when execute other sql
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "if (response.costTime) {\nvue.toolbar.costTime = response.costTime\n}\n-\nswitch (event.data.type) {\ncase \"RUN\":\nvue.toolbar.sql = response.sql;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -97,7 +97,9 @@ export class QueryUnit {\n}\nif (Array.isArray(data)) {\nQueryPage.send({ type: MessageType.DATA, connection: connectionOptions, res: { sql, costTime, data, fields } as DataResponse });\n+ return;\n}\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { msg: `Execute sql success : ${sql}`, costTime } });\n});\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
show msg when execute other sql
|
141,908 |
21.04.2020 23:20:12
| -28,800 |
57fc8a74b05e65ec5d61a8fe6ff2028b2a21a7ae
|
show all template in same file
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -11,6 +11,7 @@ import { ConnectionInfo } from \"../model/interface/connection\";\nimport { QueryPage } from \"../view/result/query\";\nimport { DataResponse, DMLResponse, ErrorResponse, RunResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\n+import { FileManager, FileModel } from \"../extension/FileManager\";\nexport class QueryUnit {\n@@ -145,25 +146,13 @@ export class QueryUnit {\nreturn '';\n}\n- public static async createSQLTextDocument(sql: string = \"\") {\n- return vscode.window.showTextDocument(\n- await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" })\n- );\n- }\n-\n-\nprivate static sqlDocument: vscode.TextEditor;\npublic static async showSQLTextDocument(sql: string = \"\") {\n- if (this.sqlDocument && !this.sqlDocument.document.isClosed && !this.sqlDocument['_disposed'] && this.sqlDocument.document.isUntitled) {\n- this.sqlDocument.edit((editBuilder) => {\n- editBuilder.replace(Cursor.getRangeStartTo(Util.getDocumentLastPosition(this.sqlDocument.document)), sql);\n- });\n- } else {\nthis.sqlDocument = await vscode.window.showTextDocument(\n- await vscode.workspace.openTextDocument({ content: sql, language: \"sql\" })\n+ await vscode.workspace.openTextDocument(await FileManager.record(\"template.sql\", sql, FileModel.WRITE))\n);\n- }\n+\nreturn this.sqlDocument;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/FileManager.ts",
"new_path": "src/extension/FileManager.ts",
"diff": "@@ -23,16 +23,24 @@ export class FileManager {\n}\n- public static record(fileName: string, content: string) {\n+ public static record(fileName: string, content: string, model?: FileModel) {\nif (!this.storagePath) { vscode.window.showErrorMessage(\"FileManager is not init!\") }\nif (!fileName || !content) { return; }\n- return new Promise(() => {\n+ return new Promise((resolve) => {\nconst recordPath = `${this.storagePath}/${fileName}`;\nif (!fs.existsSync(this.storagePath)) {\nfs.mkdirSync(this.storagePath);\n}\n+ if (model == FileModel.WRITE) {\n+ fs.writeFileSync(recordPath, `${content}`, { encoding: 'utf8' });\n+ } else {\nfs.appendFileSync(recordPath, `${content}`, { encoding: 'utf8' });\n-\n+ }\n+ resolve(recordPath)\n});\n}\n}\n+\n+export enum FileModel {\n+ WRITE, APPEND\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -50,7 +50,7 @@ export class UserGroup extends DatabaseNode {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE USER 'username'@'%' IDENTIFIED BY 'password';`);\n+ QueryUnit.showSQLTextDocument(`CREATE USER 'username'@'%' IDENTIFIED BY 'password';`);\n}\n}\n@@ -101,7 +101,7 @@ export class UserNode implements Node, ConnectionInfo, CopyAble {\npublic changePasswordTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`\n+ QueryUnit.showSQLTextDocument(`\nupdate\nmysql.user\nset\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/functionGroup.ts",
"new_path": "src/model/other/functionGroup.ts",
"diff": "@@ -52,7 +52,7 @@ export class FunctionGroup implements Node, ConnectionInfo {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE\n+ QueryUnit.showSQLTextDocument(`CREATE\n/*[DEFINER = { user | CURRENT_USER }]*/\nFUNCTION \\`name\\`() RETURNS [TYPE\nBEGIN\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/procedureGroup.ts",
"new_path": "src/model/other/procedureGroup.ts",
"diff": "@@ -51,7 +51,7 @@ export class ProcedureGroup implements Node, ConnectionInfo {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE\n+ QueryUnit.showSQLTextDocument(`CREATE\n/*[DEFINER = { user | CURRENT_USER }]*/\nPROCEDURE \\`name\\`()\nBEGIN\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/triggerGroup.ts",
"new_path": "src/model/other/triggerGroup.ts",
"diff": "@@ -53,7 +53,7 @@ export class TriggerGroup implements Node, ConnectionInfo {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE\n+ QueryUnit.showSQLTextDocument(`CREATE\n/*[DEFINER = { user | CURRENT_USER }]*/\nTRIGGER \\`name\\` BEFORE/AFTER INSERT/UPDATE/DELETE\nON \\`table\\`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/columnNode.ts",
"new_path": "src/model/table/columnNode.ts",
"diff": "@@ -79,7 +79,7 @@ export class ColumnNode implements Node, ConnectionInfo, CopyAble {\n}\npublic dropColumnTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`ALTER TABLE \\n\\t${wrap(this.database)}.${wrap(this.table)} DROP COLUMN ${wrap(this.column.name)};`);\n+ QueryUnit.showSQLTextDocument(`ALTER TABLE \\n\\t${wrap(this.database)}.${wrap(this.table)} DROP COLUMN ${wrap(this.column.name)};`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableGroup.ts",
"new_path": "src/model/table/tableGroup.ts",
"diff": "@@ -52,7 +52,7 @@ export class TableGroup implements Node, ConnectionInfo {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE TABLE tableName(\n+ QueryUnit.showSQLTextDocument(`CREATE TABLE tableName(\nid int NOT NULL primary key AUTO_INCREMENT,\ncolumn varchar(length)\n);`);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableNode.ts",
"new_path": "src/model/table/tableNode.ts",
"diff": "@@ -64,7 +64,7 @@ export class TableNode implements Node, ConnectionInfo, CopyAble {\npublic addColumnTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`ALTER TABLE\n+ QueryUnit.showSQLTextDocument(`ALTER TABLE\n${Util.wrap(this.database)}.${Util.wrap(this.table)}\nADD\nCOLUMN [column] [type] NOT NULL comment '';`);\n@@ -133,7 +133,7 @@ ADD\nConnectionManager.getConnection(this, true);\nQueryUnit.runQuery(sql, this);\n} else {\n- QueryUnit.createSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql);\n}\n}\n@@ -147,7 +147,7 @@ ADD\nsql += `(${childrenNames.toString().replace(/,/g, \", \")}\\n )\\n`;\nsql += \"values\\n \";\nsql += `(${childrenNames.toString().replace(/,/g, \", \")}\\n );`;\n- QueryUnit.createSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql);\n});\n}\n@@ -161,7 +161,7 @@ ADD\nlet sql = `delete from \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and\")}`;\n- QueryUnit.createSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql);\n});\n}\n@@ -177,7 +177,7 @@ ADD\nlet sql = `update \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\nset \\n ${sets.toString().replace(/,/g, \",\\n \")}\\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and \")}`;\n- QueryUnit.createSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/viewGroup.ts",
"new_path": "src/model/table/viewGroup.ts",
"diff": "@@ -53,7 +53,7 @@ export class ViewGroup implements Node, ConnectionInfo {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.createSQLTextDocument(`CREATE\n+ QueryUnit.showSQLTextDocument(`CREATE\n/* [DEFINER = { user | CURRENT_USER }]*/\nVIEW \\`name\\`\nAS\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/mysqlTreeDataProvider.ts",
"new_path": "src/provider/mysqlTreeDataProvider.ts",
"diff": "@@ -27,8 +27,8 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\nasync init() {\nawait (await this.getConnectionNodes()).forEach(async (connectionNode) => {\n(await connectionNode.getChildren(true)).forEach(async (databaseNode) => {\n- (await databaseNode.getChildren(true)).forEach(async (tableNode) => {\n- tableNode.getChildren(true)\n+ (await databaseNode.getChildren(true)).forEach(async (groupNode) => {\n+ groupNode.getChildren(true)\n})\n})\n})\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
show all template in same file
|
141,908 |
21.04.2020 23:49:38
| -28,800 |
6c1025e49292720ba465466c328f1f9c90bfbd6b
|
add grant user template
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"Drop User\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.grant.user\",\n+ \"title\": \"Grant Privileges\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.change.user\",\n\"title\": \"Change User Password\",\n{\n\"command\": \"mysql.change.user\",\n\"when\": \"view == github.cweijan.mysql && viewItem == user\",\n+ \"group\": \"1_mysql@-1\"\n+ },\n+ {\n+ \"command\": \"mysql.grant.user\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == user\",\n\"group\": \"1_mysql@0\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "</el-table-column>\n<!-- data -->\n<el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\" align=\"center\"\n- sortable v-if=\"result.columnList && toolbar.showColumns.includes(field.name)\"\n+ sortable v-if=\"result.columnList && toolbar.showColumns.includes(field.name.toLowerCase())\"\n:width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n<el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"filter\"\n}, initShowColumn(columnList) {\nthis.toolbar.showColumns = []\nfor (let i = 0; i < columnList.length; i++) {\n- this.toolbar.showColumns.push(columnList[i].name);\n+ this.toolbar.showColumns.push(columnList[i].name.toLowerCase());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -43,11 +43,13 @@ export class ConnectionManager {\nconst queryName = path.basename(fileName, path.extname(fileName))\nconst [host, port, user, database] = queryName.split('_')\n+ if (database != null) {\nreturn this.getConnection({\nmultipleStatements: true, host, port, user, database, certPath: null\n}, true)\n}\n}\n+ }\nreturn this.getConnection(Object.assign({ multipleStatements: true }, this.lastConnectionOption));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -188,6 +188,9 @@ export function activate(context: vscode.ExtensionContext) {\nvscode.commands.registerCommand(\"mysql.change.user\", (userNode: UserNode) => {\nuserNode.changePasswordTemplate();\n}),\n+ vscode.commands.registerCommand(\"mysql.grant.user\", (userNode: UserNode) => {\n+ userNode.grandTemplate();\n+ }),\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -57,6 +57,7 @@ export class UserGroup extends DatabaseNode {\nexport class UserNode implements Node, ConnectionInfo, CopyAble {\n+\npublic type: string;\npublic identify: string;\nconstructor(readonly host: string, readonly user: string, readonly password: string,\n@@ -99,6 +100,12 @@ export class UserNode implements Node, ConnectionInfo, CopyAble {\n})\n}\n+ public grandTemplate() {\n+ QueryUnit.showSQLTextDocument(`\n+GRANT ALL PRIVILEGES ON *.* to '${this.name}'@'%'\n+`.replace(/^\\s/, \"\"));\n+ }\n+\npublic changePasswordTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`\n"
},
{
"change_type": "MODIFY",
"old_path": "syntaxes/mysql.tmLanguage.json",
"new_path": "syntaxes/mysql.tmLanguage.json",
"diff": "\"scopeName\": \"source.sql\",\n\"patterns\": [\n{\n- \"match\": \"(?i)\\\\b(DEFAULT|long|double|AUTO_INCREMENT|TRIGGER|DEFINER|FOR|EACH|CURSOR|VIEW|IDENTIFIED|PRIVILEGES|FLUSH|SHOW|INDEX|CHANGE|COMMENT|COLUMN|ADD|UNIQUE|EXPLAIN)\\\\b\",\n+ \"match\": \"(?i)\\\\b(DEFAULT|long|double|AUTO_INCREMENT|TRIGGER|DEFINER|FOR|EACH|CURSOR|VIEW|IDENTIFIED|PRIVILEGES|FLUSH|SHOW|INDEX|CHANGE|COMMENT|COLUMN|ADD|UNIQUE|EXPLAIN|USER|ALL)\\\\b\",\n\"name\": \"keyword.mysql\"\n},\n{\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add grant user template
|
141,908 |
22.04.2020 00:09:30
| -28,800 |
e05a2fb38ec947071242d16741fb1e77caba50e7
|
keep save between multi connection
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -27,11 +27,10 @@ export class DatabaseNode implements Node, ConnectionInfo, CopyAble {\nconstructor(readonly host: string, readonly user: string,\nreadonly password: string, readonly port: string, readonly database: string,\nreadonly certPath: string) {\n+ this.id = `${this.host}_${this.port}_${this.user}_${this.database}`;\n}\npublic getTreeItem(): vscode.TreeItem {\n-\n- this.id = `${this.host}_${this.port}_${this.user}_${this.database}`;\nreturn {\nlabel: this.database,\nid: this.id,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -52,6 +52,7 @@ export class ColumnChain implements ComplectionChain {\nconst lcp = ConnectionManager.getLastConnectionOption()\n+ if (!lcp) { return []; }\nconst id = `${lcp.host}_${lcp.port}_${lcp.user}_${lcp.database}_${tableName}`;\nfor (const tableNode of DatabaseCache.getTableNodeList()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/databaseChain.ts",
"new_path": "src/provider/Complection/chain/databaseChain.ts",
"diff": "import * as vscode from \"vscode\";\nimport { DatabaseCache } from \"../../../database/DatabaseCache\";\nimport { ComplectionChain, ComplectionContext } from \"../complectionContext\";\n+import { ConnectionManager } from \"../../../database/ConnectionManager\";\nfunction wrap(origin: string): string {\nif (origin != null && origin.match(/\\b(-|\\.)\\b/ig)) {\n@@ -24,7 +25,12 @@ export class DatabaseChain implements ComplectionChain {\nprivate generateDatabaseComplectionItem(): vscode.CompletionItem[] {\n- const databaseNodes = DatabaseCache.getDatabaseNodeList();\n+ const lcp = ConnectionManager.getLastConnectionOption()\n+ if (!lcp) { return []; }\n+ const connectcionid = `${lcp.host}_${lcp.port}_${lcp.user}`;\n+\n+ const databaseNodes = DatabaseCache.getDatabaseListOfConnection(connectcionid);\n+\nreturn databaseNodes.map<vscode.CompletionItem>((databaseNode) => {\nconst label = databaseNode.getTreeItem().label;\nconst completionItem = new vscode.CompletionItem(label);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableChain.ts",
"new_path": "src/provider/Complection/chain/tableChain.ts",
"diff": "@@ -35,17 +35,20 @@ export class TableChain implements ComplectionChain {\nlet tableNodes: Node[] = [];\nconst tableNames: string[] = [];\nconst lcp = ConnectionManager.getLastConnectionOption();\n+ if (!lcp) { return []; }\nif (!inputWord && lcp && lcp.database) {\ninputWord = lcp.database\n}\nif (inputWord) {\n- DatabaseCache.getDatabaseNodeList().forEach((databaseNode) => {\n+ const connectcionid = `${lcp.host}_${lcp.port}_${lcp.user}`;\n+ DatabaseCache.getDatabaseListOfConnection(connectcionid).forEach((databaseNode) => {\nif (databaseNode.database === inputWord) {\ntableNodes = DatabaseCache.getTableListOfDatabase(databaseNode.id);\n}\n});\n} else {\n- tableNodes = DatabaseCache.getTableNodeList().filter((tableNode) => {\n+ const databaseid = `${lcp.host}_${lcp.port}_${lcp.user}_${lcp.database}`;\n+ tableNodes = DatabaseCache.getTableListOfDatabase(databaseid).filter((tableNode: TableNode) => {\nconst included = tableNames.includes(tableNode.table);\ntableNames.push(tableNode.table);\nreturn !included && !tableNode.database.match(/\\b(mysql|performance_schema|information_schema|sys)\\b/ig);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
keep save between multi connection
|
141,908 |
22.04.2020 08:57:29
| -28,800 |
480665e31e76493dc47d1eac92190659055d56ff
|
show message type when execute batch sql
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "vue.info.error = true\nbreak;\ncase \"MESSAGE\":\n- vue.$message(response.msg)\n+ if(response.success){\n+ vue.$message.success(response.message)\n+ }else{\n+ vue.$message.error(response.message)\n+ }\nbreak;\ndefault:\nvue.$message(JSON.stringify(event.data));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -9,9 +9,10 @@ import { Console } from \"../common/OutputChannel\";\nimport { Util } from \"../common/util\";\nimport { ConnectionInfo } from \"../model/interface/connection\";\nimport { QueryPage } from \"../view/result/query\";\n-import { DataResponse, DMLResponse, ErrorResponse, RunResponse } from \"../view/result/queryResponse\";\n+import { DataResponse, DMLResponse, ErrorResponse, RunResponse, MessageResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\nimport { FileManager, FileModel } from \"../extension/FileManager\";\n+import { resolve } from \"url\";\nexport class QueryUnit {\n@@ -74,8 +75,8 @@ export class QueryUnit {\nconst sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '')\nif (sqlList.length > 1) {\n- this.runBatch(connection, sqlList)\n- QueryPage.send({ type: MessageType.MESSAGE, res: { msg: \"Batch execute sql success!\" } });\n+ const success = await this.runBatch(connection, sqlList)\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Batch execute sql ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\nreturn;\n}\nconnection.query(sql, (err: mysql.MysqlError, data, fields?: mysql.FieldInfo[]) => {\n@@ -105,6 +106,7 @@ export class QueryUnit {\n});\n}\nprivate static runBatch(connection: mysql.Connection, sqlList: string[]) {\n+ return new Promise((resolve) => {\nconnection.beginTransaction(async () => {\ntry {\nfor (let sql of sqlList) {\n@@ -113,10 +115,13 @@ export class QueryUnit {\nawait this.queryPromise(connection, sql)\n}\nconnection.commit()\n+ resolve(true)\n} catch (err) {\nconnection.rollback()\n+ resolve(false)\n}\n})\n+ })\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/queryResponse.ts",
"new_path": "src/view/result/queryResponse.ts",
"diff": "@@ -4,6 +4,11 @@ export class RunResponse {\npublic sql: string;\n}\n+export class MessageResponse {\n+ public message: string;\n+ public success: boolean;\n+}\n+\nexport class DataResponse {\npublic sql: string;\npublic costTime: number;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
show message type when execute batch sql
|
141,908 |
22.04.2020 09:09:45
| -28,800 |
1a443ec3410ea700a1a170456562e2f1f480de63
|
detech connection correctly
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -43,7 +43,7 @@ export class ConnectionManager {\nconst queryName = path.basename(fileName, path.extname(fileName))\nconst [host, port, user, database] = queryName.split('_')\n- if (database != null) {\n+ if (host != null && port != null && user != null) {\nreturn this.getConnection({\nmultipleStatements: true, host, port, user, database, certPath: null\n}, true)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
detech connection correctly
|
141,908 |
22.04.2020 09:37:31
| -28,800 |
2fd2c37e435ebfa10c0fd6095bc7ac2e3cc4efbd
|
enhance resources include
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/result.html",
"diff": "<head>\n<title>result</title>\n- <link rel=\"stylesheet\" href=\"${webviewPath}/css/element.css\">\n- <script src=\"${webviewPath}/js/vue.js\"></script>\n- <script src=\"${webviewPath}/js/element.js\"></script>\n+ <link rel=\"stylesheet\" href=\"css/element.css\">\n+ <script src=\"js/vue.js\"></script>\n+ <script src=\"js/element.js\"></script>\n<style>\nbody {\nbackground-color: #F7F7F7;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/SqlViewManager.ts",
"new_path": "src/common/SqlViewManager.ts",
"diff": "@@ -64,9 +64,9 @@ export class SqlViewManager {\n{ viewColumn: columnType, preserveFocus: true },\n{ enableScripts: true, retainContextWhenHidden: true },\n);\n- webviewPanel.webview.html = data.replace(/\\$\\{webviewPath\\}/gi,\n- vscode.Uri.file(`${this.extensionPath}/resources/webview`)\n- .with({ scheme: 'vscode-resource' }).toString());\n+ webviewPanel.webview.html = data.replace(/(\"|')\\/?(css|js)\\b/gi,\n+ \"$1\" + vscode.Uri.file(`${this.extensionPath}/resources/webview`)\n+ .with({ scheme: 'vscode-resource' }).toString() + \"/$2\");\nwebviewPanel.webview.onDidReceiveMessage(viewOption.receiveListener);\nwebviewPanel.onDidDispose(viewOption.disposeListener);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
enhance resources include
|
141,908 |
22.04.2020 09:59:20
| -28,800 |
29c2f0d62596d5d9a3c0c07e96210876884f3348
|
adjust view path
|
[
{
"change_type": "DELETE",
"old_path": "resources/webview/css/table.css",
"new_path": null,
"diff": "-.test{\n- color: red;\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "resources/webview/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n- <link rel=\"stylesheet\" type=\"text/css\" href=\"${webviewPath}/css/style.css\">\n- <script src=\"${webviewPath}/js/vue.js\"></script>\n+ <link rel=\"stylesheet\" type=\"text/css\" href=\"css/style.css\">\n+ <script src=\"js/vue.js\"></script>\n<title>Connect to SQL server</title>\n</head>\n"
},
{
"change_type": "RENAME",
"old_path": "resources/webview/result.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "</span>\n<el-input v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\n-\n</el-form-item>\n</el-form>\n<span slot=\"footer\" class=\"dialog-footer\">\n"
},
{
"change_type": "DELETE",
"old_path": "resources/webview/test.html",
"new_path": null,
"diff": "-<html>\n-\n-<head>\n- <title>result</title>\n- <link rel=\"stylesheet\" href=\"css/element.css\">\n- <script src=\"js/vue.js\"></script>\n- <script src=\"js/element.js\"></script>\n-</head>\n-\n-<body>\n- <div id=\"app\">\n- <i class=\"el-icon-edit\"></i>\n- <el-table :data=\"tableData\" style=\"width: 100%\" height=\"250\" @cell-click=\"celledit\">\n- <el-table-column fixed prop=\"date\" label=\"Date\" width=\"150\"> </el-table-column>\n- <el-table-column prop=\"name\" label=\"Name\" width=\"120\"> </el-table-column>\n- <el-table-column prop=\"state\" label=\"State\" width=\"120\"> </el-table-column>\n- <el-table-column prop=\"city\" label=\"City\" width=\"120\"> </el-table-column>\n- <el-table-column prop=\"address\" label=\"Address\" width=\"300\"> </el-table-column>\n- <el-table-column prop=\"zip\" label=\"Zip\" width=\"120\"> </el-table-column>\n- </el-table>\n- </div>\n-</body>\n-<script>\n- const vue = new Vue({\n- el: '#app',\n- methods: {\n- celledit(row, column, cell, event) {\n- cell.contentEditable = true;\n- }\n- },\n- data: {\n- tableData: [{\n- date: '2016-05-03', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-02', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-04', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-01', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-08', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-06', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }, {\n- date: '2016-05-07', name: 'Tom', state: 'California', city: 'Los Angeles', address: 'No. 189, Grove St, Los Angeles', zip: 'CA 90036'\n- }]\n- }\n- })\n-</script>\n-\n-</html>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/SqlViewManager.ts",
"new_path": "src/common/SqlViewManager.ts",
"diff": "@@ -27,7 +27,7 @@ export class SqlViewManager {\npublic static showConnectPage() {\nthis.createWebviewPanel({\n- viewPath: \"connect\",\n+ viewPath: \"pages/connect/connect\",\nviewTitle: \"connect\",\nsplitResultView: false,\n}).then((webviewPanel) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -56,7 +56,7 @@ export class QueryPage {\n// init result webview\nthis.creating = true;\nSqlViewManager.createWebviewPanel({\n- splitResultView: true, viewPath: \"result\", viewTitle: \"Query\",\n+ splitResultView: true, viewPath: \"pages/result/index\", viewTitle: \"Query\",\n}).then(async (webviewPanel) => {\nthis.resultWebviewPanel = webviewPanel;\nthis.creating = false;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
adjust view path
|
141,908 |
22.04.2020 18:54:16
| -28,800 |
2d5f51cd05a8e9a3eadb4adafb65f18d08123600
|
fix connection change fail
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"Drop table\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.table.mock\",\n+ \"title\": \"Mock Data\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.changeTableName\",\n\"title\": \"Change Name\",\n},\n{\n\"command\": \"mysql.table.source\",\n- \"title\": \"Show table source\",\n+ \"title\": \"Show Table Source\",\n\"category\": \"MySQL\"\n},\n{\n\"group\": \"1_inline@-1\"\n},\n{\n- \"command\": \"mysql.changeTableName\",\n+ \"command\": \"mysql.table.source\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_inline@0\"\n},\n{\n- \"command\": \"mysql.index.template\",\n+ \"command\": \"mysql.table.mock\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_inline@1\"\n},\n{\n- \"command\": \"mysql.column.add\",\n+ \"command\": \"mysql.changeTableName\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n- \"group\": \"1_inline@2\"\n+ \"group\": \"inline\"\n},\n{\n- \"command\": \"mysql.table.source\",\n+ \"command\": \"mysql.index.template\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_inline@3\"\n},\n+ {\n+ \"command\": \"mysql.column.add\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"group\": \"1_inline@4\"\n+ },\n{\n\"command\": \"mysql.copy.insert\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -46,7 +46,7 @@ export class ConnectionManager {\nif (host != null && port != null && user != null) {\nreturn this.getConnection({\nmultipleStatements: true, host, port, user, database, certPath: null\n- }, true)\n+ }, database != null)\n}\n}\n}\n@@ -58,8 +58,10 @@ export class ConnectionManager {\npublic static getConnection(connectionOptions: ConnectionInfo, changeActive: boolean = false): Promise<mysql.Connection> {\nconnectionOptions.multipleStatements = true;\n+ if (changeActive) {\nthis.lastConnectionOption = connectionOptions;\n- if (changeActive) { Global.updateStatusBarItems(connectionOptions); }\n+ Global.updateStatusBarItems(connectionOptions);\n+ }\nconst key = `${connectionOptions.host}_${connectionOptions.port}_${connectionOptions.user}`;\nreturn new Promise((resolve, reject) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -50,150 +50,163 @@ export function activate(context: vscode.ExtensionContext) {\nvscode.languages.registerDocumentRangeFormattingEditProvider('sql', new SqlFormatProvider()),\nvscode.languages.registerHoverProvider('sql', new TableHoverProvider()),\nvscode.languages.registerCompletionItemProvider('sql', new CompletionProvider(), ' ', '.', \">\", \"<\", \"=\", \"(\"),\n- vscode.commands.registerCommand(CommandKey.Refresh, () => {\n- mysqlTreeDataProvider.init();\n- }),\n- vscode.commands.registerCommand(\"mysql.history.open\", () => {\n- HistoryManager.showHistory();\n- }),\n- vscode.commands.registerCommand(CommandKey.RecordHistory, (sql: string, costTime: number) => {\n+ ...initCommand({\n+ \"mysql.history.open\": () => HistoryManager.showHistory(),\n+ [CommandKey.Refresh]: () => { mysqlTreeDataProvider.init(); },\n+ [CommandKey.RecordHistory]: (sql: string, costTime: number) => {\nHistoryManager.recordHistory(sql, costTime);\n- }),\n- vscode.commands.registerCommand(\"mysql.addDatabase\", (connectionNode: ConnectionNode) => {\n+ },\n+ \"mysql.addDatabase\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n- }),\n- vscode.commands.registerCommand(\"mysql.deleteDatabase\", (databaseNode: DatabaseNode) => {\n+ },\n+ \"mysql.deleteDatabase\": (databaseNode: DatabaseNode) => {\ndatabaseNode.dropDatatabase();\n- }),\n- vscode.commands.registerCommand(\"mysql.addConnection\", () => {\n+ },\n+ \"mysql.addConnection\": () => {\nSqlViewManager.showConnectPage();\n- }),\n- vscode.commands.registerCommand(\"mysql.changeTableName\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.changeTableName\": (tableNode: TableNode) => {\ntableNode.changeTableName();\n- }),\n- vscode.commands.registerCommand(\"mysql.index.template\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.index.template\": (tableNode: TableNode) => {\ntableNode.indexTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.db.active\", () => {\n+ },\n+ \"mysql.db.active\": () => {\nmysqlTreeDataProvider.activeDb();\n- }),\n- vscode.commands.registerCommand(\"mysql.table.truncate\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.table.truncate\": (tableNode: TableNode) => {\ntableNode.truncateTable();\n- }),\n- vscode.commands.registerCommand(\"mysql.table.drop\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.table.drop\": (tableNode: TableNode) => {\n+ tableNode.mockData();\n+ },\n+ \"mysql.table.mock\": (tableNode: TableNode) => {\ntableNode.dropTable();\n- }),\n- vscode.commands.registerCommand(\"mysql.table.source\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.table.source\": (tableNode: TableNode) => {\nif (tableNode) { tableNode.showSource(); }\n- }),\n- vscode.commands.registerCommand(\"mysql.changeColumnName\", (columnNode: ColumnNode) => {\n+ },\n+ \"mysql.changeColumnName\": (columnNode: ColumnNode) => {\ncolumnNode.changeColumnName();\n- }),\n- vscode.commands.registerCommand(\"mysql.column.add\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.column.add\": (tableNode: TableNode) => {\ntableNode.addColumnTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.column.update\", (columnNode: ColumnNode) => {\n+ },\n+ \"mysql.column.update\": (columnNode: ColumnNode) => {\ncolumnNode.updateColumnTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.column.drop\", (columnNode: ColumnNode) => {\n+ },\n+ \"mysql.column.drop\": (columnNode: ColumnNode) => {\ncolumnNode.dropColumnTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.deleteConnection\", (connectionNode: ConnectionNode) => {\n+ },\n+ \"mysql.deleteConnection\": (connectionNode: ConnectionNode) => {\nconnectionNode.deleteConnection(context);\n- }),\n- vscode.commands.registerCommand(\"mysql.runQuery\", (sql) => {\n+ },\n+ \"mysql.runQuery\": (sql) => {\nif (typeof sql != 'string') { sql = null; }\nQueryUnit.runQuery(sql);\n- }),\n- vscode.commands.registerCommand(\"mysql.newQuery\", (databaseOrConnectionNode: DatabaseNode | ConnectionNode) => {\n+ },\n+ \"mysql.newQuery\": (databaseOrConnectionNode: DatabaseNode | ConnectionNode) => {\nif (databaseOrConnectionNode) {\ndatabaseOrConnectionNode.newQuery();\n} else {\nConnectionNode.tryOpenQuery();\n}\n- }),\n- vscode.commands.registerCommand(\"mysql.template.sql\", (tableNode: TableNode, run: boolean) => {\n+ },\n+ \"mysql.template.sql\": (tableNode: TableNode, run: boolean) => {\ntableNode.selectSqlTemplate(run);\n- }),\n- vscode.commands.registerCommand(\"mysql.name.copy\", (copyAble: CopyAble) => {\n+ },\n+ \"mysql.name.copy\": (copyAble: CopyAble) => {\ncopyAble.copyName();\n- }),\n- vscode.commands.registerCommand(\"mysql.data.import\", (iNode: DatabaseNode | ConnectionNode) => {\n+ },\n+ \"mysql.data.import\": (iNode: DatabaseNode | ConnectionNode) => {\nvscode.window.showOpenDialog({ filters: { Sql: ['sql'] }, canSelectMany: false, openLabel: \"Select sql file to import\", canSelectFiles: true, canSelectFolders: false }).then((filePath) => {\niNode.importData(filePath[0].fsPath);\n});\n- }),\n- vscode.commands.registerCommand(\"mysql.data.export\", (iNode: TableNode | DatabaseNode) => {\n+ },\n+ \"mysql.data.export\": (iNode: TableNode | DatabaseNode) => {\nvscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\niNode.backupData(folderPath[0].fsPath);\n});\n- }),\n- vscode.commands.registerCommand(\"mysql.template.delete\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.template.delete\": (tableNode: TableNode) => {\ntableNode.deleteSqlTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.copy.insert\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.copy.insert\": (tableNode: TableNode) => {\ntableNode.insertSqlTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.copy.update\", (tableNode: TableNode) => {\n+ },\n+ \"mysql.copy.update\": (tableNode: TableNode) => {\ntableNode.updateSqlTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.show.procedure\", (procedureNode: ProcedureNode) => {\n+ },\n+ \"mysql.show.procedure\": (procedureNode: ProcedureNode) => {\nprocedureNode.showSource();\n- }),\n- vscode.commands.registerCommand(\"mysql.show.function\", (functionNode: FunctionNode) => {\n+ },\n+ \"mysql.show.function\": (functionNode: FunctionNode) => {\nfunctionNode.showSource();\n- }),\n- vscode.commands.registerCommand(\"mysql.show.trigger\", (triggerNode: TriggerNode) => {\n+ },\n+ \"mysql.show.trigger\": (triggerNode: TriggerNode) => {\ntriggerNode.showSource();\n- }),\n- vscode.commands.registerCommand(\"mysql.user.sql\", (userNode: UserNode) => {\n+ },\n+ \"mysql.user.sql\": (userNode: UserNode) => {\nuserNode.selectSqlTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.table\", (tableGroup: TableGroup) => {\n+ },\n+ \"mysql.template.table\": (tableGroup: TableGroup) => {\ntableGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.procedure\", (procedureGroup: ProcedureGroup) => {\n+ },\n+ \"mysql.template.procedure\": (procedureGroup: ProcedureGroup) => {\nprocedureGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.setting.open\", (procedureGroup: ProcedureGroup) => {\n+ },\n+ \"mysql.setting.open\": (procedureGroup: ProcedureGroup) => {\nMysqlSetting.open();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.view\", (viewGroup: ViewGroup) => {\n+ },\n+ \"mysql.template.view\": (viewGroup: ViewGroup) => {\nviewGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.trigger\", (triggerGroup: TriggerGroup) => {\n+ },\n+ \"mysql.template.trigger\": (triggerGroup: TriggerGroup) => {\ntriggerGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.function\", (functionGroup: FunctionGroup) => {\n+ },\n+ \"mysql.template.function\": (functionGroup: FunctionGroup) => {\nfunctionGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.template.user\", (userGroup: UserGroup) => {\n+ },\n+ \"mysql.template.user\": (userGroup: UserGroup) => {\nuserGroup.createTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.delete.user\", (userNode: UserNode) => {\n+ },\n+ \"mysql.delete.user\": (userNode: UserNode) => {\nuserNode.drop();\n- }),\n- vscode.commands.registerCommand(\"mysql.delete.view\", (viewNode: ViewNode) => {\n+ },\n+ \"mysql.delete.view\": (viewNode: ViewNode) => {\nviewNode.drop();\n- }),\n- vscode.commands.registerCommand(\"mysql.delete.procedure\", (procedureNode: ProcedureNode) => {\n+ },\n+ \"mysql.delete.procedure\": (procedureNode: ProcedureNode) => {\nprocedureNode.drop();\n- }),\n- vscode.commands.registerCommand(\"mysql.delete.function\", (functionNode: FunctionNode) => {\n+ },\n+ \"mysql.delete.function\": (functionNode: FunctionNode) => {\nfunctionNode.drop();\n- }),\n- vscode.commands.registerCommand(\"mysql.delete.trigger\", (triggerNode: TriggerNode) => {\n+ },\n+ \"mysql.delete.trigger\": (triggerNode: TriggerNode) => {\ntriggerNode.drop();\n- }),\n- vscode.commands.registerCommand(\"mysql.change.user\", (userNode: UserNode) => {\n+ },\n+ \"mysql.change.user\": (userNode: UserNode) => {\nuserNode.changePasswordTemplate();\n- }),\n- vscode.commands.registerCommand(\"mysql.grant.user\", (userNode: UserNode) => {\n+ },\n+ \"mysql.grant.user\": (userNode: UserNode) => {\nuserNode.grandTemplate();\n+ },\n}),\n+\n);\n}\nexport function deactivate() {\n}\n+\n+function initCommand(commandDefinition: Object): vscode.Disposable[] {\n+\n+ const dispose = []\n+\n+ for (const command in commandDefinition) {\n+ dispose.push(vscode.commands.registerCommand(command, commandDefinition[command]))\n+ }\n+\n+ return dispose;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockModel.ts",
"new_path": "src/extension/mock/mockModel.ts",
"diff": "-export class MockModel {\n- satrt: number = 0;\n- count: number;\n- data: { [key: string]: any }\n+export interface MockModel {\n+ host: string;\n+ port: number;\n+ user: string;\n+ database: string;\n+ table: string;\n+ mockStartIndex: number;\n+ mockCount: number;\n+ mock: { [key: string]: any }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableChain.ts",
"new_path": "src/provider/Complection/chain/tableChain.ts",
"diff": "@@ -48,7 +48,9 @@ export class TableChain implements ComplectionChain {\n});\n} else {\nconst databaseid = `${lcp.host}_${lcp.port}_${lcp.user}_${lcp.database}`;\n- tableNodes = DatabaseCache.getTableListOfDatabase(databaseid).filter((tableNode: TableNode) => {\n+ const tableList = DatabaseCache.getTableListOfDatabase(databaseid);\n+ if (tableList == null) return [];\n+ tableNodes = tableList.filter((tableNode: TableNode) => {\nconst included = tableNames.includes(tableNode.table);\ntableNames.push(tableNode.table);\nreturn !included && !tableNode.database.match(/\\b(mysql|performance_schema|information_schema|sys)\\b/ig);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix connection change fail
|
141,908 |
22.04.2020 23:31:04
| -28,800 |
e7520e0de2cffab2a3fb5144fcecf44a5d65b1fd
|
adapter type
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockModel.ts",
"new_path": "src/extension/mock/mockModel.ts",
"diff": "@@ -6,5 +6,10 @@ export interface MockModel {\ntable: string;\nmockStartIndex: number;\nmockCount: number;\n- mock: { [key: string]: any }\n+ mock: {\n+ [key: string]: {\n+ type: string,\n+ value: any,\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -15,15 +15,19 @@ import { MessageType } from \"../../common/Constants\";\nexport class MockRunner {\n+ private readonly MOCK_INDEX = \"$mockIndex\";\n+\npublic async create(tableNode: TableNode) {\nconst mockModel: MockModel = {\nhost: tableNode.host, port: tableNode.port, user: tableNode.user, database: tableNode.database, table: tableNode.table,\nmockStartIndex: 0, mockCount: 50, mock: {}\n}\nconst columnList = (await tableNode.getChildren()) as ColumnNode[]\n- for (const column of columnList) {\n-\n- mockModel.mock[column.column.name] = this.getValueByType(column.column.simpleType)\n+ for (const columnNode of columnList) {\n+ mockModel.mock[columnNode.column.name] = {\n+ type: columnNode.column.simpleType,\n+ value: this.getValueByType(columnNode.column)\n+ }\n}\nawait vscode.window.showTextDocument(\n@@ -52,16 +56,16 @@ export class MockRunner {\nreturn;\n}\n- const insertSqlTemplate = await tableNode.insertSqlTemplate(false)\n+ const insertSqlTemplate = (await tableNode.insertSqlTemplate(false)).replace(\"\\n\", \" \");\nconst sqlList = [];\nconst mockData = mockModel.mock;\nconst { mockStartIndex, mockCount } = mockModel\nfor (let i = mockStartIndex; i < (mockStartIndex + mockCount); i++) {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\n- if (mockData.hasOwnProperty(column)) {\n- tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column, 'i'), `'${Mock.mock(mockData[column])}'`);\n- }\n+ let value = mockData[column].value;\n+ if (value == this.MOCK_INDEX) { value = i; }\n+ tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column, 'i'), this.wrapQuote(mockData[column].type, Mock.mock(value)));\n}\nsqlList.push(tempInsertSql)\n}\n@@ -71,27 +75,50 @@ export class MockRunner {\nQueryPage.send({ type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n}\n-\n- private getValueByType(type: string): string {\n+ private wrapQuote(type: string, value: any): any {\ntype = type.toLowerCase()\n+ switch (type) {\n+ case \"varchar\": case \"char\": case \"date\": case \"time\": case \"timestamp\": case \"datetime\":\n+ return `'${value}'`\n+ }\n+ return value;\n+ }\n+\n+\n+\n+ // refrence : http://mockjs.com/examples.html\n+ private getValueByType(column: any): string {\n+ const type = column.simpleType.toLowerCase()\n+ const match = column.type.match(/.+?\\((\\d+)\\)/);\n+ let length = 1024\n+ if (match) {\n+ length = 1 << (match[1] - 1)\n+ }\n+ if (column.key == \"PRI\") {\n+ return this.MOCK_INDEX;\n+ }\n// console.log(type)\nswitch (type) {\ncase \"bit\":\n- return \"@integer(0,1)\";\n+ return \"@integer(0,\" + length + \")\";\ncase \"char\":\nreturn \"@character('lower')\";\ncase \"varchar\":\nreturn \"@cword(5)\"\n+ case \"tinyint\":\n+ return \"@integer(0,\" + length + \")\";\n+ case \"smallint\":\n+ return \"@integer(0,\" + length + \")\";\n+ case \"double\": case \"float\":\n+ return \"@float(0,100,2,2)\"\ncase \"date\":\nreturn \"@date()\"\n- case \"double\": case \"float\":\n- return \"@float(30,80)\"\ncase \"time\":\nreturn \"@time()\"\ncase \"timestamp\": case \"datetime\":\nreturn \"@datetime()\"\n}\n- return \"@integer(1,1000)\";\n+ return \"@integer(1,\" + length + \")\";\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tslint.json",
"new_path": "tslint.json",
"diff": "\"member-ordering\": false,\n\"no-trailing-whitespace\": false,\n\"quotemark\": false,\n+ \"no-bitwise\": false,\n\"no-consecutive-blank-lines\": false,\n\"no-console\": false,\n+ \"forin\": false,\n\"eofline\": false,\n\"ordered-imports\": false,\n\"radix\": false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
adapter type
|
141,908 |
22.04.2020 23:42:32
| -28,800 |
78f2dbea69df068277afe1e5e2fe1d37005d07ae
|
add edit request when dbclick row
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/editDialog.html",
"new_path": "resources/webview/pages/result/components/editDialog.html",
"diff": "-<el-dialog :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n+<el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n<el-form ref=\"infoForm\" :model=\"update.currentNew\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add edit request when dbclick row
|
141,908 |
22.04.2020 23:49:49
| -28,800 |
4de786314e6b894691865e76b978140a2685a8f9
|
update varchar rule
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -104,7 +104,8 @@ export class MockRunner {\ncase \"char\":\nreturn \"@character('lower')\";\ncase \"varchar\":\n- return \"@cword(5)\"\n+ return \"@string('lower',5)\"\n+ // return \"@cword(5)\"\ncase \"tinyint\":\nreturn \"@integer(0,\" + length + \")\";\ncase \"smallint\":\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update varchar rule
|
141,908 |
23.04.2020 00:30:43
| -28,800 |
2e91bd57503f8a32c02826f24ac3fd8542503d1d
|
add text mock
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -103,6 +103,8 @@ export class MockRunner {\nreturn \"@integer(0,\" + length + \")\";\ncase \"char\":\nreturn \"@character('lower')\";\n+ case \"text\":\n+ return \"@sentence()\"\ncase \"varchar\":\nreturn \"@string('lower',5)\"\n// return \"@cword(5)\"\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add text mock
|
141,908 |
23.04.2020 12:57:19
| -28,800 |
8a0d985545147c4ec4e2b8e6974599dacbaa7fc6
|
fix column complection not show
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -12,7 +12,9 @@ export class ColumnChain implements ComplectionChain {\nprivate needStop = true;\npublic async getComplection(complectionContext: ComplectionContext): Promise<vscode.CompletionItem[]> {\n- if (complectionContext.preChart === \".\") {\n+ const afterDot = complectionContext.preChart === \".\";\n+ const inWhere = complectionContext.currentSqlFull.match(/\\bwhere\\b/ig);\n+ if (afterDot || inWhere) {\nlet subComplectionItems = await this.generateColumnComplectionItem(complectionContext.preWord);\nconst tableReg = new RegExp(this.tablePatternStr + \"(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\nlet result = tableReg.exec(complectionContext.currentSqlFull);\n@@ -20,10 +22,10 @@ export class ColumnChain implements ComplectionChain {\nsubComplectionItems = await this.generateColumnComplectionItem(\nUtil.getTableName(result[0], Pattern.TABLE_PATTERN)\n);\n+ this.needStop = afterDot || inWhere == null;\nif (subComplectionItems.length > 0) {\nbreak;\n}\n- this.needStop = true;\nresult = tableReg.exec(complectionContext.currentSqlFull);\n}\nreturn subComplectionItems;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix column complection not show
|
141,908 |
23.04.2020 12:58:16
| -28,800 |
66de181fefa0f74cb2eeacc78d087b231a0b9af7
|
comment wrap quote
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/table/columnNode.ts",
"new_path": "src/model/table/columnNode.ts",
"diff": "@@ -75,7 +75,7 @@ export class ColumnNode implements Node, ConnectionInfo, CopyAble {\npublic updateColumnTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`ALTER TABLE\n- ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${this.column.nullable ? \"\" : \" NOT NULL\"}${this.column.comment ? \" comment \" + this.column.comment : \"\"};`);\n+ ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${this.column.nullable ? \"\" : \" NOT NULL\"}${this.column.comment ? ` comment '${this.column.comment}'` : \"\"};`);\n}\npublic dropColumnTemplate() {\nConnectionManager.getConnection(this, true);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
comment wrap quote
|
141,908 |
23.04.2020 13:10:44
| -28,800 |
2a4936534ad39e99396939e6a96e93cf08e4c785
|
connect support specify database
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "<input class=\"field__input\" type=\"password\" v-model=\"connectionOption.password\" />\n</div>\n</div>\n+ <div>\n+ <div class=\"field field__input\">\n+ <b>database:</b>\n+ <input class=\"field__input\" placeholder=\"database, can be null\" v-model=\"connectionOption.database\" />\n+ </div>\n+ </div>\n<!-- </template> -->\n<div id=\"fields\" data-type=\"none\"></div>\nhost: 'localhost',\nport: '3306',\nuser: 'root',\n- password: ''\n+ password: '',\n+ database: null\n},\ndatabaseType: 'mysql',\nerror: false,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/connectionNode.ts",
"new_path": "src/model/connectionNode.ts",
"diff": "@@ -18,11 +18,11 @@ import { Util } from \"../common/util\";\nexport class ConnectionNode implements Node, ConnectionInfo {\npublic id: string;\n- public database?: string;\npublic multipleStatements?: boolean;\npublic type: string = ModelType.CONNECTION;\nconstructor(readonly host: string, readonly user: string,\nreadonly password: string, readonly port: string,\n+ public readonly database: string,\nreadonly certPath: string) {\nthis.id = `${this.host}_${this.port}_${this.user}`;\n}\n@@ -45,7 +45,7 @@ export class ConnectionNode implements Node, ConnectionInfo {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), \"show databases\")\n.then((databases) => {\n- databaseNodes = databases.map<DatabaseNode>((database) => {\n+ databaseNodes = databases.filter(db => this.database == null || db.Database == this.database).map<DatabaseNode>((database) => {\nreturn new DatabaseNode(this.host, this.user, this.password, this.port, database.Database, this.certPath);\n});\ndatabaseNodes.unshift(new UserGroup(this.host, this.user, this.password, this.port, 'mysql', this.certPath));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/mysqlTreeDataProvider.ts",
"new_path": "src/provider/mysqlTreeDataProvider.ts",
"diff": "@@ -74,7 +74,7 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\nconst connections = this.context.globalState.get<{ [key: string]: ConnectionInfo }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\n- connectionNodes.push(new ConnectionNode( connections[key].host, connections[key].user, connections[key].password, connections[key].port, connections[key].certPath));\n+ connectionNodes.push(new ConnectionNode( connections[key].host, connections[key].user, connections[key].password, connections[key].port, connections[key].database, connections[key].certPath));\n}\n}\nreturn connectionNodes;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
connect support specify database
|
141,908 |
23.04.2020 14:36:59
| -28,800 |
e2d6a0c7638edd6d74fa50a79457189302935a14
|
fix mock data fail beause index 0
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "{\n\"name\": \"vscode-mysql-client\",\n- \"version\": \"1.7.32\",\n+ \"version\": \"1.8.0\",\n\"lockfileVersion\": 1,\n\"requires\": true,\n\"dependencies\": {\n},\n\"ansi-regex\": {\n\"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz\",\n\"integrity\": \"sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=\"\n},\n\"ansi-styles\": {\n},\n\"builtin-modules\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz\",\n\"integrity\": \"sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=\",\n\"dev\": true\n},\n},\n\"color-name\": {\n\"version\": \"1.1.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz\",\n\"integrity\": \"sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=\"\n},\n\"combined-stream\": {\n},\n\"commondir\": {\n\"version\": \"1.0.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz\",\n\"integrity\": \"sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=\"\n},\n\"concat-map\": {\n},\n\"find-up\": {\n\"version\": \"2.1.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz\",\n\"integrity\": \"sha1-RdG35QbHF93UgndaK3eSCjwMV6c=\",\n\"requires\": {\n\"locate-path\": \"^2.0.0\"\n},\n\"imurmurhash\": {\n\"version\": \"0.1.4\",\n- \"resolved\": \"https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz\",\n\"integrity\": \"sha1-khi5srkoojixPcT7a21XbyMUU+o=\"\n},\n\"inflight\": {\n},\n\"is-arrayish\": {\n\"version\": \"0.2.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz\",\n\"integrity\": \"sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=\"\n},\n\"is-callable\": {\n},\n\"is-fullwidth-code-point\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz\",\n\"integrity\": \"sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=\"\n},\n\"is-promise\": {\n\"version\": \"2.1.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz\",\n\"integrity\": \"sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=\"\n},\n\"is-property\": {\n},\n\"isexe\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisexe%2Fdownload%2Fisexe-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz\",\n\"integrity\": \"sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=\"\n},\n\"isstream\": {\n},\n\"locate-path\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz\",\n\"integrity\": \"sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=\",\n\"requires\": {\n\"p-locate\": \"^2.0.0\",\n},\n\"object-assign\": {\n\"version\": \"4.1.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz\",\n\"integrity\": \"sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=\"\n},\n\"object-inspect\": {\n},\n\"p-locate\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz\",\n\"integrity\": \"sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=\",\n\"requires\": {\n\"p-limit\": \"^1.1.0\"\n},\n\"p-try\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz\",\n\"integrity\": \"sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=\"\n},\n\"parent-module\": {\n},\n\"path-exists\": {\n\"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz\",\n\"integrity\": \"sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=\"\n},\n\"path-is-absolute\": {\n},\n\"sprintf-js\": {\n\"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz\",\n\"integrity\": \"sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=\"\n},\n\"sql-formatter\": {\n},\n\"strip-ansi\": {\n\"version\": \"4.0.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz\",\n\"integrity\": \"sha1-qEeQIusaw2iocTibY1JixQXuNo8=\",\n\"requires\": {\n\"ansi-regex\": \"^3.0.0\"\n},\n\"text-table\": {\n\"version\": \"0.2.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz\",\n\"integrity\": \"sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=\"\n},\n\"through\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -20,7 +20,7 @@ export class MockRunner {\npublic async create(tableNode: TableNode) {\nconst mockModel: MockModel = {\nhost: tableNode.host, port: tableNode.port, user: tableNode.user, database: tableNode.database, table: tableNode.table,\n- mockStartIndex: 0, mockCount: 50, mock: {}\n+ mockStartIndex: 1, mockCount: 50, mock: {}\n}\nconst columnList = (await tableNode.getChildren()) as ColumnNode[]\nfor (const columnNode of columnList) {\n@@ -59,8 +59,9 @@ export class MockRunner {\nconst insertSqlTemplate = (await tableNode.insertSqlTemplate(false)).replace(\"\\n\", \" \");\nconst sqlList = [];\nconst mockData = mockModel.mock;\n- const { mockStartIndex, mockCount } = mockModel\n- for (let i = mockStartIndex; i < (mockStartIndex + mockCount); i++) {\n+ let { mockStartIndex, mockCount } = mockModel\n+ if (mockStartIndex < 1) mockStartIndex = 1\n+ for (let i = mockStartIndex; i <= (mockStartIndex + mockCount); i++) {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\nlet value = mockData[column].value;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix mock data fail beause index 0
|
141,908 |
23.04.2020 18:12:36
| -28,800 |
f4cab96514483db1ef4571739ffe6d44ce9e0cfa
|
fix count un accurate
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -61,7 +61,7 @@ export class MockRunner {\nconst mockData = mockModel.mock;\nlet { mockStartIndex, mockCount } = mockModel\nif (mockStartIndex < 1) mockStartIndex = 1\n- for (let i = mockStartIndex; i <= (mockStartIndex + mockCount); i++) {\n+ for (let i = mockStartIndex; i < (mockStartIndex + mockCount); i++) {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\nlet value = mockData[column].value;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix count un accurate
|
141,908 |
23.04.2020 20:13:33
| -28,800 |
f18ade5e66f01765e6595716ca8d7fa69d645a7a
|
improve intellij
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -8,7 +8,7 @@ export class Constants {\n}\nexport enum Pattern {\n- TABLE_PATTERN = \"\\\\b(from|join|update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\",\n+ TABLE_PATTERN = \"\\\\b(from|join|update|into)\\\\b\\\\s*`?((\\\\w|\\\\.|-)+)`?\",\nDML_PATTERN = \"\\\\b(update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -8,21 +8,18 @@ import { ConnectionManager } from \"../../../database/ConnectionManager\";\nexport class ColumnChain implements ComplectionChain {\n- private tablePatternStr = \"\\\\b(from|join|update)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\";\nprivate needStop = true;\npublic async getComplection(complectionContext: ComplectionContext): Promise<vscode.CompletionItem[]> {\n- const afterDot = complectionContext.preChart === \".\";\n- const inWhere = complectionContext.currentSqlFull.match(/\\bwhere\\b/ig);\n- if (afterDot || inWhere) {\n+ if (complectionContext.preChart === \".\") {\nlet subComplectionItems = await this.generateColumnComplectionItem(complectionContext.preWord);\n- const tableReg = new RegExp(this.tablePatternStr + \"(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\n+ const tableReg = new RegExp(Pattern.TABLE_PATTERN + \"(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\nlet result = tableReg.exec(complectionContext.currentSqlFull);\nfor (; result != null && subComplectionItems.length === 0;) {\nsubComplectionItems = await this.generateColumnComplectionItem(\nUtil.getTableName(result[0], Pattern.TABLE_PATTERN)\n);\n- this.needStop = afterDot || inWhere == null;\n+ this.needStop = true;\nif (subComplectionItems.length > 0) {\nbreak;\n}\n@@ -31,10 +28,18 @@ export class ColumnChain implements ComplectionChain {\nreturn subComplectionItems;\n}\n- const tableName = Util.getTableName(complectionContext.currentSql, Pattern.DML_PATTERN)\n- if (tableName) {\n+ if (complectionContext.currentSqlFull.match(/\\bwhere\\b/ig)) {\n+ const updateTableName = Util.getTableName(complectionContext.currentSql, Pattern.TABLE_PATTERN)\n+ if (updateTableName) {\n+ this.needStop = false;\n+ return await this.generateColumnComplectionItem(updateTableName);\n+ }\n+ }\n+\n+ const dmlTableName = Util.getTableName(complectionContext.currentSql, Pattern.DML_PATTERN)\n+ if (dmlTableName) {\nthis.needStop = complectionContext.currentSql.match(/\\binsert\\b/ig) != null;\n- return await this.generateColumnComplectionItem(tableName);\n+ return await this.generateColumnComplectionItem(dmlTableName);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableDetecherChain.ts",
"new_path": "src/provider/Complection/chain/tableDetecherChain.ts",
"diff": "import * as vscode from \"vscode\";\nimport { ComplectionChain, ComplectionContext } from \"../complectionContext\";\n+import { Pattern } from \"../../../common/Constants\";\nexport class TableDetecherChain implements ComplectionChain {\npublic getComplection(complectionContext: ComplectionContext): vscode.CompletionItem[] | Promise<vscode.CompletionItem[]> {\n- const tableMatch = new RegExp('\\\\b(from|join)\\\\b\\\\s*((\\\\w|\\\\.)+)( *)?(\\\\w+)?', 'ig');\n+ const tableMatch = new RegExp(Pattern.TABLE_PATTERN + \" *((\\\\w)*)?\", 'ig');\nif (\n(complectionContext.preWord && complectionContext.preWord.match(/\\b(select|HAVING|\\(|on|where|and|,|=|<|>)\\b/ig))\n||\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
improve intellij
|
141,908 |
23.04.2020 20:29:54
| -28,800 |
c7d8d6455777fb0fdbc22751ac4a1e64b3282a9d
|
fix cannot show alias query
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolbar.html",
"new_path": "resources/webview/pages/result/components/toolbar.html",
"diff": "<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-checkbox-group v-model=\"toolbar.showColumns\">\n- <el-checkbox v-for=\"(column) in result.columnList\" :label=\"column.name\"\n+ <el-checkbox v-for=\"(column) in result.fields\" :label=\"column.name\"\n:key=\"column.name\">\n{{column.name}}\n</el-checkbox>\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "if (origin == undefined || origin == null) {\nreturn \"<b>(NULL)</b>\";\n}\n+ if(Date.parse(origin)){\n+ return origin.toString().replace(\"T\",\" \").replace(/\\.\\d+Z$/,\"\")\n+ }\nreturn origin;\n},\ndeepClone(obj) {\nvue.toolbar.filter = {}\nvue.$refs.dataTable.clearSort()\n}\n+ if(vue.result.fields){\n+ vue.initShowColumn(vue.result.fields)\n+ }\nif (vue.result.columnList) {\nvue.uploadRole()\n// add filter row\nvue.result.data.unshift({ isFilter: true, content: '' })\n- vue.initShowColumn(vue.result.columnList)\n+\n}\nif (vue.toolbar.isRefrsh) {\nvue.toolbar.isRefrsh = false;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix cannot show alias query
|
141,908 |
23.04.2020 20:38:25
| -28,800 |
fa7babd957ba06f4d994ec8b4a0db60ab64ce1a4
|
support bit type
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "this.editor.visible = true;\nthis.update = {\ncurrent: row,\n- currentNew: this.deepClone(row),\n+ currentNew: this.clone(row),\nprimary: row[this.result.primaryKey]\n}\n},\ndeleteTemplate() {\nthis.result.sql = `DELETE FROM [table] WHERE id= `;\n},\n- dataformat(origin) {\n- if (origin == undefined || origin == null) {\n- return \"<b>(NULL)</b>\";\n+ dataformat0(origin) {\n+ if (origin == null) return null;\n+ // bit\n+\n+ if (origin.hasOwnProperty('type')) {\n+ return origin.data[0];\n}\nif (Date.parse(origin)) {\nreturn origin.toString().replace(\"T\", \" \").replace(/\\.\\d+Z$/, \"\")\n}\nreturn origin;\n},\n- deepClone(obj) {\n+ dataformat(origin) {\n+\n+ if (origin == undefined || origin == null) {\n+ return \"<b>(NULL)</b>\";\n+ }\n+\n+ const preFormat = this.dataformat0(origin)\n+ if (preFormat != origin) return preFormat;\n+\n+ return origin;\n+ },\n+ clone(obj) {\nlet objClone = Array.isArray(obj) ? [] : {};\nif (obj && typeof obj === \"object\") {\nfor (let key in obj) {\nif (obj.hasOwnProperty(key)) {\n- if (obj[key] && typeof obj[key] === \"object\") {\n- objClone[key] = this.deepClone(obj[key]);\n- } else {\n- objClone[key] = obj[key];\n- }\n+ objClone[key] = this.dataformat0(obj[key]);\n}\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support bit type
|
141,908 |
23.04.2020 21:32:13
| -28,800 |
69a2462874eeb3a87ee9fb80b7e4575c773785b0
|
storage mock alone
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "},\n\"ansi-regex\": {\n\"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz\",\n\"integrity\": \"sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=\"\n},\n\"ansi-styles\": {\n},\n\"builtin-modules\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz\",\n\"integrity\": \"sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=\",\n\"dev\": true\n},\n},\n\"color-name\": {\n\"version\": \"1.1.3\",\n- \"resolved\": \"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz\",\n\"integrity\": \"sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=\"\n},\n\"combined-stream\": {\n},\n\"commondir\": {\n\"version\": \"1.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz\",\n\"integrity\": \"sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=\"\n},\n\"concat-map\": {\n},\n\"find-up\": {\n\"version\": \"2.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz\",\n\"integrity\": \"sha1-RdG35QbHF93UgndaK3eSCjwMV6c=\",\n\"requires\": {\n\"locate-path\": \"^2.0.0\"\n},\n\"imurmurhash\": {\n\"version\": \"0.1.4\",\n- \"resolved\": \"https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz\",\n\"integrity\": \"sha1-khi5srkoojixPcT7a21XbyMUU+o=\"\n},\n\"inflight\": {\n\"side-channel\": \"^1.0.2\"\n}\n},\n+ \"interpret\": {\n+ \"version\": \"1.2.0\",\n+ \"resolved\": \"https://registry.npm.taobao.org/interpret/download/interpret-1.2.0.tgz\",\n+ \"integrity\": \"sha1-1QYaYiS+WOgIOYX1AU2EQ1lXYpY=\"\n+ },\n\"is-arrayish\": {\n\"version\": \"0.2.1\",\n- \"resolved\": \"https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz\",\n\"integrity\": \"sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=\"\n},\n\"is-callable\": {\n},\n\"is-fullwidth-code-point\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz\",\n\"integrity\": \"sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=\"\n},\n\"is-promise\": {\n\"version\": \"2.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz\",\n\"integrity\": \"sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=\"\n},\n\"is-property\": {\n},\n\"isexe\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisexe%2Fdownload%2Fisexe-2.0.0.tgz\",\n\"integrity\": \"sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=\"\n},\n\"isstream\": {\n},\n\"locate-path\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz\",\n\"integrity\": \"sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=\",\n\"requires\": {\n\"p-locate\": \"^2.0.0\",\n},\n\"object-assign\": {\n\"version\": \"4.1.1\",\n- \"resolved\": \"https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz\",\n\"integrity\": \"sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=\"\n},\n\"object-inspect\": {\n},\n\"p-locate\": {\n\"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz\",\n\"integrity\": \"sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=\",\n\"requires\": {\n\"p-limit\": \"^1.1.0\"\n},\n\"p-try\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz\",\n\"integrity\": \"sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=\"\n},\n\"parent-module\": {\n},\n\"path-exists\": {\n\"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz\",\n\"integrity\": \"sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=\"\n},\n\"path-is-absolute\": {\n\"util-deprecate\": \"~1.0.1\"\n}\n},\n+ \"rechoir\": {\n+ \"version\": \"0.6.2\",\n+ \"resolved\": \"https://registry.npm.taobao.org/rechoir/download/rechoir-0.6.2.tgz\",\n+ \"integrity\": \"sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=\",\n+ \"requires\": {\n+ \"resolve\": \"^1.1.6\"\n+ }\n+ },\n\"regenerator-runtime\": {\n\"version\": \"0.13.5\",\n\"resolved\": \"https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz\",\n\"resolved\": \"https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz\",\n\"integrity\": \"sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=\"\n},\n+ \"shelljs\": {\n+ \"version\": \"0.8.3\",\n+ \"resolved\": \"https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.3.tgz\",\n+ \"integrity\": \"sha1-p/MxlSDr8J7oEnWyNorbKGZZsJc=\",\n+ \"requires\": {\n+ \"glob\": \"^7.0.0\",\n+ \"interpret\": \"^1.0.0\",\n+ \"rechoir\": \"^0.6.2\"\n+ }\n+ },\n\"side-channel\": {\n\"version\": \"1.0.2\",\n\"resolved\": \"https://registry.npm.taobao.org/side-channel/download/side-channel-1.0.2.tgz\",\n},\n\"sprintf-js\": {\n\"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz\",\n\"integrity\": \"sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=\"\n},\n\"sql-formatter\": {\n},\n\"strip-ansi\": {\n\"version\": \"4.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz\",\n\"integrity\": \"sha1-qEeQIusaw2iocTibY1JixQXuNo8=\",\n\"requires\": {\n\"ansi-regex\": \"^3.0.0\"\n},\n\"text-table\": {\n\"version\": \"0.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz\",\n+ \"resolved\": \"https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz\",\n\"integrity\": \"sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=\"\n},\n\"through\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"mockjs\": \"^1.1.0\",\n\"mysql\": \"^2.18.1\",\n\"mysqldump\": \"^2.3.0\",\n+ \"shelljs\": \"^0.8.3\",\n\"sql-formatter\": \"^2.3.3\"\n},\n\"__metadata\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -81,7 +81,7 @@ export function activate(context: vscode.ExtensionContext) {\nserviceManager.mockRunner.create(tableNode)\n},\n\"mysql.mock.run\": (fileUri: vscode.Uri) => {\n- serviceManager.mockRunner.runMock(fileUri)\n+ serviceManager.mockRunner.runMock()\n},\n\"mysql.table.source\": (tableNode: TableNode) => {\nif (tableNode) { tableNode.showSource(); }\n@@ -212,3 +212,6 @@ function initCommand(commandDefinition: any): vscode.Disposable[] {\nreturn dispose;\n}\n+\n+// refrences\n+// - when : https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/FileManager.ts",
"new_path": "src/extension/FileManager.ts",
"diff": "import * as fs from \"fs\";\n+import * as path from 'path';\nimport * as vscode from \"vscode\";\n+import shell = require('shelljs');\nexport class FileManager {\n- private static storagePath: string;\n+\n+ public static storagePath: string;\npublic static init(context: vscode.ExtensionContext) {\nthis.storagePath = context.globalStoragePath;\n}\n@@ -11,6 +14,7 @@ export class FileManager {\nif (!this.storagePath) { vscode.window.showErrorMessage(\"FileManager is not init!\") }\nif (!fileName) { return; }\nconst recordPath = `${this.storagePath}/${fileName}`;\n+ this.check(path.resolve(recordPath, '..'))\nif (!fs.existsSync(recordPath)) {\nfs.appendFileSync(recordPath, \"\");\n}\n@@ -28,6 +32,7 @@ export class FileManager {\nif (!fileName || !content) { return; }\nreturn new Promise((resolve) => {\nconst recordPath = `${this.storagePath}/${fileName}`;\n+ this.check(path.resolve(recordPath, '..'))\nif (!fs.existsSync(this.storagePath)) {\nfs.mkdirSync(this.storagePath);\n}\n@@ -39,6 +44,12 @@ export class FileManager {\nresolve(recordPath)\n});\n}\n+\n+ private static check(path: string) {\n+ if (!fs.existsSync(path)) { shell.mkdir('-p', path) }\n+\n+ }\n+\n}\nexport enum FileModel {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "+import * as Mock from 'mockjs';\nimport * as vscode from \"vscode\";\n-import format = require('date-format');\n-import { TableNode } from '../../model/table/tableNode';\n-import { MockModel } from './mockModel';\n-import { FileManager, FileModel } from '../FileManager';\n-import { ColumnNode } from \"../../model/table/columnNode\";\n-import { readFileSync } from \"fs\";\n+import { MessageType } from \"../../common/Constants\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\n-import * as Mock from 'mockjs'\nimport { QueryUnit } from \"../../database/QueryUnit\";\n+import { ColumnNode } from \"../../model/table/columnNode\";\n+import { TableNode } from '../../model/table/tableNode';\nimport { QueryPage } from \"../../view/result/query\";\nimport { MessageResponse } from \"../../view/result/queryResponse\";\n-import { MessageType } from \"../../common/Constants\";\n+import { FileManager, FileModel } from '../FileManager';\n+import { MockModel } from './mockModel';\n+import format = require('date-format');\n+import { fsyncSync, existsSync } from 'fs';\nexport class MockRunner {\n@@ -30,13 +30,19 @@ export class MockRunner {\n}\n}\n+ const mockPath = `mock/${tableNode.table}/mock.json`;\n+ const mockFullPath = `${FileManager.storagePath}/${mockPath}`;\n+ if (!existsSync(mockFullPath)) {\n+ await FileManager.record(mockPath, JSON.stringify(mockModel, null, 4), FileModel.WRITE);\n+ }\nawait vscode.window.showTextDocument(\n- await vscode.workspace.openTextDocument(await FileManager.record(\"mock.json\", JSON.stringify(mockModel, null, 4), FileModel.WRITE))\n+ await vscode.workspace.openTextDocument(mockFullPath)\n);\n}\n- public async runMock(fileUri: vscode.Uri) {\n- const content = readFileSync(fileUri.fsPath, 'utf8')\n+ public async runMock() {\n+\n+ const content = vscode.window.activeTextEditor.document.getText()\nconst mockModel = JSON.parse(content) as MockModel;\nconst databaseid = `${mockModel.host}_${mockModel.port}_${mockModel.user}_${mockModel.database}`;\n@@ -60,7 +66,7 @@ export class MockRunner {\nconst sqlList = [];\nconst mockData = mockModel.mock;\nlet { mockStartIndex, mockCount } = mockModel\n- if (mockStartIndex < 1) mockStartIndex = 1\n+ if (mockStartIndex < 1) { mockStartIndex = 1 }\nfor (let i = mockStartIndex; i < (mockStartIndex + mockCount); i++) {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
storage mock alone
|
141,908 |
23.04.2020 21:58:10
| -28,800 |
bf80ef1784cc5fd28b555db01e56f614a1d96ff3
|
support detect index
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "vue.info.error = true\nbreak;\ncase \"MESSAGE\":\n+ if (response.message) {\nif (response.success) {\nvue.$message.success(response.message)\n} else {\nvue.$message.error(response.message)\n}\n+ }\n+ vue.refresh()\nbreak;\ndefault:\nvue.$message(JSON.stringify(event.data));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -64,7 +64,7 @@ export enum MessageType {\nDDL = 'DDL',\nERROR = \"ERROR\",\nRUN = \"RUN\",\n- MESSAGE = \"MESSAGE\",\n+ MESSAGE = \"MESSAGE\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockModel.ts",
"new_path": "src/extension/mock/mockModel.ts",
"diff": "@@ -4,7 +4,7 @@ export interface MockModel {\nuser: string;\ndatabase: string;\ntable: string;\n- mockStartIndex: number;\n+ mockStartIndex: number|string;\nmockCount: number;\nmock: {\n[key: string]: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "+import { existsSync } from 'fs';\nimport * as Mock from 'mockjs';\nimport * as vscode from \"vscode\";\nimport { MessageType } from \"../../common/Constants\";\n@@ -11,7 +12,6 @@ import { MessageResponse } from \"../../view/result/queryResponse\";\nimport { FileManager, FileModel } from '../FileManager';\nimport { MockModel } from './mockModel';\nimport format = require('date-format');\n-import { fsyncSync, existsSync } from 'fs';\nexport class MockRunner {\n@@ -20,7 +20,8 @@ export class MockRunner {\npublic async create(tableNode: TableNode) {\nconst mockModel: MockModel = {\nhost: tableNode.host, port: tableNode.port, user: tableNode.user, database: tableNode.database, table: tableNode.table,\n- mockStartIndex: 1, mockCount: 50, mock: {}\n+ mockStartIndex: tableNode.primaryKey ? tableNode.primaryKey : 1\n+ , mockCount: 50, mock: {}\n}\nconst columnList = (await tableNode.getChildren()) as ColumnNode[]\nfor (const columnNode of columnList) {\n@@ -65,9 +66,16 @@ export class MockRunner {\nconst insertSqlTemplate = (await tableNode.insertSqlTemplate(false)).replace(\"\\n\", \" \");\nconst sqlList = [];\nconst mockData = mockModel.mock;\n- let { mockStartIndex, mockCount } = mockModel\n- if (mockStartIndex < 1) { mockStartIndex = 1 }\n- for (let i = mockStartIndex; i < (mockStartIndex + mockCount); i++) {\n+ const { mockStartIndex, mockCount } = mockModel\n+ let startIndex = 1;\n+ if (mockStartIndex != null) {\n+ if (!isNaN(Number(mockStartIndex))) {\n+ startIndex = mockStartIndex as number\n+ } else if (mockStartIndex.toString().toLowerCase() == \"auto\") {\n+ startIndex = (await tableNode.getMaxPrimary()) + 1;\n+ }\n+\n+ for (let i = startIndex; i < (startIndex + mockCount); i++) {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\nlet value = mockData[column].value;\n@@ -82,6 +90,8 @@ export class MockRunner {\nQueryPage.send({ type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n}\n+ }\n+\nprivate wrapQuote(type: string, value: any): any {\ntype = type.toLowerCase()\nswitch (type) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/table/tableNode.ts",
"new_path": "src/model/table/tableNode.ts",
"diff": "@@ -20,6 +20,7 @@ export class TableNode implements Node, ConnectionInfo, CopyAble {\npublic id: string;\npublic type: string = ModelType.TABLE;\n+ public primaryKey: string;\nconstructor(readonly host: string, readonly user: string, readonly password: string,\nreadonly port: string, readonly database: string, readonly table: string,\n@@ -50,6 +51,9 @@ export class TableNode implements Node, ConnectionInfo, CopyAble {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength FROM information_schema.columns WHERE table_schema = '${this.database}' AND table_name = '${this.table}';`)\n.then((columns) => {\ncolumnNodes = columns.map<ColumnNode>((column) => {\n+ if (column && column.key == \"PRI\") {\n+ this.primaryKey = column.name\n+ }\nreturn new ColumnNode(this.host, this.user, this.password, this.port, this.database, this.table, this.certPath, column);\n});\nDatabaseCache.setColumnListOfTable(this.id, columnNodes);\n@@ -186,6 +190,19 @@ ADD\n});\n}\n+ public async getMaxPrimary(): Promise<number> {\n+\n+ const connection = await ConnectionManager.getConnection(this, false)\n+\n+ if (this.primaryKey) {\n+ const count = await QueryUnit.queryPromise(connection, `select max(${this.primaryKey}) max from ${this.table}`);\n+ if (count && count[0]) { return count[0].max }\n+ }\n+\n+\n+ return Promise.resolve(0)\n+ }\n+\npublic backupData(exportPath: string) {\nConsole.log(`Doing backup ${this.host}_${this.database}_${this.table}...`);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support detect index
|
141,908 |
23.04.2020 22:05:28
| -28,800 |
83dc96a750a542c656fc94525cd6e6b275f779f8
|
support copt column data
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolbar.html",
"new_path": "resources/webview/pages/result/components/toolbar.html",
"diff": "-<el-table-column fixed=\"left\" label=\"Operations\" width=\"100\" v-if=\"result.primaryKey\" align=\"center\">\n+<el-table-column fixed=\"left\" label=\"Operations\" width=\"130\" v-if=\"result.primaryKey\" align=\"center\">\n<template slot-scope=\"scope\">\n<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-checkbox-group v-model=\"toolbar.showColumns\">\n- <el-checkbox v-for=\"(column) in result.fields\" :label=\"column.name\"\n- :key=\"column.name\">\n+ <el-checkbox v-for=\"(column) in result.fields\" :label=\"column.name\" :key=\"column.name\">\n{{column.name}}\n</el-checkbox>\n</el-checkbox-group>\n- <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\"\n- slot=\"reference\"></el-button>\n+ <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\" slot=\"reference\">\n+ </el-button>\n</el-popover>\n- <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\"\n- icon=\"el-icon-refresh\" circle title=\"Reset\">\n+ <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\"\n+ circle title=\"Reset\">\n</el-button>\n</div>\n<div v-if=\"scope.row[result.primaryKey]\">\n- <el-button @click=\"openEdit(scope.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\"\n+ <el-button @click=\"openEdit(scope.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n+ </el-button>\n+ <el-button @click=\"openEdit(scope.row);update.primary=null\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\"\ncircle>\n</el-button>\n- <el-button @click=\"deleteConfirm(scope.row[result.primaryKey])\" type=\"primary\" size=\"small\"\n+ <el-button @click=\"deleteConfirm(scope.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\"\nicon=\"el-icon-delete\" circle>\n</el-button>\n</div>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support copt column data
|
141,908 |
23.04.2020 22:41:00
| -28,800 |
9b178087848b95ab2dc0e267fc1da9ac62050f72
|
fix complection fail when not active database
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -63,7 +63,8 @@ export class ColumnChain implements ComplectionChain {\nconst id = `${lcp.host}_${lcp.port}_${lcp.user}_${lcp.database}_${tableName}`;\nfor (const tableNode of DatabaseCache.getTableNodeList()) {\n- if (tableNode.id === id) {\n+ if ((!lcp.database && tableNode.table == tableName) ||\n+ (tableNode.id === id)) {\ncolumnNodes = (await tableNode.getChildren()) as ColumnNode[];\nbreak;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix complection fail when not active database
|
141,908 |
23.04.2020 23:00:29
| -28,800 |
6f5307de1d260df6cbbc137f2081a0c4a6a49101
|
add table width
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "if (this.result.primaryKey) {\nwidth += 60;\n}\n- this.table.width = width + 60;\n+ this.table.width = width + 100;\n},\ncomputeWidth(key, index, value) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add table width
|
141,908 |
23.04.2020 23:03:30
| -28,800 |
c7ed96ee47678938529a8832b2e293e722ea0a47
|
add transaction keyword
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,7 +3,7 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class KeywordChain implements ComplectionChain {\n- private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\",\"COMMENT\"];\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"COMMENT\", \"rollback\", \"commit\", \"begin\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add transaction keyword
|
141,908 |
23.04.2020 23:25:09
| -28,800 |
a99a91da91d87ba5c3708d8ed073acdd6d78a957
|
mock config detech table change
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "-import { existsSync } from 'fs';\n+import { existsSync, readFileSync } from 'fs';\nimport * as Mock from 'mockjs';\nimport * as vscode from \"vscode\";\nimport { MessageType } from \"../../common/Constants\";\n@@ -33,7 +33,14 @@ export class MockRunner {\nconst mockPath = `mock/${tableNode.table}/mock.json`;\nconst mockFullPath = `${FileManager.storagePath}/${mockPath}`;\n- if (!existsSync(mockFullPath)) {\n+ if (existsSync(mockFullPath)) {\n+ const existsMockModel = JSON.parse(readFileSync(mockFullPath, 'utf8')) as MockModel;\n+ if (Object.keys(existsMockModel.mock).length != columnList.length) {\n+ existsMockModel.mock = mockModel.mock\n+ await FileManager.record(mockPath, JSON.stringify(existsMockModel, null, 4), FileModel.WRITE);\n+ }\n+\n+ } else {\nawait FileManager.record(mockPath, JSON.stringify(mockModel, null, 4), FileModel.WRITE);\n}\nawait vscode.window.showTextDocument(\n@@ -80,7 +87,7 @@ export class MockRunner {\nfor (const column in mockData) {\nlet value = mockData[column].value;\nif (value == this.MOCK_INDEX) { value = i; }\n- tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column, 'i'), this.wrapQuote(mockData[column].type, Mock.mock(value)));\n+ tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column, 'ig'), this.wrapQuote(mockData[column].type, Mock.mock(value)));\n}\nsqlList.push(tempInsertSql)\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
mock config detech table change
|
141,908 |
23.04.2020 23:26:27
| -28,800 |
b05567182366cef3b3107031a52ebac1d3bd950c
|
predesign connect page
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/webview/pages/connect/components/option.html",
"diff": "+<div>\n+ <div class=\"field field__input\">\n+ <b>host:</b>\n+ <input class=\"field__input\" v-model=\"connectionOption.host\" />\n+ </div>\n+</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>port:</b>\n+ <input class=\"field__input\" v-model=\"connectionOption.port\" />\n+ </div>\n+</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>username:</b>\n+ <input class=\"field__input\" v-model=\"connectionOption.user\" />\n+ </div>\n+</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>password:</b>\n+ <input class=\"field__input\" type=\"password\" v-model=\"connectionOption.password\" />\n+ </div>\n+</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>database:</b>\n+ <input class=\"field__input\" placeholder=\"database, can be null\" v-model=\"connectionOption.database\" />\n+ </div>\n+</div>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"css/style.css\">\n+ <link rel=\"stylesheet\" href=\"/css/element.css\">\n<script src=\"js/vue.js\"></script>\n+ <script src=\"/js/element.js\"></script>\n<title>Connect to SQL server</title>\n</head>\nConnection error! <span id=\"errorMessage\" v-text=\"errorMessage\"></span><br />\n</p>\n</blockquote>\n-\n+ <el-row>\n+ <include path=\"components/option.html\" />\n+ </el-row>\n<!-- <template id=\"field-template\"> -->\n- <div>\n- <div class=\"field field__input\">\n- <b>host:</b>\n- <input class=\"field__input\" v-model=\"connectionOption.host\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <b>port:</b>\n- <input class=\"field__input\" v-model=\"connectionOption.port\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <b>username:</b>\n- <input class=\"field__input\" v-model=\"connectionOption.user\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <b>password:</b>\n- <input class=\"field__input\" type=\"password\" v-model=\"connectionOption.password\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <b>database:</b>\n- <input class=\"field__input\" placeholder=\"database, can be null\" v-model=\"connectionOption.database\" />\n- </div>\n- </div>\n<!-- </template> -->\n<div id=\"fields\" data-type=\"none\"></div>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
predesign connect page
|
141,908 |
24.04.2020 10:37:33
| -28,800 |
55c5bc34e893bc10bb3d2f6f6f75b5bf585db23f
|
fix count sql not show
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/dataTable.html",
"new_path": "resources/webview/pages/result/components/dataTable.html",
"diff": "<el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\" align=\"center\" sortable\n- v-if=\"result.columnList && toolbar.showColumns.includes(field.name.toLowerCase())\"\n+ v-if=\"result.fields && toolbar.showColumns.includes(field.name.toLowerCase())\"\n:width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n<el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"filter\"\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix count sql not show
|
141,908 |
24.04.2020 12:52:07
| -28,800 |
c927a3a4db6bcd1ae5d573f996872e4230444188
|
update 1.8.4, fix bugs
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.8.1\",\n+ \"version\": \"1.8.4\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n\"tslint\": \"^5.8.0\",\n\"typescript\": \"^3.8.3\",\n\"vscode\": \"^1.1.36\"\n-\n},\n\"dependencies\": {\n\"date-format\": \"^3.0.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/FileManager.ts",
"new_path": "src/extension/FileManager.ts",
"diff": "import * as path from 'path';\nimport * as vscode from \"vscode\";\n-import * as fs from 'fs-extra';\n+import * as fs from 'fs';\nexport class FileManager {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -17,12 +17,12 @@ export class MockRunner {\nprivate readonly MOCK_INDEX = \"$mockIndex\";\npublic async create(tableNode: TableNode) {\n+ const columnList = (await tableNode.getChildren()) as ColumnNode[]\nconst mockModel: MockModel = {\nhost: tableNode.host, port: tableNode.port, user: tableNode.user, database: tableNode.database, table: tableNode.table,\nmockStartIndex: tableNode.primaryKey ? 'auto' : 1\n, mockCount: 50, mock: {}\n}\n- const columnList = (await tableNode.getChildren()) as ColumnNode[]\nfor (const columnNode of columnList) {\nmockModel.mock[columnNode.column.name] = {\ntype: columnNode.column.simpleType,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update 1.8.4, fix bugs
|
141,908 |
24.04.2020 20:13:28
| -28,800 |
d156e625de1b1927aa54102b057e5f1a6a20c912
|
add mock example
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"command\": \"mysql.runQuery\",\n\"key\": \"f9\",\n\"when\": \"editorLangId == sql\"\n+ },\n+ {\n+ \"command\": \"mysql.mock.run\",\n+ \"when\": \"editorLangId == json && resourceFilename == mock.json \",\n+ \"key\": \"f9\"\n}\n],\n\"menus\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -3,16 +3,14 @@ import * as fs from \"fs\";\nimport * as mysql from \"mysql\";\nimport { Connection } from \"mysql\";\nimport * as vscode from \"vscode\";\n-import { CommandKey, ConfigKey, Cursor, MessageType, Constants } from \"../common/Constants\";\n+import { CommandKey, ConfigKey, Cursor, MessageType } from \"../common/Constants\";\nimport { Global } from \"../common/Global\";\nimport { Console } from \"../common/OutputChannel\";\n-import { Util } from \"../common/util\";\nimport { ConnectionInfo } from \"../model/interface/connection\";\nimport { QueryPage } from \"../view/result/query\";\nimport { DataResponse, DMLResponse, ErrorResponse, RunResponse, MessageResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\nimport { FileManager, FileModel } from \"../extension/FileManager\";\n-import { resolve } from \"url\";\nexport class QueryUnit {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockModel.ts",
"new_path": "src/extension/mock/mockModel.ts",
"diff": "@@ -3,6 +3,7 @@ export interface MockModel {\nport: string;\nuser: string;\ndatabase: string;\n+ examples: string;\ntable: string;\nmockStartIndex: number|string;\nmockCount: number;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -21,7 +21,7 @@ export class MockRunner {\nconst mockModel: MockModel = {\nhost: tableNode.host, port: tableNode.port, user: tableNode.user, database: tableNode.database, table: tableNode.table,\nmockStartIndex: tableNode.primaryKey ? 'auto' : 1\n- , mockCount: 50, mock: {}\n+ , mockCount: 50, mock: {}, examples: \"http://mockjs.com/examples.html#DPD\"\n}\nfor (const columnNode of columnList) {\nmockModel.mock[columnNode.column.name] = {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add mock example
|
141,908 |
25.04.2020 13:21:04
| -28,800 |
e3cad6b6da56ce74648c047387d42b0ae6014d9b
|
refactor code again
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "\"use strict\";\n// Don't change import order, it will occur circular reference\nimport * as vscode from \"vscode\";\n-import { QueryUnit } from \"./database/QueryUnit\";\n+import { CommandKey } from \"./common/Constants\";\n+\nimport { ConnectionNode } from \"./model/database/connectionNode\";\nimport { DatabaseNode } from \"./model/database/databaseNode\";\n-import { TableNode } from \"./model/main/tableNode\";\n-import { MySQLTreeDataProvider } from \"./provider/MysqlTreeDataProvider\";\n-import { CompletionProvider } from \"./provider/Complection/CompletionProvider\";\n-import { DatabaseCache } from \"./database/DatabaseCache\";\n-import { ColumnNode } from \"./model/other/columnNode\";\n-import { SqlViewManager } from \"./view/SqlViewManager\";\n-import { ProcedureNode } from \"./model/main/procedure\";\n+import { UserGroup, UserNode } from \"./model/database/userGroup\";\n+import { CopyAble } from \"./model/interface/copyAble\";\nimport { FunctionNode } from \"./model/main/function\";\n-import { TriggerNode } from \"./model/main/trigger\";\n-import { UserNode, UserGroup } from \"./model/database/userGroup\";\nimport { FunctionGroup } from \"./model/main/functionGroup\";\n-import { TriggerGroup } from \"./model/main/triggerGroup\";\n+import { ProcedureNode } from \"./model/main/procedure\";\nimport { ProcedureGroup } from \"./model/main/procedureGroup\";\n+import { TableGroup } from \"./model/main/tableGroup\";\n+import { TableNode } from \"./model/main/tableNode\";\n+import { TriggerNode } from \"./model/main/trigger\";\n+import { TriggerGroup } from \"./model/main/triggerGroup\";\nimport { ViewGroup } from \"./model/main/viewGroup\";\nimport { ViewNode } from \"./model/main/viewNode\";\n-import { SqlFormatProvider } from \"./provider/SqlFormatProvider\";\n-import { HistoryManager } from \"./extension/HistoryManager\";\n-import { CommandKey } from \"./common/Constants\";\n-import { TableHoverProvider } from \"./provider/TableHoverProvider\";\n-import { TableGroup } from \"./model/main/tableGroup\";\n-import { MysqlSetting } from \"./extension/MysqlSetting\";\n-import { CopyAble } from \"./model/interface/copyAble\";\n+import { ColumnNode } from \"./model/other/columnNode\";\n+// must be last\nimport { ServiceManager } from \"./extension/serviceManager\";\n+import { SqlViewManager } from \"./view/SqlViewManager\";\n+import { QueryUnit } from \"./database/QueryUnit\";\nexport function activate(context: vscode.ExtensionContext) {\nconst serviceManager = new ServiceManager(context)\n- const mysqlTreeDataProvider = new MySQLTreeDataProvider(context);\n- const treeview = vscode.window.createTreeView(\"github.cweijan.mysql\", {\n- treeDataProvider: mysqlTreeDataProvider,\n- });\n- treeview.onDidCollapseElement((event) => {\n- DatabaseCache.storeElementState(event.element, vscode.TreeItemCollapsibleState.Collapsed);\n- });\n- treeview.onDidExpandElement((event) => {\n- DatabaseCache.storeElementState(event.element, vscode.TreeItemCollapsibleState.Expanded);\n- });\n-\ncontext.subscriptions.push(\n- vscode.languages.registerDocumentRangeFormattingEditProvider('sql', new SqlFormatProvider()),\n- vscode.languages.registerHoverProvider('sql', new TableHoverProvider()),\n- vscode.languages.registerCompletionItemProvider('sql', new CompletionProvider(), ' ', '.', \">\", \"<\", \"=\", \"(\"),\n+ ...serviceManager.init(),\n...initCommand({\n- \"mysql.history.open\": () => HistoryManager.showHistory(),\n- [CommandKey.Refresh]: () => { mysqlTreeDataProvider.init(); },\n+ \"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n+ [CommandKey.Refresh]: () => { serviceManager.provider.init(); },\n[CommandKey.RecordHistory]: (sql: string, costTime: number) => {\n- HistoryManager.recordHistory(sql, costTime);\n+ serviceManager.historyService.recordHistory(sql, costTime);\n+ },\n+ \"mysql.setting.open\": () => {\n+ serviceManager.settingService.open();\n+ },\n+ \"mysql.db.active\": () => {\n+ serviceManager.provider.activeDb();\n+ },\n+ \"mysql.mock.table\": (tableNode: TableNode) => {\n+ serviceManager.mockRunner.create(tableNode)\n+ },\n+ \"mysql.mock.run\": () => {\n+ serviceManager.mockRunner.runMock()\n+ },\n+ \"mysql.addConnection\": () => {\n+ SqlViewManager.showConnectPage();\n},\n\"mysql.addDatabase\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n@@ -59,30 +56,18 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.deleteDatabase\": (databaseNode: DatabaseNode) => {\ndatabaseNode.dropDatatabase();\n},\n- \"mysql.addConnection\": () => {\n- SqlViewManager.showConnectPage();\n- },\n\"mysql.changeTableName\": (tableNode: TableNode) => {\ntableNode.changeTableName();\n},\n\"mysql.index.template\": (tableNode: TableNode) => {\ntableNode.indexTemplate();\n},\n- \"mysql.db.active\": () => {\n- mysqlTreeDataProvider.activeDb();\n- },\n\"mysql.table.truncate\": (tableNode: TableNode) => {\ntableNode.truncateTable();\n},\n\"mysql.table.drop\": (tableNode: TableNode) => {\ntableNode.dropTable();\n},\n- \"mysql.mock.table\": (tableNode: TableNode) => {\n- serviceManager.mockRunner.create(tableNode)\n- },\n- \"mysql.mock.run\": () => {\n- serviceManager.mockRunner.runMock()\n- },\n\"mysql.table.source\": (tableNode: TableNode) => {\nif (tableNode) { tableNode.showSource(); }\n},\n@@ -155,9 +140,6 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.template.procedure\": (procedureGroup: ProcedureGroup) => {\nprocedureGroup.createTemplate();\n},\n- \"mysql.setting.open\": (procedureGroup: ProcedureGroup) => {\n- MysqlSetting.open();\n- },\n\"mysql.template.view\": (viewGroup: ViewGroup) => {\nviewGroup.createTemplate();\n},\n"
},
{
"change_type": "RENAME",
"old_path": "src/extension/HistoryManager.ts",
"new_path": "src/extension/HistoryService.ts",
"diff": "import { FileManager } from \"../common/FileManager\";\n-export class HistoryManager {\n+export class HistoryService {\n- public static showHistory() {\n+ public showHistory() {\nFileManager.show('history.sql')\n}\n- public static recordHistory(sql: string, costTime: number) {\n+ public recordHistory(sql: string, costTime: number) {\nif (!sql) { return; }\nFileManager.record('history.sql', `/* ${this.getNowDate()} [${costTime} ms] */ ${sql.replace(/[\\r\\n]/g, \" \")}\\n`);\n}\n- private static getNowDate(): string {\n+ private getNowDate(): string {\nconst date = new Date();\nlet month: string | number = date.getMonth() + 1;\nlet strDate: string | number = date.getDate();\n@@ -27,7 +27,7 @@ export class HistoryManager {\n+ this.pad(date.getHours(), 2) + \":\" + this.pad(date.getMinutes(), 2) + \":\" + this.pad(date.getSeconds(), 2);\n}\n- public static pad(n: any, width: number, z?: any): number {\n+ public pad(n: any, width: number, z?: any): number {\nz = z || '0';\nn = n + '';\nreturn n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension/serviceManager.ts",
"new_path": "src/extension/serviceManager.ts",
"diff": "+import * as vscode from \"vscode\";\nimport { MockRunner } from \"./mock/mockRunner\";\nimport { ExtensionContext } from \"vscode\";\nimport { SqlViewManager } from \"../view/SqlViewManager\";\nimport { DatabaseCache } from \"../database/DatabaseCache\";\nimport { FileManager } from \"../common/FileManager\";\n+import { SqlFormatProvider } from \"../provider/SqlFormatProvider\";\n+import { TableHoverProvider } from \"../provider/TableHoverProvider\";\n+import { CompletionProvider } from \"../provider/Complection/CompletionProvider\";\n+import { MySQLTreeDataProvider } from \"../provider/mysqlTreeDataProvider\";\n+import { HistoryService } from \"./HistoryService\";\n+import { MysqlSettingService } from \"./setting/MysqlSettingService\";\n+import { SettingInterface } from \"./setting/SettingInterface\";\nexport class ServiceManager {\npublic mockRunner: MockRunner;\n+ public historyService: HistoryService;\n+ public provider: MySQLTreeDataProvider;\n+ public settingService: SettingInterface;\n+ private isInit = false;\n- constructor(context: ExtensionContext) {\n+ constructor(private readonly context: ExtensionContext) {\nthis.mockRunner = new MockRunner();\nDatabaseCache.initCache(context);\nSqlViewManager.initExtesnsionPath(context.extensionPath);\nFileManager.init(context)\n}\n+ public init(): vscode.Disposable[] {\n+ if (this.isInit) { return [] }\n+ const res: vscode.Disposable[] = [\n+ vscode.languages.registerDocumentRangeFormattingEditProvider('sql', new SqlFormatProvider()),\n+ vscode.languages.registerHoverProvider('sql', new TableHoverProvider()),\n+ vscode.languages.registerCompletionItemProvider('sql', new CompletionProvider(), ' ', '.', \">\", \"<\", \"=\", \"(\")\n+ ]\n+\n+ this.historyService = new HistoryService()\n+ this.settingService = new MysqlSettingService()\n+\n+ this.provider = new MySQLTreeDataProvider(this.context);\n+ const treeview = vscode.window.createTreeView(\"github.cweijan.mysql\", {\n+ treeDataProvider: this.provider,\n+ });\n+ treeview.onDidCollapseElement((event) => {\n+ DatabaseCache.storeElementState(event.element, vscode.TreeItemCollapsibleState.Collapsed);\n+ });\n+ treeview.onDidExpandElement((event) => {\n+ DatabaseCache.storeElementState(event.element, vscode.TreeItemCollapsibleState.Expanded);\n+ });\n+\n+ res.push(treeview)\n+ this.isInit = true\n+ return res\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "src/extension/MysqlSetting.ts",
"new_path": "src/extension/setting/MysqlSettingService.ts",
"diff": "import * as vscode from \"vscode\";\nimport * as fs from \"fs\";\nimport process = require('process');\n+import { SettingInterface } from \"./SettingInterface\";\n-export class MysqlSetting {\n- private static x64 = \"C:\\\\Program Files\\\\MySQL\";\n- private static x86 = \"C:\\\\Program Files (x86)\\\\MySQL\";\n- public static open() {\n+export class MysqlSettingService implements SettingInterface {\n+ private x64 = \"C:\\\\Program Files\\\\MySQL\";\n+ private x86 = \"C:\\\\Program Files (x86)\\\\MySQL\";\n+ public open() {\nif (!process.platform.match(/win/ig)) {\nvscode.window.showErrorMessage(\"Only Support Windows OS.\");\nreturn;\n@@ -20,7 +21,7 @@ export class MysqlSetting {\n}\n}\n- public static check(param): boolean {\n+ private check(param): boolean {\nfor (const fileName of fs.readdirSync(param)) {\nconst serverPath = param + \"\\\\\" + fileName;\nif (fs.statSync(serverPath).isDirectory) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/extension/setting/SettingInterface.ts",
"diff": "+export interface SettingInterface {\n+ open(): void;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -92,7 +92,6 @@ export class DatabaseNode extends Node implements CopyAble {\npublic async newQuery() {\nFileManager.show(`${this.id}.sql`)\n- // QueryUnit.createSQLTextDocument();\nConnectionManager.getConnection(this, true);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
refactor code again
|
141,908 |
25.04.2020 13:53:34
| -28,800 |
cfbc85c66e478581d9f5f691cfc76a84a992ece8
|
fix connect fail!
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -73,6 +73,7 @@ export class ConnectionManager {\nQueryUnit.queryPromise(connection, `use \\`${connectionNode.database}\\``).then(() => {\nresolve(connection);\n}).catch((error) => {\n+ this.activeConnection[key] = null\nreject(error);\n});\n} else {\n@@ -136,7 +137,7 @@ export class ConnectionManager {\nresolve(port)\n});\nlocalTunnel.on('error', (err) => {\n- Console.log('Bind local tunel occur eror : ' + err);\n+ Console.log('Ssh tunel occur eror : ' + err);\nif (err && errorCallback) {\nlocalTunnel.close()\ndelete this.tunelMark[key]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -19,7 +19,7 @@ export class QueryUnit {\npublic static queryPromise<T>(connection: mysql.Connection, sql: string): Promise<T> {\nreturn new Promise((resolve, reject) => {\n// Console.log(`Execute SQL:${sql}`)\n- connection.query(sql, (err, rows) => {\n+ connection.query(sql, (err: mysql.MysqlError, rows) => {\nif (err) {\nConsole.log(`Execute sql fail : ${sql}`);\nConsole.log(err);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -26,9 +26,10 @@ import { QueryUnit } from \"./database/QueryUnit\";\nexport function activate(context: vscode.ExtensionContext) {\nconst serviceManager = new ServiceManager(context)\n+ const s = serviceManager.init()\ncontext.subscriptions.push(\n- ...serviceManager.init(),\n+ ...s,\n...initCommand({\n\"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n[CommandKey.Refresh]: () => { serviceManager.provider.init(); },\n@@ -48,7 +49,7 @@ export function activate(context: vscode.ExtensionContext) {\nserviceManager.mockRunner.runMock()\n},\n\"mysql.addConnection\": () => {\n- SqlViewManager.showConnectPage();\n+ SqlViewManager.showConnectPage(serviceManager.provider);\n},\n\"mysql.addDatabase\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -23,16 +23,17 @@ export abstract class Node extends vscode.TreeItem {\nreturn []\n}\n- protected init(info: Node) {\n- this.host = info.host\n- this.port = info.port\n- this.user = info.user\n- this.password = info.password\n- this.database = info.database\n- this.certPath = info.certPath\n- this.ssh = info.ssh\n- this.usingSSH = info.usingSSH\n+ protected init(source: Node) {\n+ this.host = source.host\n+ this.port = source.port\n+ this.user = source.user\n+ this.password = source.password\n+ this.database = source.database\n+ this.certPath = source.certPath\n+ this.ssh = source.ssh\n+ this.usingSSH = source.usingSSH\nthis.collapsibleState = DatabaseCache.getElementState(this)\n+ this.origin = source.origin\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/mysqlTreeDataProvider.ts",
"new_path": "src/provider/mysqlTreeDataProvider.ts",
"diff": "@@ -11,18 +11,17 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic _onDidChangeTreeData: vscode.EventEmitter<Node> = new vscode.EventEmitter<Node>();\npublic readonly onDidChangeTreeData: vscode.Event<Node> = this._onDidChangeTreeData.event;\n- public static instance: MySQLTreeDataProvider\n+ private static instance: MySQLTreeDataProvider\nconstructor(private context: vscode.ExtensionContext) {\nMySQLTreeDataProvider.instance = this\nthis.init()\n-\n}\n/**\n* reload treeview context\n*/\n- async init() {\n+ public async init() {\n(await this.getConnectionNodes()).forEach(async (connectionNode) => {\n(await connectionNode.getChildren(true)).forEach(async (databaseNode) => {\n(await databaseNode.getChildren(true)).forEach(async (groupNode) => {\n@@ -68,6 +67,10 @@ export class MySQLTreeDataProvider implements vscode.TreeDataProvider<Node> {\nthis.instance._onDidChangeTreeData.fire(element);\n}\n+ public static getInstnace() {\n+ return this.instance;\n+ }\n+\npublic async getConnectionNodes(): Promise<ConnectionNode[]> {\nconst connectionNodes = [];\nconst connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/SqlViewManager.ts",
"new_path": "src/view/SqlViewManager.ts",
"diff": "@@ -3,8 +3,8 @@ import * as path from \"path\";\nimport * as vscode from \"vscode\";\nimport { WebviewPanel } from \"vscode\";\nimport { ConnectionManager } from \"../database/ConnectionManager\";\n-import { MySQLTreeDataProvider } from \"../provider/MysqlTreeDataProvider\";\nimport { Console } from \"../common/OutputChannel\";\n+import { MySQLTreeDataProvider } from \"../provider/mysqlTreeDataProvider\";\nexport class ViewOption {\npublic viewPath?: string;\n@@ -25,7 +25,7 @@ export class SqlViewManager {\nthis.webviewPath = extensionPath + \"/resources/webview\"\n}\n- public static showConnectPage() {\n+ public static showConnectPage(provider: MySQLTreeDataProvider) {\nthis.createWebviewPanel({\nviewPath: \"pages/connect/connect\",\n@@ -41,7 +41,7 @@ export class SqlViewManager {\nconnectionOption.port = \"\" + connectionOption.ssh.port\n}\nConnectionManager.getConnection(connectionOption).then(() => {\n- MySQLTreeDataProvider.instance.addConnection(params.connectionOption);\n+ provider.addConnection(params.connectionOption);\nwebviewPanel.dispose();\n}).catch((err: Error) => {\nwebviewPanel.webview.postMessage({\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix connect fail!
|
141,908 |
25.04.2020 15:08:33
| -28,800 |
6c593e78b6279937508bdbf40cd7af46aa9d8c7d
|
get port by range
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"mysqldump\": \"^3.1.0\",\n\"shelljs\": \"^0.8.3\",\n\"sql-formatter\": \"^2.3.3\",\n+ \"get-port\": \"^5.1.1\",\n\"ssh2\": \"^0.8.9\",\n\"tunnel-ssh\": \"^4.1.4\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -112,7 +112,7 @@ export class ConnectionManager {\nprivate static createTunnel(connectionNode: Node, errorCallback: (error) => void): Promise<number> {\nreturn new Promise(async (resolve) => {\nconst ssh = connectionNode.ssh\n- const port = 10567;\n+ const port = connectionNode.ssh.tunnelPort;\nconst key = `${ssh.username}_${ssh.port}_${ssh.username}`;\nif (this.tunelMark[key]) {\nresolve(port)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -12,6 +12,7 @@ import { InfoNode } from \"../other/infoNode\";\nimport { Node } from \"../interface/node\";\nimport { FileManager } from \"../../common/FileManager\";\nimport { Util } from \"../../common/util\";\n+import * as getPort from 'get-port'\nexport class ConnectionNode extends Node {\n@@ -21,9 +22,18 @@ export class ConnectionNode extends Node {\nconstructor(readonly id: string, readonly parent: Node) {\nsuper(id)\nthis.init(parent)\n+ if (parent.usingSSH) {\n+ this.getPort()\n+ }\n+ }\n+\n+ private async getPort() {\n+ this.parent.ssh.tunnelPort = await getPort({ port: getPort.makeRange(10567, 11567) })\n}\n+\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n+\nlet databaseNodes = DatabaseCache.getDatabaseListOfConnection(this.id);\nif (databaseNodes && !isRresh) {\nreturn databaseNodes;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/sshConfig.ts",
"new_path": "src/model/interface/sshConfig.ts",
"diff": "export interface SSHConfig {\n+ /**\n+ * local tunnel port\n+ */\n+ tunnelPort: number;\nhost: string;\nport: number;\nusername: string;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
get port by range
|
141,908 |
25.04.2020 21:23:26
| -28,800 |
60c277ff5f0068f836f124d64e619212bcd38c66
|
support comment
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -25,10 +25,10 @@ export class TableGroup extends Node {\nreturn tableNodes;\n}\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this),\n- `SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${this.database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`)\n+ `SELECT table_comment comment,TABLE_NAME tableName FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${this.database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`)\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new TableNode(table.TABLE_NAME, this.info);\n+ return new TableNode(table.tableName, table.comment, this.info);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -21,8 +21,8 @@ export class TableNode extends Node implements CopyAble {\npublic contextValue: string = ModelType.TABLE;\npublic primaryKey: string;\n- constructor(readonly table: string, readonly info: Node) {\n- super(table)\n+ constructor(public readonly table: string, readonly comment: string, readonly info: Node) {\n+ super(`${table} ${comment}`)\nthis.id = `${info.getConnectId()}_${info.database}_${table}`\nthis.init(info)\nthis.command = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -28,7 +28,7 @@ export class ViewGroup extends Node {\n`SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${this.database}' LIMIT ${QueryUnit.maxTableCount}`)\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new ViewNode(table.TABLE_NAME, this.info);\n+ return new ViewNode(table.TABLE_NAME, null, this.info);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableChain.ts",
"new_path": "src/provider/Complection/chain/tableChain.ts",
"diff": "@@ -58,9 +58,8 @@ export class TableChain implements ComplectionChain {\n}\nreturn tableNodes.map<vscode.CompletionItem>((tableNode: TableNode) => {\n- const label = tableNode.label;\n- const completionItem = new vscode.CompletionItem(label);\n- completionItem.insertText = Util.wrap(label);\n+ const completionItem = new vscode.CompletionItem(tableNode.label);\n+ completionItem.insertText = Util.wrap(tableNode.table);\nswitch (tableNode.contextValue) {\ncase ModelType.TABLE:\ncompletionItem.kind = vscode.CompletionItemKind.Function;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support comment
|
141,908 |
25.04.2020 21:52:49
| -28,800 |
81dd65f4362c6f2425cfe3b5001080ec342940c0
|
fix detech database name incomplete
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -44,8 +44,18 @@ export class ConnectionManager {\nif (fileName.includes('cweijan.vscode-mysql-client')) {\nconst queryName = path.basename(fileName, path.extname(fileName))\n- // TODO\n- const [host, port, user, database] = queryName.split('_')\n+ const filePattern = queryName.split('_');\n+ const [host, port, user] = filePattern\n+ let database: string;\n+ if (filePattern.length >= 4) {\n+ database = filePattern[3]\n+ if (filePattern.length >= 4) {\n+ for (let index = 4; index < filePattern.length; index++) {\n+ database = `${database}_${filePattern[index]}`\n+ }\n+ }\n+ }\n+\nif (host != null && port != null && user != null) {\nreturn this.getConnection({\nhost, port, user, database, getConnectId: () => `${host}_${port}_${user}`\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix detech database name incomplete
|
141,908 |
26.04.2020 00:09:37
| -28,800 |
d40df73de394f9dda0aeb475d489e8f77f6b627f
|
support delimiter in batch query
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -7,14 +7,25 @@ export class Constants {\npublic static DEFAULT_SIZE = 100;\n}\n-export enum Pattern {\n- TABLE_PATTERN = \"\\\\b(from|join|update|into)\\\\b\\\\s*`?((\\\\w|\\\\.|-)+)`?\",\n- DML_PATTERN = \"\\\\b(update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\"\n+export class Pattern {\n+ public static TABLE_PATTERN = \"\\\\b(from|join|update|into)\\\\b\\\\s*`?((\\\\w|\\\\.|-)+)`?\";\n+ public static DML_PATTERN = \"\\\\b(update|into)\\\\b\\\\s*`{0,1}(\\\\w|\\\\.|-)+`{0,1}\";\n+ public static MULTI_PATTERN = /\\b(TRIGGER|PROCEDURE|FUNCTION)\\b/ig\n}\n-export class CacheKey {\n- public static ConectionsKey = \"mysql.connections\";\n- public static CollapseSate = \"mysql.database.cache.collapseState\";\n+export class OperateType {\n+ public static execute = 'execute';\n+ public static init = 'init';\n+ public static previous = 2;\n+ public static next = 3;\n+ public static save = 4;\n+ public static delete = 5;\n+ public static export = 6;\n+}\n+\n+export enum CacheKey {\n+ ConectionsKey = \"mysql.connections\",\n+ CollapseSate = \"mysql.database.cache.collapseState\"\n}\nexport enum ConfigKey {\n@@ -22,9 +33,9 @@ export enum ConfigKey {\n}\n-export class CommandKey {\n- public static RecordHistory = \"mysql.history.record\";\n- public static Refresh = \"mysql.refresh\";\n+export enum CommandKey {\n+ RecordHistory = \"mysql.history.record\",\n+ Refresh = \"mysql.refresh\"\n}\nexport class Cursor {\n@@ -38,26 +49,13 @@ export enum Confirm {\nYES = \"YES\", NO = \"NO\"\n}\n-export class ModelType {\n- public static CONNECTION = \"connection\";\n- public static DATABASE = \"database\";\n- public static USER_GROUP = \"userGroup\";\n- public static USER = \"user\";\n- public static TABLE = \"table\";\n- public static COLUMN = \"column\";\n- public static INFO = \"info\";\n- public static TABLE_GROUP = \"tableGroup\";\n- public static VIEW = \"view\";\n- public static VIEW_GROUP = \"viewGroup\";\n- public static TRIGGER_GROUP = \"triggerGroup\";\n- public static TRIGGER = \"trigger\";\n- public static PROCEDURE_GROUP = \"procedureGroup\";\n- public static PROCEDURE = \"procedure\";\n- public static FUNCTION_GROUP = \"functionGroup\";\n- public static FUNCTION = \"function\";\n+export enum ModelType {\n+ CONNECTION = \"connection\", DATABASE = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\n+ TABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\n+ VIEW = \"view\", VIEW_GROUP = \"viewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\n+ PROCEDURE_GROUP = \"procedureGroup\", PROCEDURE = \"procedure\", FUNCTION_GROUP = \"functionGroup\", FUNCTION = \"function\"\n}\n-\nexport enum MessageType {\nDATA = 'DATA',\nDML = 'DML',\n@@ -66,14 +64,3 @@ export enum MessageType {\nRUN = \"RUN\",\nMESSAGE = \"MESSAGE\"\n}\n\\ No newline at end of file\n-\n-\n-export class OperateType {\n- public static execute = 'execute';\n- public static init = 'init';\n- public static previous = 2;\n- public static next = 3;\n- public static save = 4;\n- public static delete = 5;\n- public static export = 6;\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -5,7 +5,7 @@ import { Pattern, Confirm } from \"./Constants\";\nexport class Util {\n- public static getTableName(sql: string, tablePattern: Pattern): string {\n+ public static getTableName(sql: string, tablePattern: string): string {\nconst tableMatch = new RegExp(tablePattern, 'img').exec(sql)\nif (tableMatch) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -3,7 +3,7 @@ import * as fs from \"fs\";\nimport * as mysql from \"mysql\";\nimport { Connection } from \"mysql\";\nimport * as vscode from \"vscode\";\n-import { CommandKey, ConfigKey, Cursor, MessageType } from \"../common/Constants\";\n+import { CommandKey, ConfigKey, Cursor, MessageType, Pattern } from \"../common/Constants\";\nimport { Global } from \"../common/Global\";\nimport { Console } from \"../common/OutputChannel\";\nimport { FileManager, FileModel } from \"../common/FileManager\";\n@@ -18,7 +18,6 @@ export class QueryUnit {\npublic static queryPromise<T>(connection: mysql.Connection, sql: string): Promise<T> {\nreturn new Promise((resolve, reject) => {\n- // Console.log(`Execute SQL:${sql}`)\nconnection.query(sql, (err: mysql.MysqlError, rows) => {\nif (err) {\nConsole.log(`Execute sql fail : ${sql}`);\n@@ -33,7 +32,6 @@ export class QueryUnit {\nprivate static ddlPattern = /^(alter|create|drop)/ig;\nprivate static dmlPattern = /^(insert|update|delete)/ig;\n- private static multiPattern = /\\b(TRIGGER|PROCEDURE|FUNCTION)\\b/ig;\npublic static async runQuery(sql?: string, connectionNode?: Node): Promise<null> {\nif (!sql && !vscode.window.activeTextEditor) {\nvscode.window.showWarningMessage(\"No SQL file selected\");\n@@ -70,7 +68,8 @@ export class QueryUnit {\nif (isDDL == null && isDML == null) {\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n}\n- if (!sql.match(this.multiPattern)) {\n+ sql = this.delimiterBuild(sql)\n+ if (!sql.match(Pattern.MULTI_PATTERN)) {\nconst sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '')\nif (sqlList.length > 1) {\nconst success = await this.runBatch(connection, sqlList)\n@@ -169,20 +168,36 @@ export class QueryUnit {\nconst fileSize = stats.size;\nif (fileSize > 1024 * 1024 * 100) {\nvscode.window.showErrorMessage(`Import sql exceed max limit 100M!`)\n- return;\n// if (await this.executeByLine(connection, fsPath)) {\n// Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n// }\n} else {\n- const fileContent = fs.readFileSync(fsPath, 'utf8');\n+ const fileContent = this.delimiterBuild(fs.readFileSync(fsPath, 'utf8'));\n+ if (fileContent.match(Pattern.MULTI_PATTERN)) {\nconst sqlList = fileContent.split(\";\")\n- this.runBatch(connection, sqlList)\n- Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n+ await this.runBatch(connection, sqlList)\n+ } else {\n+ await this.queryPromise(connection, fileContent)\n}\n+ Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\nvscode.commands.executeCommand(CommandKey.Refresh)\n+ }\n}\n+ private static delimiterPattern = /\\bdelimiter\\b\\s*([\\$\\.\\(\\)\\[\\]\\'\\\"\\\\\\/\\w]+)/ig;\n+ private static delimiterBuild(sql: string): string {\n+\n+ let delimiterMatch = this.delimiterPattern.exec(sql)\n+ while (delimiterMatch != null) {\n+ sql = sql.replace(delimiterMatch[0], \"\")\n+ const target = delimiterMatch[1].split(\"\").map((c) => c.match(/\\w/) ? c : \"\\\\\" + c).join(\"\");\n+ sql = sql.replace(new RegExp(`${target}\\\\s*$`, 'gm'), \";\")\n+ delimiterMatch = this.delimiterPattern.exec(sql)\n+ }\n+ return sql;\n+ }\n+\n/**\n* TODO: have problem, fail\n* @param connection\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -105,11 +105,13 @@ export function activate(context: vscode.ExtensionContext) {\n},\n\"mysql.data.import\": (iNode: DatabaseNode | ConnectionNode) => {\nvscode.window.showOpenDialog({ filters: { Sql: ['sql'] }, canSelectMany: false, openLabel: \"Select sql file to import\", canSelectFiles: true, canSelectFolders: false }).then((filePath) => {\n+ if (filePath)\niNode.importData(filePath[0].fsPath);\n});\n},\n\"mysql.data.export\": (iNode: TableNode | DatabaseNode) => {\nvscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\n+ if (folderPath)\niNode.backupData(folderPath[0].fsPath);\n});\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,7 +3,7 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class KeywordChain implements ComplectionChain {\n- private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"COMMENT\", \"rollback\", \"commit\", \"begin\"];\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"COMMENT\", \"rollback\", \"commit\", \"begin\",\"DELIMITER\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\n"
},
{
"change_type": "MODIFY",
"old_path": "syntaxes/mysql.tmLanguage.json",
"new_path": "syntaxes/mysql.tmLanguage.json",
"diff": "\"scopeName\": \"source.sql\",\n\"patterns\": [\n{\n- \"match\": \"(?i)\\\\b(DEFAULT|long|double|AUTO_INCREMENT|TRIGGER|DEFINER|FOR|EACH|CURSOR|VIEW|IDENTIFIED|PRIVILEGES|FLUSH|SHOW|INDEX|CHANGE|COMMENT|COLUMN|ADD|UNIQUE|EXPLAIN|USER|ALL)\\\\b\",\n+ \"match\": \"(?i)\\\\b(DEFAULT|long|double|AUTO_INCREMENT|TRIGGER|DEFINER|FOR|EACH|CURSOR|VIEW|IDENTIFIED|PRIVILEGES|FLUSH|SHOW|INDEX|CHANGE|COMMENT|COLUMN|ADD|UNIQUE|EXPLAIN|USER|ALL|DELIMITER)\\\\b\",\n\"name\": \"keyword.mysql\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tslint.json",
"new_path": "tslint.json",
"diff": "],\n\"trailing-comma\":false,\n\"semicolon\":false,\n+ \"curly\":false,\n\"no-empty\": false,\n\"object-literal-sort-keys\": false,\n\"interface-name\": false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support delimiter in batch query
|
141,908 |
26.04.2020 00:56:37
| -28,800 |
a7edaa16a16af1e0719dcfdd6a30fc81235509ef
|
support simply delimiter
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -11,6 +11,7 @@ import { Node } from \"../model/interface/node\";\nimport { QueryPage } from \"../view/result/query\";\nimport { DataResponse, DMLResponse, ErrorResponse, MessageResponse, RunResponse } from \"../view/result/queryResponse\";\nimport { ConnectionManager } from \"./ConnectionManager\";\n+import { DelimiterHolder } from \"../extension/delimiterHolder\";\nexport class QueryUnit {\n@@ -32,6 +33,7 @@ export class QueryUnit {\nprivate static ddlPattern = /^(alter|create|drop)/ig;\nprivate static dmlPattern = /^(insert|update|delete)/ig;\n+ protected static delimiterHodler = new DelimiterHolder()\npublic static async runQuery(sql?: string, connectionNode?: Node): Promise<null> {\nif (!sql && !vscode.window.activeTextEditor) {\nvscode.window.showWarningMessage(\"No SQL file selected\");\n@@ -65,10 +67,11 @@ export class QueryUnit {\nconst executeTime = new Date().getTime();\nconst isDDL = sql.match(this.ddlPattern);\nconst isDML = sql.match(this.dmlPattern);\n+ sql = this.delimiterHodler.parseBatch(sql, connectionNode.getConnectId())\nif (isDDL == null && isDML == null) {\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n}\n- sql = this.delimiterBuild(sql)\n+\nif (!sql.match(Pattern.MULTI_PATTERN)) {\nconst sqlList: string[] = sql.split(\";\").filter((s) => s.trim() != '')\nif (sqlList.length > 1) {\n@@ -77,6 +80,11 @@ export class QueryUnit {\nreturn;\n}\n}\n+ if (!sql) {\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `empty query`, success: false } as MessageResponse });\n+ return\n+ }\n+\nconnection.query(sql, (err: mysql.MysqlError, data, fields?: mysql.FieldInfo[]) => {\nif (err) {\nQueryPage.send({ type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\n@@ -99,7 +107,7 @@ export class QueryUnit {\nQueryPage.send({ type: MessageType.DATA, connection: connectionNode, res: { sql, costTime, data, fields } as DataResponse });\nreturn;\n}\n- QueryPage.send({ type: MessageType.MESSAGE, res: { msg: `Execute sql success : ${sql}`, costTime } });\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n});\n}\n@@ -172,7 +180,7 @@ export class QueryUnit {\n// Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n// }\n} else {\n- const fileContent = this.delimiterBuild(fs.readFileSync(fsPath, 'utf8'));\n+ const fileContent = this.delimiterHodler.parseBatch(fs.readFileSync(fsPath, 'utf8'));\nif (fileContent.match(Pattern.MULTI_PATTERN)) {\nconst sqlList = fileContent.split(\";\")\nawait this.runBatch(connection, sqlList)\n@@ -185,19 +193,6 @@ export class QueryUnit {\n}\n- private static delimiterPattern = /\\bdelimiter\\b\\s*([\\$\\.\\(\\)\\[\\]\\'\\\"\\\\\\/\\w]+)/ig;\n- private static delimiterBuild(sql: string): string {\n-\n- let delimiterMatch = this.delimiterPattern.exec(sql)\n- while (delimiterMatch != null) {\n- sql = sql.replace(delimiterMatch[0], \"\")\n- const target = delimiterMatch[1].split(\"\").map((c) => c.match(/\\w/) ? c : \"\\\\\" + c).join(\"\");\n- sql = sql.replace(new RegExp(`${target}\\\\s*$`, 'gm'), \";\")\n- delimiterMatch = this.delimiterPattern.exec(sql)\n- }\n- return sql;\n- }\n-\n/**\n* TODO: have problem, fail\n* @param connection\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/extension/delimiterHolder.ts",
"diff": "+export class DelimiterHolder {\n+\n+ private delimiterPattern = /\\bdelimiter\\b\\s*([;\\$\\.\\(\\)\\[\\]\\'\\\"\\\\\\/\\w]+)/ig;\n+ private delimiteMap = new Map<string, string>();\n+\n+ public get(key: string) {\n+ const delimiter = this.delimiteMap.get(key);\n+ if (!delimiter) return \";\"\n+ return delimiter\n+ }\n+\n+\n+ public parseBatch(sql: string, key?: string): string {\n+ if (!sql) return sql;\n+\n+ const delimiterArray = []\n+ if (key) {\n+ const delimiter = this.delimiteMap.get(key)\n+ delimiterArray.push(delimiter)\n+ }\n+\n+ let delimiterMatch: RegExpExecArray\n+ while ((delimiterMatch = this.delimiterPattern.exec(sql)) != null) {\n+ const target = delimiterMatch[1].split(\"\").map((c) => c.match(/\\w/) ? c : \"\\\\\" + c).join(\"\")\n+ delimiterArray.push(target)\n+ if (key) {\n+ this.delimiteMap.set(key, target)\n+ }\n+ }\n+\n+ if (delimiterArray.length > 0) {\n+ sql = sql.replace(this.delimiterPattern, \"\")\n+ for (const delimiter of delimiterArray) {\n+ sql = this.buildDelimiter(sql, delimiter)\n+ }\n+ }\n+\n+ return sql;\n+ }\n+\n+ private buildDelimiter(sql: string, delimiter: string) {\n+ if (!sql || !delimiter) return sql;\n+ return sql.replace(new RegExp(`${delimiter}\\\\s*$`, 'gm'), \";\")\n+ }\n+\n+}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support simply delimiter
|
141,908 |
26.04.2020 15:22:06
| -28,800 |
1e9d1e65516f76313f31aad4080603c9971a2ec2
|
fix get connectionId not found
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -21,8 +21,7 @@ export class ConnectionManager {\npublic static removeConnection(id: string) {\nconst lcp = this.lastConnectionNode;\n- const key = lcp.getConnectId();\n- if (key == id) {\n+ if (lcp && lcp.getConnectId() == id) {\ndelete this.lastConnectionNode\n}\nconst activeConnect = this.activeConnection[id];\n@@ -69,7 +68,9 @@ export class ConnectionManager {\n}\npublic static getConnection(connectionNode: Node, changeActive: boolean = false): Promise<mysql.Connection> {\n-\n+ if (!connectionNode.getConnectId) {\n+ connectionNode.getConnectId = () => `${connectionNode.host}_${connectionNode.port}_${connectionNode.user}`\n+ }\nif (changeActive) {\nthis.lastConnectionNode = connectionNode;\nGlobal.updateStatusBarItems(connectionNode);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix get connectionId not found
|
141,908 |
26.04.2020 15:32:29
| -28,800 |
50db579983b9e6d13043e395c6b607799dc39dc3
|
support backup from ssh tunnel
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -50,11 +50,11 @@ export class DatabaseNode extends Node implements CopyAble {\nConsole.log(`Doing backup ${this.host}_${this.name}...`);\nmysqldump({\nconnection: {\n- host: this.host,\n- user: this.user,\n- password: this.password,\n+ host: this.usingSSH ? this.origin.host : this.host,\n+ user: this.usingSSH ? this.origin.user : this.user,\n+ password: this.usingSSH ? this.origin.password : this.password,\ndatabase: this.name,\n- port: parseInt(this.port),\n+ port: this.usingSSH ? this.ssh.tunnelPort : parseInt(this.port),\n},\ndump: {\nschema: {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support backup from ssh tunnel
|
141,908 |
26.04.2020 16:23:23
| -28,800 |
136968cb1739bbef4f15d72fdc6448169c72be30
|
template in diffrenct file
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -64,3 +64,9 @@ export enum MessageType {\nRUN = \"RUN\",\nMESSAGE = \"MESSAGE\"\n}\n+\n+export enum Template {\n+ create = \"create-template.sql\",\n+ table = \"sql-template.sql\",\n+ alter = \"alter-template.sql\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -174,10 +174,10 @@ export class QueryUnit {\n}\nprivate static sqlDocument: vscode.TextEditor;\n- public static async showSQLTextDocument(sql: string = \"\") {\n+ public static async showSQLTextDocument(sql: string = \"\", template = \"template.sql\") {\nthis.sqlDocument = await vscode.window.showTextDocument(\n- await vscode.workspace.openTextDocument(await FileManager.record(\"template.sql\", sql, FileModel.WRITE))\n+ await vscode.workspace.openTextDocument(await FileManager.record(template, sql, FileModel.WRITE))\n);\nreturn this.sqlDocument;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "import * as path from \"path\";\nimport * as vscode from \"vscode\";\n-import { Constants, ModelType } from \"../../common/Constants\";\n+import { Constants, ModelType, Template } from \"../../common/Constants\";\nimport { Util } from \"../../common/util\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { QueryUnit } from \"../../database/QueryUnit\";\n@@ -36,7 +36,7 @@ export class UserGroup extends DatabaseNode {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.showSQLTextDocument(`CREATE USER 'username'@'%' IDENTIFIED BY 'password';`);\n+ QueryUnit.showSQLTextDocument(`CREATE USER 'username'@'%' IDENTIFIED BY 'password';`,Template.create);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/functionGroup.ts",
"new_path": "src/model/main/functionGroup.ts",
"diff": "import * as path from \"path\";\n-import { Constants, ModelType } from \"../../common/constants\";\n+import { Constants, ModelType, Template } from \"../../common/constants\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { QueryUnit } from \"../../database/QueryUnit\";\n@@ -46,7 +46,7 @@ export class FunctionGroup extends Node {\nFUNCTION [name]() RETURNS [TYPE]\nBEGIN\nreturn [value];\n-END;`);\n+END;`,Template.create);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedureGroup.ts",
"new_path": "src/model/main/procedureGroup.ts",
"diff": "import * as path from \"path\";\n-import { Constants, ModelType } from \"../../common/constants\";\n+import { Constants, ModelType, Template } from \"../../common/constants\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { QueryUnit } from \"../../database/QueryUnit\";\n@@ -46,7 +46,7 @@ export class ProcedureGroup extends Node {\nPROCEDURE [name]()\nBEGIN\n-END;`);\n+END;`,Template.create);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -6,7 +6,7 @@ import { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { TableNode } from \"./tableNode\";\n-import { Constants, ModelType } from \"../../common/constants\";\n+import { Constants, ModelType, Template } from \"../../common/constants\";\nexport class TableGroup extends Node {\n@@ -46,6 +46,6 @@ export class TableGroup extends Node {\nQueryUnit.showSQLTextDocument(`CREATE TABLE tableName(\nid int NOT NULL primary key AUTO_INCREMENT,\ncolumn varchar(length)\n-);`);\n+);`,Template.create);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -6,7 +6,7 @@ import { ColumnNode } from \"../other/columnNode\";\nimport { InfoNode } from \"../other/infoNode\";\nimport { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\n-import { ModelType, Constants } from \"../../common/constants\";\n+import { ModelType, Constants, Template } from \"../../common/constants\";\nimport { Console } from \"../../common/outputChannel\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { MySQLTreeDataProvider } from \"../../provider/mysqlTreeDataProvider\";\n@@ -59,7 +59,7 @@ export class TableNode extends Node implements CopyAble {\nQueryUnit.showSQLTextDocument(`ALTER TABLE\n${Util.wrap(this.database)}.${Util.wrap(this.table)}\nADD\n- COLUMN [column] [type] NOT NULL comment '';`);\n+ COLUMN [column] [type] NOT NULL comment '';`,Template.alter);\n}\n@@ -110,7 +110,7 @@ ADD\npublic indexTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`-- ALTER TABLE \\`${this.database}\\`.\\`${this.table}\\` DROP INDEX [indexName];\n--- ALTER TABLE \\`${this.database}\\`.\\`${this.table}\\` ADD [UNIQUE|KEY|PRIMARY KEY] INDEX ([column]);`);\n+-- ALTER TABLE \\`${this.database}\\`.\\`${this.table}\\` ADD [UNIQUE|KEY|PRIMARY KEY] INDEX ([column]);`,Template.alter);\nsetTimeout(() => {\nQueryUnit.runQuery(`SELECT COLUMN_NAME name,table_schema,index_name,non_unique FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${this.database}' and table_name='${this.table}';`, this);\n}, 10);\n@@ -125,7 +125,7 @@ ADD\nConnectionManager.getConnection(this, true);\nQueryUnit.runQuery(sql, this);\n} else {\n- QueryUnit.showSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql,Template.table);\n}\n}\n@@ -142,7 +142,7 @@ ADD\nsql += \"values\\n \";\nsql += `(${childrenValues.toString().replace(/,/g, \", \")}\\n );`;\nif (show) {\n- QueryUnit.showSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql,Template.table);\n}\nresolve(sql)\n});\n@@ -159,7 +159,7 @@ ADD\nlet sql = `delete from \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and\")}`;\n- QueryUnit.showSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql,Template.table);\n});\n}\n@@ -175,7 +175,7 @@ ADD\nlet sql = `update \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\nset \\n ${sets.toString().replace(/,/g, \",\\n \")}\\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and \")}`;\n- QueryUnit.showSQLTextDocument(sql);\n+ QueryUnit.showSQLTextDocument(sql,Template.table);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/triggerGroup.ts",
"new_path": "src/model/main/triggerGroup.ts",
"diff": "@@ -5,7 +5,7 @@ import { InfoNode } from \"../other/infoNode\";\nimport { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\n-import { Constants, ModelType } from \"../../common/constants\";\n+import { Constants, ModelType, Template } from \"../../common/constants\";\nimport { TriggerNode } from \"./trigger\";\nexport class TriggerGroup extends Node {\n@@ -50,7 +50,7 @@ TRIGGER [name] BEFORE/AFTER INSERT/UPDATE/DELETE\nON [table]\nFOR EACH ROW BEGIN\n-END;`);\n+END;`,Template.create);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -5,7 +5,7 @@ import { Node } from \"../interface/node\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\nimport { TableNode } from \"./tableNode\";\n-import { Constants, ModelType } from \"../../common/constants\";\n+import { Constants, ModelType, Template } from \"../../common/constants\";\nimport { ViewNode } from \"./viewNode\";\nexport class ViewGroup extends Node {\n@@ -47,7 +47,7 @@ export class ViewGroup extends Node {\n/* [DEFINER = { user | CURRENT_USER }]*/\nVIEW \\`name\\`\nAS\n-(SELECT * FROM ...);`);\n+(SELECT * FROM ...);`, Template.create);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnNode.ts",
"new_path": "src/model/other/columnNode.ts",
"diff": "import * as path from \"path\";\nimport * as vscode from \"vscode\";\nimport { Node } from \"../interface/node\";\n-import { ModelType, Constants } from \"../../common/constants\";\n+import { ModelType, Constants, Template } from \"../../common/constants\";\nimport { QueryUnit } from \"../../database/QueryUnit\";\nimport { DatabaseCache } from \"../../database/DatabaseCache\";\nimport { ConnectionManager } from \"../../database/ConnectionManager\";\n@@ -65,11 +65,12 @@ export class ColumnNode extends Node implements CopyAble {\npublic updateColumnTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`ALTER TABLE\n- ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${this.column.nullable ? \"\" : \" NOT NULL\"}${this.column.comment ? ` comment '${this.column.comment}'` : \"\"};`);\n+ ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${this.column.nullable ? \"\" : \" NOT NULL\"}${this.column.comment ? ` comment '${this.column.comment}'` : \"\"};`\n+ , Template.alter);\n}\npublic dropColumnTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.showSQLTextDocument(`ALTER TABLE \\n\\t${wrap(this.database)}.${wrap(this.table)} DROP COLUMN ${wrap(this.column.name)};`);\n+ QueryUnit.showSQLTextDocument(`ALTER TABLE \\n\\t${wrap(this.database)}.${wrap(this.table)} DROP COLUMN ${wrap(this.column.name)};`, Template.alter);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
template in diffrenct file
|
141,908 |
26.04.2020 17:39:29
| -28,800 |
35da89ba1c69796e4a85c9515b5124c47eeae416
|
support config delimiter
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"integer\",\n\"default\": 500,\n\"description\": \"The maximum table count shown in the tree view\"\n+ },\n+ \"vscode-mysql.enableDelimiter\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Support delimiter when import sql.\"\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -30,6 +30,7 @@ export enum CacheKey {\nexport enum ConfigKey {\nMAX_TABLE_COUNT = \"maxTableCount\",\n+ ENABLE_DELIMITER = \"enableDelimiter\",\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/database/QueryUnit.ts",
"new_path": "src/database/QueryUnit.ts",
"diff": "@@ -69,6 +69,10 @@ export class QueryUnit {\nconst isDML = sql.match(this.dmlPattern);\nconst parseResult = this.delimiterHodler.parseBatch(sql, connectionNode.getConnectId())\nsql = parseResult.sql\n+ if (!sql && parseResult.replace) {\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `change delimiter success`, success: true } as MessageResponse });\n+ return;\n+ }\nif (isDDL == null && isDML == null && sql) {\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n}\n@@ -83,16 +87,6 @@ export class QueryUnit {\n}\n}\n-\n- if (!sql) {\n- if (parseResult.replace) {\n- QueryPage.send({ type: MessageType.MESSAGE, res: { message: `change delimiter success`, success: true } as MessageResponse });\n- } else {\n- QueryPage.send({ type: MessageType.MESSAGE, res: { message: `empty query`, success: false } as MessageResponse });\n- }\n- return\n- }\n-\nconnection.query(sql, (err: mysql.MysqlError, data, fields?: mysql.FieldInfo[]) => {\nif (err) {\nQueryPage.send({ type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\n@@ -157,7 +151,10 @@ export class QueryUnit {\npublic static obtainCursorSql(document: vscode.TextDocument, current: vscode.Position, content?: string, delimiter?: string) {\nif (!content) { content = document.getText(new vscode.Range(new vscode.Position(0, 0), current)); }\n- const sqlList = content.split(delimiter ? delimiter.replace(/\\\\/g, \"\") : \";\");\n+ if (delimiter) {\n+ content = content.replace(new RegExp(delimiter, 'g'), \";\")\n+ }\n+ const sqlList = content.split(\";\");\nconst docCursor = document.getText(Cursor.getRangeStartTo(current)).length;\nlet index = 0;\nfor (let i = 0; i < sqlList.length; i++) {\n@@ -187,13 +184,17 @@ export class QueryUnit {\nconst stats = fs.statSync(fsPath);\nconst startTime = new Date();\nconst fileSize = stats.size;\n- if (fileSize > 1024 * 1024 * 100) {\n- vscode.window.showErrorMessage(`Import sql exceed max limit 100M!`)\n+ if (fileSize > 1024 * 1024 * 200) {\n+ vscode.window.showErrorMessage(`Import sql exceed max limit 200M!`)\n// if (await this.executeByLine(connection, fsPath)) {\n// Console.log(`import success, cost time : ${new Date().getTime() - startTime.getTime()}ms`);\n// }\n} else {\n- const { sql: fileContent } = this.delimiterHodler.parseBatch(fs.readFileSync(fsPath, 'utf8'));\n+ let fileContent = fs.readFileSync(fsPath, 'utf8');\n+ if (Global.getConfig<boolean>(ConfigKey.ENABLE_DELIMITER)) {\n+ const parse = this.delimiterHodler.parseBatch(fileContent)\n+ fileContent = parse.sql\n+ }\nif (fileContent.match(Pattern.MULTI_PATTERN)) {\nawait this.queryPromise(connection, fileContent)\n} else {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support config delimiter
|
141,908 |
27.04.2020 08:55:29
| -28,800 |
5280d0778ba496296d5c60701c08a8ba7df2cd9b
|
update complection kind
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,13 +3,13 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class KeywordChain implements ComplectionChain {\n- private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"COMMENT\", \"rollback\", \"commit\", \"begin\",\"DELIMITER\"];\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"COMMENT\", \"rollback\", \"commit\", \"begin\", \"DELIMITER\", \"CALL\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\nthis.keywordList.forEach((keyword) => {\nconst keywordComplectionItem = new vscode.CompletionItem(keyword + \" \");\n- keywordComplectionItem.kind = vscode.CompletionItemKind.Property;\n+ keywordComplectionItem.kind = vscode.CompletionItemKind.Keyword;\nthis.keywordComplectionItems.push(keywordComplectionItem);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/tableCreateChain.ts",
"new_path": "src/provider/Complection/chain/tableCreateChain.ts",
"diff": "@@ -7,9 +7,10 @@ export class TableCreateChain implements ComplectionChain {\nprivate tableKeywordComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\n+\nthis.tableKeywordList.forEach((keyword) => {\nconst keywordComplectionItem = new vscode.CompletionItem(keyword + \" \");\n- keywordComplectionItem.kind = vscode.CompletionItemKind.Property;\n+ keywordComplectionItem.kind = vscode.CompletionItemKind.Keyword;\nthis.tableKeywordComplectionItems.push(keywordComplectionItem);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/typeKeywordChain.ts",
"new_path": "src/provider/Complection/chain/typeKeywordChain.ts",
"diff": "@@ -10,7 +10,7 @@ export class TypeKeywordChain implements ComplectionChain {\nconstructor() {\nthis.typeList.forEach((columnType) => {\nconst columnTypeComplectionItem = new vscode.CompletionItem(columnType + \" \");\n- columnTypeComplectionItem.kind = vscode.CompletionItemKind.TypeParameter;\n+ columnTypeComplectionItem.kind = vscode.CompletionItemKind.Variable;\nthis.typeComplectionItems.push(columnTypeComplectionItem);\n});\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update complection kind
|
141,908 |
27.04.2020 11:32:23
| -28,800 |
17ced296f15b5c6751c7290d48c1d3a967c1002e
|
fix get connect id fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/database/ConnectionManager.ts",
"new_path": "src/database/ConnectionManager.ts",
"diff": "@@ -101,9 +101,9 @@ export class ConnectionManager {\nif (!port) {\nreject(\"create ssh tunnel fail!\");\nreturn;\n- } else {\n- connectionNode = { ...connectionNode.origin, port, getConnectId: connectionNode.getConnectId } as any as Node\n}\n+ const ssh = connectionNode.ssh;\n+ connectionNode = { ...connectionNode.origin, port, getConnectId: () => `${ssh.host}_${ssh.port}_${connectionNode.user}` } as any as Node\n}\nthis.activeConnection[key] = this.createConnection(connectionNode);\nthis.activeConnection[key].connect((err: Error) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/databaseChain.ts",
"new_path": "src/provider/Complection/chain/databaseChain.ts",
"diff": "@@ -31,6 +31,7 @@ export class DatabaseChain implements ComplectionChain {\nconst connectcionid = `${lcp.getConnectId()}`;\nconst databaseNodes = DatabaseCache.getDatabaseListOfConnection(connectcionid);\n+ if (databaseNodes == null) { return []; }\nreturn databaseNodes.filter((databaseNode) => !(databaseNode instanceof UserGroup)).map<vscode.CompletionItem>((databaseNode) => {\nconst label = databaseNode.label;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix get connect id fail
|
141,908 |
27.04.2020 13:10:45
| -28,800 |
47f0d834ec18828aac92840921c3599645fd9e9c
|
fix mock bugs
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension/mock/mockRunner.ts",
"new_path": "src/extension/mock/mockRunner.ts",
"diff": "@@ -86,8 +86,9 @@ export class MockRunner {\nlet tempInsertSql = insertSqlTemplate;\nfor (const column in mockData) {\nlet value = mockData[column].value;\n+ if (value && (typeof value == \"string\")) { value = value.replace(/^'|'$/g, \"\\\\'\") }\nif (value == this.MOCK_INDEX) { value = i; }\n- tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column, 'ig'), this.wrapQuote(mockData[column].type, Mock.mock(value)));\n+ tempInsertSql = tempInsertSql.replace(new RegExp(\"\\\\$+\" + column + \"(,|\\\\s)\", 'ig'), this.wrapQuote(mockData[column].type, Mock.mock(value)) + \"$1\");\n}\nsqlList.push(tempInsertSql)\n}\n@@ -104,8 +105,10 @@ export class MockRunner {\nprivate wrapQuote(type: string, value: any): any {\ntype = type.toLowerCase()\nswitch (type) {\n- case \"varchar\": case \"char\": case \"date\": case \"time\": case \"timestamp\": case \"datetime\":\n+ case \"varchar\": case \"char\": case \"date\": case \"time\": case \"timestamp\": case \"datetime\": case \"set\": case \"json\":\nreturn `'${value}'`\n+ default:\n+ if (type.indexOf(\"text\") != -1 || type.indexOf(\"blob\") != -1) { return `'${value}'` }\n}\nreturn value;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tslint.json",
"new_path": "tslint.json",
"diff": "],\n\"trailing-comma\":false,\n\"semicolon\":false,\n- \"curly\":false,\n\"no-empty\": false,\n\"object-literal-sort-keys\": false,\n\"interface-name\": false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix mock bugs
|
141,908 |
27.04.2020 15:44:51
| -28,800 |
ff04630830ea5208466ddcbd4e1ba2b7531b7856
|
support export table struct
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"Export Data\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.struct.export\",\n+ \"title\": \"Export Table Struct\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.copy.insert\",\n\"title\": \"Insert SQL\",\n\"when\": \"view == github.cweijan.mysql && viewItem == database\",\n\"group\": \"mysql@5\"\n},\n+ {\n+ \"command\": \"mysql.struct.export\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == database\",\n+ \"group\": \"mysql@6\"\n+ },\n{\n\"command\": \"mysql.data.import\",\n\"when\": \"view == github.cweijan.mysql && viewItem == database\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"1_inline1@2\"\n},\n+ {\n+ \"command\": \"mysql.struct.export\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"group\": \"1_inline1@3\"\n+ },\n{\n\"command\": \"mysql.template.sql\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -111,7 +111,10 @@ export function activate(context: vscode.ExtensionContext) {\n});\n},\n\"mysql.data.export\": (node: Node) => {\n- serviceManager.dumpService.dump(node)\n+ serviceManager.dumpService.dump(node, true)\n+ },\n+ \"mysql.struct.export\": (node: Node) => {\n+ serviceManager.dumpService.dump(node, false)\n},\n\"mysql.template.delete\": (tableNode: TableNode) => {\ntableNode.deleteSqlTemplate();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/abstractDumpService.ts",
"new_path": "src/service/dump/abstractDumpService.ts",
"diff": "@@ -3,14 +3,14 @@ import * as vscode from \"vscode\";\nexport abstract class AbstractDumpService {\n- public dump(node: Node) {\n+ public dump(node: Node, withData: boolean) {\nvscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\nif (folderPath) {\n- this.dumpData(node, folderPath[0].fsPath)\n+ this.dumpData(node, folderPath[0].fsPath, withData)\n}\n});\n}\n- protected abstract dumpData(node: Node, exportPath: string): void;\n+ protected abstract dumpData(node: Node, exportPath: string, withData: boolean): void;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "import * as vscode from \"vscode\";\n-import mysqldump from 'mysqldump';\n+import mysqldump, { Options } from 'mysqldump';\nimport { AbstractDumpService } from \"./abstractDumpService\";\nimport format = require('date-format');\nimport { Node } from \"../../model/interface/node\";\n@@ -7,10 +7,10 @@ import { Console } from \"../../common/outputChannel\";\nimport { TableNode } from \"../../model/main/tableNode\";\nexport class MysqlDumpService extends AbstractDumpService {\n- protected dumpData(node: Node, exportPath: string): void {\n+ protected dumpData(node: Node, exportPath: string, withData: boolean): void {\nConsole.log(`Doing backup ${node.host}_${node.database}...`);\nconst tableName = node instanceof TableNode ? (node as TableNode).table : null;\n- mysqldump({\n+ const option: Options = {\nconnection: {\nhost: node.usingSSH ? node.origin.host : node.host,\nuser: node.usingSSH ? node.origin.user : node.user,\n@@ -19,18 +19,22 @@ export class MysqlDumpService extends AbstractDumpService {\nport: node.usingSSH ? node.ssh.tunnelPort : parseInt(node.port),\n},\ndump: {\n- tables: tableName ? [tableName] : null,\n+ tables: tableName ? [tableName] : [],\nschema: {\n+ format: false,\ntable: {\n- ifNotExist: true,\n+ ifNotExist: false,\ndropIfExist: true,\ncharset: true,\n- },\n- engine: false,\n+ }\n},\n},\ndumpToFile: `${exportPath}\\\\${node.database}${tableName ? \"_\" + tableName : ''}_${format('yyyy-MM-dd_hhmmss', new Date())}.sql`,\n- }).then(() => {\n+ };\n+ if (!withData) {\n+ option.dump.data = false;\n+ }\n+ mysqldump(option).then(() => {\nvscode.window.showInformationMessage(`Backup ${node.host}_${node.database} success!`);\n}).catch((err) => {\nvscode.window.showErrorMessage(`Backup ${node.host}_${node.database} fail!\\n${err}`);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support export table struct
|
141,908 |
27.04.2020 16:52:14
| -28,800 |
88596d8e2fbc003b3286fb9a4936466f76b8b61d
|
refactor view manager
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -9,6 +9,8 @@ MySQL Client For Visual Studio Code\n>\n> Give [project](https://github.com/cweijan/vscode-mysql) star keep me motivated to keep updating\n+**Features**\n+\n- [MySQL Client](#mysql-client)\n- [Connection](#connection)\n- [View Table](#view-table)\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/components/option.html",
"new_path": "resources/webview/pages/connect/components/option.html",
"diff": "<input class=\"field__input\" placeholder=\"database, can be null\" v-model=\"connectionOption.database\" />\n</div>\n</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>timezone:</b>\n+ <input class=\"field__input\" placeholder=\"timezone, can be null\" v-model=\"connectionOption.timezone\" />\n+ </div>\n+</div>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "</div>\n<script>\n- const vscode = acquireVsCodeApi();\n+ const vscode = typeof (acquireVsCodeApi) != \"undefined\" ? acquireVsCodeApi() : null;\n+ const postMessage = (message) => { if (vscode) { vscode.postMessage(message) } }\nconst vue = new Vue({\nel: '#container',\ndata: {\npassword: '',\ndatabase: null,\nusingSSH: false,\n+ timezone: null,\nssh: {\nport: 22,\nusername: 'root'\ndocument.write(\"Connect success!\")\n}\n})\n+ postMessage({ type: 'init' })\n</script>\n</body>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -21,7 +21,7 @@ import { ColumnNode } from \"./model/other/columnNode\";\nimport { Console } from \"./common/outputChannel\";\n// must be last\nimport { ServiceManager } from \"./service/serviceManager\";\n-import { SqlViewManager } from \"./view/SqlViewManager\";\n+import { ViewManager } from \"./view/viewManager\";\nimport { QueryUnit } from \"./service/queryUnit\";\nimport { Node } from \"./model/interface/node\";\n@@ -50,7 +50,7 @@ export function activate(context: vscode.ExtensionContext) {\nserviceManager.mockRunner.runMock()\n},\n\"mysql.addConnection\": () => {\n- SqlViewManager.showConnectPage(serviceManager.provider);\n+ ViewManager.showConnectPage(serviceManager.provider);\n},\n\"mysql.addDatabase\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -9,6 +9,7 @@ export abstract class Node extends vscode.TreeItem {\npublic user: string;\npublic password?: string;\npublic database?: string;\n+ public timezone?: string;\npublic certPath?: string;\npublic origin?: Node;\n@@ -33,6 +34,7 @@ export abstract class Node extends vscode.TreeItem {\nthis.user = source.user\nthis.password = source.password\nthis.database = source.database\n+ this.timezone = source.timezone\nthis.certPath = source.certPath\nthis.ssh = source.ssh\nthis.usingSSH = source.usingSSH\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -56,6 +56,7 @@ export class ConnectionManager {\n}\nif (host != null && port != null && user != null) {\n+ // TODO lost infomation\nreturn this.getConnection({\nhost, port, user, database, getConnectId: () => `${host}_${port}_${user}`\n} as Node, database != null)\n@@ -126,7 +127,7 @@ export class ConnectionManager {\nreturn new Promise(async (resolve) => {\nconst ssh = connectionNode.ssh\nif (!connectionNode.ssh.tunnelPort) {\n- connectionNode.ssh.tunnelPort = await getPort({ port: getPort.makeRange(10567, 11567) })\n+ connectionNode.ssh.tunnelPort = await getPort({ port: 10567 })\n}\nconst port = connectionNode.ssh.tunnelPort;\nconst key = `${ssh.username}_${ssh.port}_${ssh.username}`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -93,7 +93,7 @@ export class MockRunner {\nsqlList.push(tempInsertSql)\n}\n- const connection = await ConnectionManager.getConnection({ ...mockModel, getConnectId: () => `${mockModel.host}_${mockModel.port}_${mockModel.user}` } as any as Node)\n+ const connection = await ConnectionManager.getConnection({ ...mockModel, timezone: tableNode.timezone, getConnectId: () => `${mockModel.host}_${mockModel.port}_${mockModel.user}` } as any as Node)\nconst success = await QueryUnit.runBatch(connection, sqlList)\nvscode.commands.executeCommand(\"mysql.template.sql\", tableNode, true)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "import * as vscode from \"vscode\";\nimport { MockRunner } from \"./mock/mockRunner\";\nimport { ExtensionContext } from \"vscode\";\n-import { SqlViewManager } from \"../view/SqlViewManager\";\n+import { ViewManager } from \"../view/viewManager\";\nimport { DatabaseCache } from \"./databaseCache\";\nimport { FileManager } from \"../common/FileManager\";\nimport { SqlFormatProvider } from \"../provider/SqlFormatProvider\";\n@@ -29,7 +29,7 @@ export class ServiceManager {\nthis.mockRunner = new MockRunner();\nthis.historyService = new HistoryService()\nDatabaseCache.initCache(context);\n- SqlViewManager.initExtesnsionPath(context.extensionPath);\n+ ViewManager.initExtesnsionPath(context.extensionPath);\nFileManager.init(context)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "-import * as vscode from \"vscode\";\n-import { WebviewPanel } from \"vscode\";\nimport { MessageType, OperateType } from \"../../common/Constants\";\n-import { SqlViewManager } from \"../SqlViewManager\";\n+import { Node } from \"../../model/interface/node\";\n+import { ColumnNode } from \"../../model/other/columnNode\";\nimport { DatabaseCache } from \"../../service/databaseCache\";\nimport { QueryUnit } from \"../../service/queryUnit\";\n-import { ColumnNode } from \"../../model/other/columnNode\";\n+import { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\n-import { Node } from \"../../model/interface/node\";\nexport class QueryParam<T> {\n- public type: MessageType;\n/**\n- * using in loadColumnList\n+ * using in loadColumnList.\n*/\npublic connection?: Node;\n+ public type: MessageType;\npublic res: T;\n}\nexport class QueryPage {\n- private static resultWebviewPanel: WebviewPanel;\n- /**\n- * ensure send newest message.\n- */\n- private static sendData: any;\n- private static creating = false;\n+\npublic static async send(queryParam: QueryParam<any>) {\nswitch (queryParam.type) {\n@@ -39,38 +32,18 @@ export class QueryPage {\nbreak;\n}\n- this.sendData = queryParam;\n- if (this.creating) { return; }\n-\n- // update result webview\n- if (this.resultWebviewPanel) {\n- if (this.resultWebviewPanel.visible) {\n- this.resultWebviewPanel.webview.postMessage(QueryPage.sendData);\n- this.resultWebviewPanel.reveal(vscode.ViewColumn.Two, true);\n- return;\n- } else {\n- this.resultWebviewPanel.dispose();\n- }\n- }\n-\n- // init result webview\n- this.creating = true;\n- SqlViewManager.createWebviewPanel({\n- splitResultView: true, viewPath: \"pages/result/index\", viewTitle: \"Query\",\n- }).then(async (webviewPanel) => {\n- this.resultWebviewPanel = webviewPanel;\n- this.creating = false;\n- webviewPanel.onDidDispose(() => { this.resultWebviewPanel = undefined; this.creating = false; });\n- webviewPanel.webview.onDidReceiveMessage((params) => {\n+ ViewManager.createWebviewPanel({\n+ splitView: true, path: \"pages/result/index\", title: \"Query\",\n+ initListener: (webviewPanel) => {\n+ webviewPanel.webview.postMessage(queryParam);\n+ },\n+ receiveListener: async (_, params) => {\nswitch (params.type) {\n- case OperateType.init:\n- webviewPanel.webview.postMessage(QueryPage.sendData);\n- break;\ncase OperateType.execute:\nQueryUnit.runQuery(params.sql);\nbreak;\n}\n- });\n+ }\n});\n}\n@@ -101,8 +74,3 @@ export class QueryPage {\n}\n}\n\\ No newline at end of file\n-\n-class TableInfo {\n- public database: string;\n- public table: string;\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "src/view/SqlViewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -7,19 +7,37 @@ import { Console } from \"../common/OutputChannel\";\nimport { MySQLTreeDataProvider } from \"../provider/treeDataProvider\";\nexport class ViewOption {\n- public viewPath?: string;\n- public viewTitle?: string;\n- public splitResultView: boolean = false;\n+ public path?: string;\n+ public title?: string;\n+ public splitView: boolean = false;\n+ /**\n+ * keep single page by viewType\n+ */\n+ public singlePage?: boolean;\n+ /**\n+ * kill exists panel\n+ */\n+ public killHidden?: boolean;\n/**\n* receive webview send message\n*/\n- public receiveListener?: (message: any) => {};\n+ public receiveListener?: (viewPanel: WebviewPanel, message: any) => void;\n+ /**\n+ * callback when init success.\n+ */\n+ public initListener?: (viewPanel: WebviewPanel) => void;\n+}\n- public disposeListener?: (message: any) => {};\n+interface ViewState {\n+ instance: WebviewPanel;\n+ creating: boolean;\n+ initListener: (viewPanel: WebviewPanel) => void;\n+ receiveListener: (viewPanel: WebviewPanel, message: any) => void\n}\n-export class SqlViewManager {\n+export class ViewManager {\n+ private static viewStatu: { [key: string]: ViewState } = {};\nprivate static webviewPath: string;\npublic static initExtesnsionPath(extensionPath: string) {\nthis.webviewPath = extensionPath + \"/resources/webview\"\n@@ -28,11 +46,10 @@ export class SqlViewManager {\npublic static showConnectPage(provider: MySQLTreeDataProvider) {\nthis.createWebviewPanel({\n- viewPath: \"pages/connect/connect\",\n- viewTitle: \"connect\",\n- splitResultView: false,\n- }).then((webviewPanel) => {\n- webviewPanel.webview.onDidReceiveMessage((params) => {\n+ path: \"pages/connect/connect\",\n+ title: \"connect\",\n+ splitView: false,\n+ receiveListener: (webviewPanel, params) => {\nif (params.type === 'CONNECT_TO_SQL_SERVER') {\nconst { connectionOption } = params\nif (connectionOption.usingSSH) {\n@@ -50,16 +67,34 @@ export class SqlViewManager {\n});\n});\n}\n- });\n+ }\n});\n}\npublic static createWebviewPanel(viewOption: ViewOption): Promise<WebviewPanel> {\n- const columnType = viewOption.splitResultView ? vscode.ViewColumn.Two : vscode.ViewColumn.One;\n+ const currentStatus = this.viewStatu[viewOption.title]\n+ if (!currentStatus) { this.viewStatu[viewOption.title] = { creating: true } as ViewState }\n+\n+ if (typeof (viewOption.singlePage) == 'undefined') { viewOption.singlePage = true }\n+ if (typeof (viewOption.killHidden) == 'undefined') { viewOption.killHidden = true }\n+\n+ if (viewOption.singlePage && currentStatus) {\n+ if (viewOption.killHidden && currentStatus.instance.visible == false) {\n+ currentStatus.instance.dispose()\n+ } else {\n+ if (currentStatus.creating) {\n+ currentStatus.initListener = viewOption.initListener\n+ } else if (viewOption.initListener) {\n+ viewOption.initListener(currentStatus.instance)\n+ }\n+ if (viewOption.receiveListener) { currentStatus.receiveListener = viewOption.receiveListener }\n+ return Promise.resolve(currentStatus.instance);\n+ }\n+ }\nreturn new Promise((resolve, reject) => {\n- const targetPath = `${this.webviewPath}/${viewOption.viewPath}.html`;\n+ const targetPath = `${this.webviewPath}/${viewOption.path}.html`;\nfs.readFile(targetPath, 'utf8', async (err, data) => {\nif (err) {\nConsole.log(err);\n@@ -67,15 +102,35 @@ export class SqlViewManager {\nreturn;\n}\nconst webviewPanel = vscode.window.createWebviewPanel(\n- \"mysql.sql.result\",\n- viewOption.viewTitle,\n- { viewColumn: columnType, preserveFocus: true },\n+ viewOption.title,\n+ viewOption.title,\n+ {\n+ viewColumn: viewOption.splitView ? vscode.ViewColumn.Two : vscode.ViewColumn.One,\n+ preserveFocus: true\n+ },\n{ enableScripts: true, retainContextWhenHidden: true },\n);\nwebviewPanel.webview.html = this.buildInclude(this.buildPath(data), path.resolve(targetPath, \"..\"));\n- webviewPanel.webview.onDidReceiveMessage(viewOption.receiveListener);\n- webviewPanel.onDidDispose(viewOption.disposeListener);\n-\n+ this.viewStatu[viewOption.title] = {\n+ creating: true,\n+ instance: webviewPanel,\n+ initListener: viewOption.initListener,\n+ receiveListener: viewOption.receiveListener\n+ }\n+ webviewPanel.onDidDispose(() => {\n+ this.viewStatu[viewOption.title] = null\n+ })\n+ const newStatus = this.viewStatu[viewOption.title]\n+ webviewPanel.webview.onDidReceiveMessage((message) => {\n+ if (message.type == 'init') {\n+ newStatus.creating = false\n+ if (newStatus.initListener) {\n+ newStatus.initListener(webviewPanel)\n+ }\n+ } else if (newStatus.receiveListener) {\n+ newStatus.receiveListener(webviewPanel, message)\n+ }\n+ })\nresolve(webviewPanel);\n});\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
refactor view manager
|
141,908 |
27.04.2020 17:08:24
| -28,800 |
ae62f52e7ab192e35ff72afb067c8461257a7b4c
|
support setting query result full
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "\"js-tokens\": \"^4.0.0\"\n}\n},\n+ \"@types/async-lock\": {\n+ \"version\": \"1.1.2\",\n+ \"resolved\": \"https://registry.npmjs.org/@types/async-lock/-/async-lock-1.1.2.tgz\",\n+ \"integrity\": \"sha512-j9n4bb6RhgFIydBe0+kpjnBPYumDaDyU8zvbWykyVMkku+c2CSu31MZkLeaBfqIwU+XCxlDpYDfyMQRkM0AkeQ==\",\n+ \"dev\": true\n+ },\n\"@types/mockjs\": {\n\"version\": \"1.0.2\",\n\"resolved\": \"https://registry.npm.taobao.org/@types/mockjs/download/@types/mockjs-1.0.2.tgz\",\n\"integrity\": \"sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=\",\n\"dev\": true\n},\n+ \"async-lock\": {\n+ \"version\": \"1.2.2\",\n+ \"resolved\": \"https://registry.npmjs.org/async-lock/-/async-lock-1.2.2.tgz\",\n+ \"integrity\": \"sha512-uczz62z2fMWOFbyo6rG4NlV2SdxugJT6sZA2QcfB1XaSjEiOh8CuOb/TttyMnYQCda6nkWecJe465tGQDPJiKw==\"\n+ },\n\"asynckit\": {\n\"version\": \"0.4.0\",\n\"resolved\": \"https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz\",\n},\n\"builtin-modules\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz\",\n\"integrity\": \"sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=\",\n\"dev\": true\n},\n},\n\"color-name\": {\n\"version\": \"1.1.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz\",\n\"integrity\": \"sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=\",\n\"dev\": true\n},\n},\n\"lodash.defaults\": {\n\"version\": \"4.2.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz\",\n\"integrity\": \"sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=\"\n},\n\"long\": {\n},\n\"sprintf-js\": {\n\"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz\",\n\"integrity\": \"sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=\",\n\"dev\": true\n},\n},\n\"ssh2\": {\n\"version\": \"0.5.4\",\n- \"resolved\": \"https://registry.npm.taobao.org/ssh2/download/ssh2-0.5.4.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/ssh2/-/ssh2-0.5.4.tgz\",\n\"integrity\": \"sha1-G/a2soyW6u8mf01sRqWiUXpZnic=\",\n\"requires\": {\n\"ssh2-streams\": \"~0.1.15\"\n},\n\"ssh2-streams\": {\n\"version\": \"0.1.20\",\n- \"resolved\": \"https://registry.npm.taobao.org/ssh2-streams/download/ssh2-streams-0.1.20.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz\",\n\"integrity\": \"sha1-URGNFUVV31Rp7h9n4M8efoosDjo=\",\n\"requires\": {\n\"asn1\": \"~0.2.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"boolean\",\n\"default\": false,\n\"description\": \"Support delimiter when import sql.\"\n+ },\n+ \"vscode-mysql.fullQueryScreen\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show query result full screen.\"\n}\n}\n}\n\"@types/ssh2\": \"^0.5.43\",\n\"tslint\": \"^5.8.0\",\n\"typescript\": \"^3.8.3\",\n+ \"@types/async-lock\": \"^1.1.2\",\n\"vscode\": \"^1.1.36\"\n},\n\"dependencies\": {\n+ \"async-lock\": \"^1.2.2\",\n\"date-format\": \"^3.0.0\",\n+ \"get-port\": \"^5.1.1\",\n\"mockjs\": \"^1.1.0\",\n\"mysql\": \"^2.18.1\",\n\"mysqldump\": \"^3.1.0\",\n\"sql-formatter\": \"^2.3.3\",\n- \"get-port\": \"^5.1.1\",\n\"tunnel-ssh\": \"^4.1.4\"\n},\n\"__metadata\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -31,6 +31,7 @@ export enum CacheKey {\nexport enum ConfigKey {\nMAX_TABLE_COUNT = \"maxTableCount\",\nENABLE_DELIMITER = \"enableDelimiter\",\n+ QUERY_FULL_SCREEN = \"fullQueryScreen\",\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "-import { MessageType, OperateType } from \"../../common/Constants\";\n+import { MessageType, OperateType, ConfigKey } from \"../../common/Constants\";\nimport { Node } from \"../../model/interface/node\";\nimport { ColumnNode } from \"../../model/other/columnNode\";\nimport { DatabaseCache } from \"../../service/databaseCache\";\nimport { QueryUnit } from \"../../service/queryUnit\";\nimport { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\n+import { Global } from \"../../common/Global\";\nexport class QueryParam<T> {\n/**\n@@ -33,7 +34,8 @@ export class QueryPage {\n}\nViewManager.createWebviewPanel({\n- splitView: true, path: \"pages/result/index\", title: \"Query\",\n+ splitView: !Global.getConfig(ConfigKey.QUERY_FULL_SCREEN),\n+ path: \"pages/result/index\", title: \"Query\",\ninitListener: (webviewPanel) => {\nwebviewPanel.webview.postMessage(queryParam);\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/viewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -5,6 +5,8 @@ import { WebviewPanel } from \"vscode\";\nimport { ConnectionManager } from \"../service/connectionManager\";\nimport { Console } from \"../common/OutputChannel\";\nimport { MySQLTreeDataProvider } from \"../provider/treeDataProvider\";\n+import * as AsyncLock from 'async-lock'\n+const lock = new AsyncLock()\nexport class ViewOption {\npublic path?: string;\n@@ -73,12 +75,13 @@ export class ViewManager {\npublic static createWebviewPanel(viewOption: ViewOption): Promise<WebviewPanel> {\n- const currentStatus = this.viewStatu[viewOption.title]\n- if (!currentStatus) { this.viewStatu[viewOption.title] = { creating: true } as ViewState }\n+ return new Promise((resolve, reject) => {\n+ lock.acquire(\"viewManager\", (done) => {\nif (typeof (viewOption.singlePage) == 'undefined') { viewOption.singlePage = true }\nif (typeof (viewOption.killHidden) == 'undefined') { viewOption.killHidden = true }\n+ const currentStatus = this.viewStatu[viewOption.title]\nif (viewOption.singlePage && currentStatus) {\nif (viewOption.killHidden && currentStatus.instance.visible == false) {\ncurrentStatus.instance.dispose()\n@@ -89,11 +92,10 @@ export class ViewManager {\nviewOption.initListener(currentStatus.instance)\n}\nif (viewOption.receiveListener) { currentStatus.receiveListener = viewOption.receiveListener }\n+ done()\nreturn Promise.resolve(currentStatus.instance);\n}\n}\n-\n- return new Promise((resolve, reject) => {\nconst targetPath = `${this.webviewPath}/${viewOption.path}.html`;\nfs.readFile(targetPath, 'utf8', async (err, data) => {\nif (err) {\n@@ -132,7 +134,9 @@ export class ViewManager {\n}\n})\nresolve(webviewPanel);\n+ done();\n});\n+ })\n});\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support setting query result full
|
141,908 |
27.04.2020 18:22:22
| -28,800 |
7e35e43e6e6a99b4baa9fc433e577ad02e0128fd
|
support add when not primary key
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolPanel.html",
"new_path": "resources/webview/pages/result/components/toolPanel.html",
"diff": "</el-row>\n<el-row v-if=\"result.table\">\n<el-col>\n- <el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\"\n- v-if=\"result.primaryKey\">\n+ <el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\" >\n</el-button>\n<span>CostTime: </span><span v-text=\"toolbar.costTime\"></span>ms\n<span v-if=\"result.table\">, Row: {{result.data.length}}, Col: {{columnCount}}</span>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support add when not primary key
|
141,908 |
27.04.2020 20:21:26
| -28,800 |
33b3d8bb9c7e2951be2452c070376bf57391bcce
|
fix export fail when using ssh tunel
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -12,8 +12,6 @@ import { InfoNode } from \"../other/infoNode\";\nimport { Node } from \"../interface/node\";\nimport { FileManager } from \"../../common/FileManager\";\nimport { Util } from \"../../common/util\";\n-import * as getPort from 'get-port'\n-\nexport class ConnectionNode extends Node {\n@@ -22,16 +20,8 @@ export class ConnectionNode extends Node {\nconstructor(readonly id: string, readonly parent: Node) {\nsuper(id)\nthis.init(parent)\n- if (parent.usingSSH) {\n- this.getPort()\n- }\n}\n- private async getPort() {\n- this.parent.ssh.tunnelPort = await getPort({ port: 10567 })\n- }\n-\n-\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\nlet databaseNodes = DatabaseCache.getDatabaseListOfConnection(this.id);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -8,16 +8,26 @@ import { Console } from \"../common/OutputChannel\";\nimport { Node } from \"../model/interface/node\";\nimport { QueryUnit } from \"./queryUnit\";\nimport tunnel = require('tunnel-ssh')\n+import { SSHConfig } from \"../model/interface/sshConfig\";\n+\n+interface ActiveConnection {\n+ connection: mysql.Connection;\n+ ssh: SSHConfig\n+}\nexport class ConnectionManager {\nprivate static lastConnectionNode: Node;\n- private static activeConnection: { [key: string]: mysql.Connection } = {};\n+ private static activeConnection: { [key: string]: ActiveConnection } = {};\npublic static getLastConnectionOption() {\nreturn this.lastConnectionNode;\n}\n+ public static getActiveConnectByKey(key: string): ActiveConnection {\n+ return this.activeConnection[key]\n+ }\n+\npublic static removeConnection(id: string) {\nconst lcp = this.lastConnectionNode;\n@@ -27,7 +37,7 @@ export class ConnectionManager {\nconst activeConnect = this.activeConnection[id];\nif (activeConnect) {\nthis.activeConnection[id] = null\n- activeConnect.end()\n+ activeConnect.connection.end()\n}\n}\n@@ -81,16 +91,17 @@ export class ConnectionManager {\nreturn new Promise(async (resolve, reject) => {\nconst connection = this.activeConnection[key];\n- if (connection && connection.state == 'authenticated') {\n+ const ssh = connectionNode.ssh;\n+ if (connection && connection.connection.state == 'authenticated') {\nif (connectionNode.database) {\n- QueryUnit.queryPromise(connection, `use \\`${connectionNode.database}\\``).then(() => {\n- resolve(connection);\n+ QueryUnit.queryPromise(connection.connection, `use \\`${connectionNode.database}\\``).then(() => {\n+ resolve(connection.connection);\n}).catch((error) => {\nthis.activeConnection[key] = null\nreject(error);\n});\n} else {\n- resolve(connection);\n+ resolve(connection.connection);\n}\n} else {\nif (connectionNode.usingSSH) {\n@@ -103,13 +114,12 @@ export class ConnectionManager {\nreject(\"create ssh tunnel fail!\");\nreturn;\n}\n- const ssh = connectionNode.ssh;\nconnectionNode = { ...connectionNode.origin, port, getConnectId: () => `${ssh.host}_${ssh.port}_${connectionNode.user}` } as any as Node\n}\n- this.activeConnection[key] = this.createConnection(connectionNode);\n- this.activeConnection[key].connect((err: Error) => {\n+ this.activeConnection[key] = { connection: this.createConnection(connectionNode), ssh };\n+ this.activeConnection[key].connection.connect((err: Error) => {\nif (!err) {\n- resolve(this.activeConnection[key]);\n+ resolve(this.activeConnection[key].connection);\n} else {\nthis.activeConnection[key] = null;\nConsole.log(`${err.stack}\\n${err.message}`);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "@@ -5,6 +5,7 @@ import format = require('date-format');\nimport { Node } from \"../../model/interface/node\";\nimport { Console } from \"../../common/outputChannel\";\nimport { TableNode } from \"../../model/main/tableNode\";\n+import { ConnectionManager } from \"../connectionManager\";\nexport class MysqlDumpService extends AbstractDumpService {\nprotected dumpData(node: Node, exportPath: string, withData: boolean): void {\n@@ -16,7 +17,7 @@ export class MysqlDumpService extends AbstractDumpService {\nuser: node.usingSSH ? node.origin.user : node.user,\npassword: node.usingSSH ? node.origin.password : node.password,\ndatabase: node.database,\n- port: node.usingSSH ? node.ssh.tunnelPort : parseInt(node.port),\n+ port: node.usingSSH ? ConnectionManager.getActiveConnectByKey(node.getConnectId()).ssh.tunnelPort : parseInt(node.port),\n},\ndump: {\ntables: tableName ? [tableName] : [],\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix export fail when using ssh tunel
|
141,908 |
27.04.2020 21:26:31
| -28,800 |
35f1dcdf751762f7382617f93202432c9cf16474
|
suport simple edit connection
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.editConnection\",\n+ \"title\": \"Edit Connection\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.deleteConnection\",\n\"title\": \"Delete Connection\",\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n\"group\": \"1_mysql@1\"\n},\n+ {\n+ \"command\": \"mysql.editConnection\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n+ \"group\": \"1_mysql@2\"\n+ },\n{\n\"command\": \"mysql.refresh\",\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "usingSSH: false,\ntimezone: null,\nssh: {\n+ host: '',\nport: 22,\n- username: 'root'\n+ username: 'root',\n}\n},\ndatabaseType: 'mysql',\n})\nwindow.addEventListener('message', ({ data }) => {\n- if (data.type === 'CONNECTION_ERROR') {\n+ switch (data.type) {\n+ case 'EDIT':\n+ vue.connectionOption = data.node\n+ break;\n+ case 'CONNECTION_ERROR':\nvue.error = true;\nvue.errorMessage = data.err;\n- } else {\n+ break;\n+ default:\ndocument.write(\"Connect success!\")\n+ break;\n}\n})\npostMessage({ type: 'init' })\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -52,6 +52,9 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.addConnection\": () => {\nViewManager.showConnectPage(serviceManager.provider);\n},\n+ \"mysql.editConnection\": (connectionNode: ConnectionNode) => {\n+ ViewManager.showConnectPage(serviceManager.provider, connectionNode);\n+ },\n\"mysql.addDatabase\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/viewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -6,6 +6,7 @@ import { ConnectionManager } from \"../service/connectionManager\";\nimport { Console } from \"../common/OutputChannel\";\nimport { MySQLTreeDataProvider } from \"../provider/treeDataProvider\";\nimport * as AsyncLock from 'async-lock'\n+import { ConnectionNode } from \"../model/database/connectionNode\";\nconst lock = new AsyncLock()\nexport class ViewOption {\n@@ -45,17 +46,30 @@ export class ViewManager {\nthis.webviewPath = extensionPath + \"/resources/webview\"\n}\n- public static showConnectPage(provider: MySQLTreeDataProvider) {\n-\n+ public static showConnectPage(provider: MySQLTreeDataProvider, connectionNode?: ConnectionNode) {\n+ let node;\n+ if (connectionNode) {\n+ node = connectionNode.origin ? { ...connectionNode.origin, usingSSH: true, timezone: connectionNode.timezone, ssh: { ...connectionNode.ssh } } : { connectionNode }\n+ node.ssh.tunnelPort = null\n+ }\nthis.createWebviewPanel({\npath: \"pages/connect/connect\",\ntitle: \"connect\",\nsplitView: false,\n+ initListener: (webviewPanel) => {\n+ if (node) {\n+ webviewPanel.webview.postMessage({\n+ type: \"EDIT\",\n+ node\n+ });\n+ }\n+ },\nreceiveListener: (webviewPanel, params) => {\nif (params.type === 'CONNECT_TO_SQL_SERVER') {\nconst { connectionOption } = params\nif (connectionOption.usingSSH) {\n- connectionOption.origin = { host: connectionOption.host, user: connectionOption.user, port: connectionOption.port, password: connectionOption.password }\n+ const { ssh, ...origin } = connectionOption\n+ connectionOption.origin = origin\nconnectionOption.host = connectionOption.ssh.host\nconnectionOption.port = \"\" + connectionOption.ssh.port\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
suport simple edit connection
|
141,908 |
27.04.2020 23:23:43
| -28,800 |
c59379247bd57595f9e27e7c1fd41a31cff43063
|
fix column complection chain
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/columnChain.ts",
"new_path": "src/provider/Complection/chain/columnChain.ts",
"diff": "@@ -13,6 +13,7 @@ export class ColumnChain implements ComplectionChain {\nif (complectionContext.preChart === \".\") {\nlet subComplectionItems = await this.generateColumnComplectionItem(complectionContext.preWord);\n+ if (subComplectionItems != null && subComplectionItems.length > 0) { this.needStop = true }\nconst tableReg = new RegExp(Pattern.TABLE_PATTERN + \"(?=\\\\s*\\\\b\" + complectionContext.preWord + \"\\\\b)\", \"ig\");\nlet result = tableReg.exec(complectionContext.currentSqlFull);\nfor (; result != null && subComplectionItems.length === 0;) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix column complection chain
|
141,908 |
27.04.2020 23:33:13
| -28,800 |
ad364ff9b1e59ab11e254a1646c30b911ba1804d
|
fix edit connection fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/impl/mysqlConnectService.ts",
"new_path": "src/service/connect/impl/mysqlConnectService.ts",
"diff": "@@ -4,6 +4,11 @@ import { Node } from \"../../../model/interface/node\";\nexport class MysqlConnectService extends AbstractConnectService {\nprotected async connect(connectionNode: Node): Promise<void> {\n+ const connectId = connectionNode.getConnectId();\n+ const connection = ConnectionManager.getActiveConnectByKey(connectId)\n+ if (connection) {\n+ ConnectionManager.removeConnection(connectId)\n+ }\nawait ConnectionManager.getConnection(connectionNode)\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix edit connection fail
|
141,908 |
28.04.2020 08:58:56
| -28,800 |
ba49f8e330ab78db40038739b083692eaa975318
|
intelli obtain sql
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "},\n\"builtin-modules\": {\n\"version\": \"1.1.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz\",\n\"integrity\": \"sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=\",\n\"dev\": true\n},\n},\n\"color-name\": {\n\"version\": \"1.1.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz\",\n\"integrity\": \"sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=\",\n\"dev\": true\n},\n},\n\"lodash.defaults\": {\n\"version\": \"4.2.0\",\n- \"resolved\": \"https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz\",\n\"integrity\": \"sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=\"\n},\n\"long\": {\n},\n\"sprintf-js\": {\n\"version\": \"1.0.3\",\n- \"resolved\": \"https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz\",\n\"integrity\": \"sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=\",\n\"dev\": true\n},\n},\n\"ssh2\": {\n\"version\": \"0.5.4\",\n- \"resolved\": \"https://registry.npm.taobao.org/ssh2/download/ssh2-0.5.4.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/ssh2/-/ssh2-0.5.4.tgz\",\n\"integrity\": \"sha1-G/a2soyW6u8mf01sRqWiUXpZnic=\",\n\"requires\": {\n\"ssh2-streams\": \"~0.1.15\"\n},\n\"ssh2-streams\": {\n\"version\": \"0.1.20\",\n- \"resolved\": \"https://registry.npm.taobao.org/ssh2-streams/download/ssh2-streams-0.1.20.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz\",\n\"integrity\": \"sha1-URGNFUVV31Rp7h9n4M8efoosDjo=\",\n\"requires\": {\n\"asn1\": \"~0.2.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -160,9 +160,9 @@ export class QueryUnit {\nfor (let i = 0; i < sqlList.length; i++) {\nconst sql = sqlList[i];\nindex += (sql.length + 1);\n- if (docCursor <= index) {\n+ if (docCursor < index) {\nconst trimSql = sql.trim();\n- if (!trimSql && i > 1) { return sqlList[i - 1]; }\n+ if (!trimSql && sqlList.length > 1) { return sqlList[i - 1]; }\nreturn trimSql;\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
intelli obtain sql
|
141,908 |
28.04.2020 09:03:56
| -28,800 |
0847be18fbfdb8f68029a80309c5cc2a6d073813
|
remove primary when copy
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolbar.html",
"new_path": "resources/webview/pages/result/components/toolbar.html",
"diff": "<div v-if=\"scope.row[result.primaryKey]\">\n<el-button @click=\"openEdit(scope.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n</el-button>\n- <el-button @click=\"openEdit(scope.row);update.primary=null\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\"\n+ <el-button @click=\"scope.row[result.primaryKey]=null;openEdit(scope.row);update.primary=null;\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\"\ncircle>\n</el-button>\n<el-button @click=\"deleteConfirm(scope.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\"\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
remove primary when copy
|
141,908 |
28.04.2020 20:15:13
| -28,800 |
75bd4741a83855f29b56c0985c7bcdee994bdcfa
|
recovery name
|
[
{
"change_type": "RENAME",
"old_path": "src/provider/Complection/completionProvider0.ts",
"new_path": "src/provider/Complection/completionProvider.ts",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "import * as vscode from \"vscode\";\nimport { ExtensionContext } from \"vscode\";\nimport { FileManager } from \"../common/filesManager\";\n-import { CompletionProvider } from \"../provider/Complection/completionProvider0\";\n+import { CompletionProvider } from \"../provider/Complection/completionProvider\";\nimport { SqlFormattingProvider } from \"../provider/sqlFormattingProvider\";\nimport { TableInfoHoverProvider } from \"../provider/tableInfoHoverProvider\";\nimport { DbTreeDataProvider as DbTreeDataProvider } from \"../provider/treeDataProvider\";\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
recovery name
|
141,908 |
28.04.2020 20:37:25
| -28,800 |
8884f8aabd15d078db0c7539b698cb2f3a25930d
|
limit sql panel hight
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolPanel.html",
"new_path": "resources/webview/pages/result/components/toolPanel.html",
"diff": "<div class=\"hint\">\n<!-- sql input -->\n<el-row style=\"margin-bottom: 10px;\">\n- <el-input type=\"textarea\" autosize v-model=\"toolbar.sql\" style=\"width: 600px;\"></el-input>\n+ <el-input type=\"textarea\" :autosize=\"{ minRows:3, maxRows:5}\" v-model=\"toolbar.sql\" style=\"width:90vw\" ></el-input>\n</el-row>\n<!-- tool panel -->\n<el-row>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -43,9 +43,9 @@ export class TableGroup extends Node {\npublic createTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.showSQLTextDocument(`CREATE TABLE tableName(\n+ QueryUnit.showSQLTextDocument(`CREATE TABLE [name](\nid int NOT NULL primary key AUTO_INCREMENT,\n- column varchar(length)\n+ [column] varchar(255)\n);`, Template.create);\n}\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
limit sql panel hight
|
141,908 |
28.04.2020 20:50:40
| -28,800 |
f63a80d48a11c646a296ad5d78aeb1411880438b
|
fix nullable check fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -24,7 +24,7 @@ export class Util {\nif (origin == null) { return origin; }\nif (origin.match(/\\b[-\\.]\\b/ig)\n- || origin.match(/^if|key|name|user|desc|length$/i)) {\n+ || origin.match(/^(if|key|name|user|desc|length)$/i)) {\nreturn `\\`${origin}\\``;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnNode.ts",
"new_path": "src/model/other/columnNode.ts",
"diff": "@@ -62,14 +62,21 @@ export class ColumnNode extends Node implements CopyAble {\n}\npublic updateColumnTemplate() {\n+\nConnectionManager.getConnection(this, true);\n+\n+ const comment = this.column.comment ? ` comment '${this.column.comment}'` : \"\";\n+ const defaultDefinition = this.column.nullable == \"YES\" ? \"\" : \" NOT NULL\";\n+\nQueryUnit.showSQLTextDocument(`ALTER TABLE\n- ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${this.column.nullable ? \"\" : \" NOT NULL\"}${this.column.comment ? ` comment '${this.column.comment}'` : \"\"};`\n- , Template.alter);\n+ ${wrap(this.database)}.${wrap(this.table)} CHANGE ${wrap(this.column.name)} ${wrap(this.column.name)} ${this.column.type}${defaultDefinition}${comment};`, Template.alter);\n+\n}\npublic dropColumnTemplate() {\n+\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`ALTER TABLE \\n\\t${wrap(this.database)}.${wrap(this.table)} DROP COLUMN ${wrap(this.column.name)};`, Template.alter);\n+\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix nullable check fail
|
141,908 |
28.04.2020 23:05:02
| -28,800 |
87837d220ef213fd8057c0040c2ea4a6e88dd512
|
fix tunnel not stable
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -16,6 +16,7 @@ import { ProcedureGroup } from \"../main/procedureGroup\";\nimport { TableGroup } from \"../main/tableGroup\";\nimport { TriggerGroup } from \"../main/triggerGroup\";\nimport { ViewGroup } from \"../main/viewGroup\";\n+import { NodeUtil } from '../nodeUtil';\nexport class DatabaseNode extends Node implements CopyAble {\n@@ -24,7 +25,7 @@ export class DatabaseNode extends Node implements CopyAble {\nconstructor(name: string, readonly info: Node) {\nsuper(name)\nthis.id = `${info.getConnectId()}_${name}`\n- this.info = { ...info, database: name, getConnectId: info.getConnectId } as Node\n+ this.info = NodeUtil.build({ ...info, database: name } as Node)\nthis.init(this.info)\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/common/sshTunnelService.ts",
"diff": "+import tunnel = require('tunnel-ssh')\n+import * as getPort from 'get-port'\n+import { Node } from '../../model/interface/node';\n+import { Console } from '../../common/outputChannel';\n+\n+export class SSHTunnelService {\n+\n+ private tunelMark: { [key: string]: any } = {};\n+\n+ public closeTunnel(connectId: string) {\n+ if (this.tunelMark[connectId]) {\n+ this.tunelMark[connectId].close()\n+ delete this.tunelMark[connectId]\n+ }\n+ }\n+\n+ public createTunnel(connectionNode: Node, errorCallback: (error) => void): Promise<Node> {\n+ return new Promise(async (resolve) => {\n+ const ssh = connectionNode.ssh\n+ if (!connectionNode.ssh.tunnelPort) {\n+ connectionNode.ssh.tunnelPort = await getPort({ port: 10567 })\n+ }\n+ const port = connectionNode.ssh.tunnelPort;\n+ const key = connectionNode.getConnectId();\n+ if (this.tunelMark[key]) {\n+ resolve({ ...connectionNode, port } as Node)\n+ return;\n+ }\n+ const config = {\n+ username: ssh.username,\n+ password: ssh.password,\n+ host: ssh.host,\n+ port: ssh.port,\n+ dstHost: connectionNode.host,\n+ dstPort: connectionNode.port,\n+ localHost: '127.0.0.1',\n+ localPort: port\n+ };\n+ const localTunnel = tunnel(config, (error, server) => {\n+ this.tunelMark[key] = localTunnel\n+ if (error && errorCallback) {\n+ delete this.tunelMark[key]\n+ errorCallback(error)\n+ }\n+ resolve({ ...connectionNode, port } as Node)\n+ });\n+ localTunnel.on('error', (err) => {\n+ Console.log('Ssh tunel occur eror : ' + err);\n+ if (err && errorCallback) {\n+ localTunnel.close()\n+ delete this.tunelMark[key]\n+ errorCallback(err)\n+ }\n+ resolve(null)\n+ });\n+ })\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -11,6 +11,7 @@ import tunnel = require('tunnel-ssh')\nimport { SSHConfig } from \"../model/interface/sshConfig\";\nimport { DatabaseCache } from \"./common/databaseCache\";\nimport { NodeUtil } from \"../model/nodeUtil\";\n+import { SSHTunnelService } from \"./common/sshTunnelService\";\ninterface ActiveConnection {\nconnection: mysql.Connection;\n@@ -21,6 +22,7 @@ export class ConnectionManager {\nprivate static lastConnectionNode: Node;\nprivate static activeConnection: { [key: string]: ActiveConnection } = {};\n+ private static tunnelService = new SSHTunnelService();\npublic static getLastConnectionOption() {\nreturn this.lastConnectionNode;\n@@ -39,6 +41,7 @@ export class ConnectionManager {\nconst activeConnect = this.activeConnection[id];\nif (activeConnect) {\nthis.activeConnection[id] = null\n+ this.tunnelService.closeTunnel(lcp.getConnectId())\nactiveConnect.connection.end()\n}\nDatabaseCache.clearDatabaseCache(id)\n@@ -80,44 +83,41 @@ export class ConnectionManager {\n}\npublic static getConnection(connectionNode: Node, changeActive: boolean = false): Promise<mysql.Connection> {\n+ return new Promise(async (resolve, reject) => {\nNodeUtil.build(connectionNode)\nif (changeActive) {\nthis.lastConnectionNode = connectionNode;\nGlobal.updateStatusBarItems(connectionNode);\n}\nconst key = connectionNode.getConnectId();\n-\n- return new Promise(async (resolve, reject) => {\n-\nconst connection = this.activeConnection[key];\nconst ssh = connectionNode.ssh;\nif (connection && connection.connection.state == 'authenticated') {\nif (connectionNode.database) {\n- QueryUnit.queryPromise(connection.connection, `use \\`${connectionNode.database}\\``).then(() => {\n- resolve(connection.connection);\n- }).catch((error) => {\n+ try {\n+ await QueryUnit.queryPromise(connection.connection, `use \\`${connectionNode.database}\\``)\n+ } catch (err) {\nthis.activeConnection[key] = null\n- reject(error);\n- });\n- } else {\n- resolve(connection.connection);\n+ reject(err);\n}\n+ }\n+ resolve(connection.connection);\n} else {\n- if (connectionNode.usingSSH) {\n-\n- const port = await this.createTunnel(connectionNode, (err) => {\n+ let connectOption = connectionNode;\n+ if (connectOption.usingSSH) {\n+ connectOption = await this.tunnelService.createTunnel(connectOption, (err) => {\nif (err.errno == 'EADDRINUSE') { return; }\nthis.activeConnection[key] = null\n})\n- if (!port) {\n+ if (!connectOption) {\nreject(\"create ssh tunnel fail!\");\nreturn;\n}\n- connectionNode = { ...connectionNode, port } as Node\n}\n- this.activeConnection[key] = { connection: this.createConnection(connectionNode), ssh };\n+ this.activeConnection[key] = { connection: this.createConnection(connectOption), ssh };\nthis.activeConnection[key].connection.connect((err: Error) => {\nif (!err) {\n+ this.lastConnectionNode = connectionNode;\nresolve(this.activeConnection[key].connection);\n} else {\nthis.activeConnection[key] = null;\n@@ -131,48 +131,6 @@ export class ConnectionManager {\n}\n- private static tunelMark: { [key: string]: any } = {};\n- private static createTunnel(connectionNode: Node, errorCallback: (error) => void): Promise<number> {\n- return new Promise(async (resolve) => {\n- const ssh = connectionNode.ssh\n- if (!connectionNode.ssh.tunnelPort) {\n- connectionNode.ssh.tunnelPort = await getPort({ port: 10567 })\n- }\n- const port = connectionNode.ssh.tunnelPort;\n- const key = `${ssh.username}_${ssh.port}_${ssh.username}`;\n- if (this.tunelMark[key]) {\n- resolve(port)\n- }\n- const config = {\n- username: ssh.username,\n- password: ssh.password,\n- host: ssh.host,\n- port: ssh.port,\n- dstHost: connectionNode.host,\n- dstPort: connectionNode.port,\n- localHost: '127.0.0.1',\n- localPort: port\n- };\n- const localTunnel = tunnel(config, (error, server) => {\n- this.tunelMark[key] = server\n- if (error && errorCallback) {\n- delete this.tunelMark[key]\n- errorCallback(error)\n- }\n- resolve(port)\n- });\n- localTunnel.on('error', (err) => {\n- Console.log('Ssh tunel occur eror : ' + err);\n- if (err && errorCallback) {\n- localTunnel.close()\n- delete this.tunelMark[key]\n- errorCallback(err)\n- }\n- resolve(0)\n- });\n- })\n- }\n-\npublic static createConnection(connectionOptions: Node): mysql.Connection {\nconst newConnectionOptions = { ...connectionOptions, useConnectionPooling: true, multipleStatements: true } as any as mysql.ConnectionConfig;\n@@ -181,8 +139,6 @@ export class ConnectionManager {\nca: fs.readFileSync(connectionOptions.certPath),\n};\n}\n-\n- this.lastConnectionNode = connectionOptions;\nreturn mysql.createConnection(newConnectionOptions);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix tunnel not stable
|
141,908 |
28.04.2020 23:26:09
| -28,800 |
e324eca32855e99a87da8b40922022897212d383
|
connect support exclude database
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/css/style.css",
"new_path": "resources/webview/css/style.css",
"diff": "margin: 2px 4px;\n}\n+.field input{\n+ width: 50vw;\n+}\n+\n.field__input {\nbackground: var(--vscode-input-background);\nborder: 1px solid var(--vscode-dropdown-border);\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/components/addition.html",
"new_path": "resources/webview/pages/connect/components/addition.html",
"diff": "+<div></div>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/components/option.html",
"new_path": "resources/webview/pages/connect/components/option.html",
"diff": "<div>\n<div class=\"field field__input\">\n<b>database:</b>\n- <input class=\"field__input\" placeholder=\"database, can be null\" v-model=\"connectionOption.database\" />\n+ <input class=\"field__input\" placeholder=\"database, can be empty\" v-model=\"connectionOption.database\" />\n+ </div>\n+</div>\n+<div>\n+ <div class=\"field field__input\">\n+ <b>excludeDatabases:</b>\n+ <input class=\"field__input\" v-model=\"connectionOption.excludeDatabases\" />\n</div>\n</div>\n<div>\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "password: '',\ndatabase: null,\nusingSSH: false,\n+ excludeDatabases: 'mysql,performance_schema,information_schema',\ntimezone: '+00:00',\nssh: {\nhost: '',\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -31,7 +31,17 @@ export class ConnectionNode extends Node {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), \"show databases\")\n.then((databases) => {\n- databaseNodes = databases.filter((db) => !this.database || db.Database == this.database).map<DatabaseNode>((database) => {\n+ databaseNodes = databases.filter((db) => {\n+ if (this.database) {\n+ return db.Database == this.database;\n+ }\n+ if (this.excludeDatabases) {\n+ for (const excludeDatabase of this.excludeDatabases.split(\",\")) {\n+ if (db.Database == excludeDatabase.trim()) { return false; }\n+ }\n+ }\n+ return true;\n+ }).map<DatabaseNode>((database) => {\nreturn new DatabaseNode(database.Database, this);\n});\ndatabaseNodes.unshift(new UserGroup(\"USER\", this));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -11,6 +11,7 @@ export abstract class Node extends vscode.TreeItem {\npublic database?: string;\npublic timezone?: string;\npublic certPath?: string;\n+ public excludeDatabases?: string;\npublic usingSSH?: boolean;\npublic ssh?: SSHConfig;\n@@ -29,6 +30,7 @@ export abstract class Node extends vscode.TreeItem {\nthis.certPath = source.certPath\nthis.ssh = source.ssh\nthis.usingSSH = source.usingSSH\n+ this.excludeDatabases = source.excludeDatabases\nthis.collapsibleState = DatabaseCache.getElementState(this)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "import * as fs from \"fs\";\n-import * as getPort from 'get-port'\nimport * as mysql from \"mysql\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\n@@ -7,7 +6,6 @@ import { Global } from \"../common/global\";\nimport { Console } from \"../common/outputChannel\";\nimport { Node } from \"../model/interface/node\";\nimport { QueryUnit } from \"./queryUnit\";\n-import tunnel = require('tunnel-ssh')\nimport { SSHConfig } from \"../model/interface/sshConfig\";\nimport { DatabaseCache } from \"./common/databaseCache\";\nimport { NodeUtil } from \"../model/nodeUtil\";\n@@ -117,7 +115,7 @@ export class ConnectionManager {\nthis.activeConnection[key] = { connection: this.createConnection(connectOption), ssh };\nthis.activeConnection[key].connection.connect((err: Error) => {\nif (!err) {\n- this.lastConnectionNode = connectionNode;\n+ this.lastConnectionNode = NodeUtil.build(connectionNode);\nresolve(this.activeConnection[key].connection);\n} else {\nthis.activeConnection[key] = null;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
connect support exclude database
|
141,908 |
28.04.2020 23:34:14
| -28,800 |
06445939b2795c4f74aaf89615a515ff62d77ef7
|
fix page warning
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/dataTable.html",
"new_path": "resources/webview/pages/result/components/dataTable.html",
"diff": "-<el-table-column :label=\"field.name\" v-for=\"field in result.fields\" :key=\"field.name\" align=\"center\" sortable\n+<el-table-column :label=\"field.name\" v-for=\"(field,index) in result.fields\" :key=\"index\" align=\"center\" sortable\nv-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\"\n:width=\"computeWidth(field.name,0,toolbar.filter[field.name])\">\n<template slot-scope=\"scope\">\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/components/toolbar.html",
"new_path": "resources/webview/pages/result/components/toolbar.html",
"diff": "<div v-if=\"scope.row.isFilter\" style=\"text-align: center;\">\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-checkbox-group v-model=\"toolbar.showColumns\">\n- <el-checkbox v-for=\"(column) in result.fields\" :label=\"column.name\" :key=\"column.name\">\n+ <el-checkbox v-for=\"(column,index) in result.fields\" :label=\"column.name\" :key=\"index\">\n{{column.name}}\n</el-checkbox>\n</el-checkbox-group>\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "}\n}\nreturn objClone;\n- }, initShowColumn(columnList) {\n- if (!columnList) return;\n+ }, initShowColumn(fields) {\n+ if (!fields) return;\nthis.toolbar.showColumns = []\n- for (let i = 0; i < columnList.length; i++) {\n- if (!columnList[i].name) continue;\n- this.toolbar.showColumns.push(columnList[i].name.toLowerCase());\n+ for (let i = 0; i < fields.length; i++) {\n+ if (!fields[i].name) continue;\n+ this.toolbar.showColumns.push(fields[i].name.toLowerCase());\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix page warning
|
141,908 |
28.04.2020 23:49:16
| -28,800 |
201a129d1b9b6c4e68c176e2ca6e55b6dca8ab70
|
ssh tunnel support private key
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/components/ssh.html",
"new_path": "resources/webview/pages/connect/components/ssh.html",
"diff": "<b>ssh-username:</b>\n<input class=\"field__input\" v-model=\"connectionOption.ssh.username\" />\n</div>\n+ <div>\n<div class=\"field field__input\">\n- <b>ssh-password:</b>\n+ <b>type:</b>\n+ <select v-model=\"type\">\n+ <option value=\"password\">password</option>\n+ <option value=\"privateKey\">privateKey</option>\n+ </select>\n+ </div>\n+ </div>\n+ <div v-if=\"type=='password'\">\n+ <div class=\"field field__input\">\n+ <b>password:</b>\n<input class=\"field__input\" type=\"password\" v-model=\"connectionOption.ssh.password\" />\n</div>\n</div>\n+ <div v-if=\"type=='privateKey'\">\n+ <div>\n+ <div class=\"field field__input\">\n+ <b>privateKeyPath:</b>\n+ <input class=\"field__input\" placeholder=\"input your private key path\" v-model=\"connectionOption.ssh.privateKeyPath\" />\n+ </div>\n+ </div>\n+ <div>\n+ <div class=\"field field__input\">\n+ <b>passphrase:</b>\n+ <input class=\"field__input\" type=\"passphrase\" v-model=\"connectionOption.ssh.passphrase\" />\n+ </div>\n+ </div>\n+ </div>\n+</div>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/connect/connect.html",
"new_path": "resources/webview/pages/connect/connect.html",
"diff": "<link rel=\"stylesheet\" href=\"/css/element.css\">\n<script src=\"js/vue.js\"></script>\n<script src=\"/js/element.js\"></script>\n- <title>Connect to SQL server</title>\n</head>\n<body>\n<div class=\"container\" id='container'>\n- <h1>Connect to SQL server</h1>\n+ <h1>Connect to MySQL server</h1>\n<!-- <select name=\"\" id=\"\">\n<option value=\"\">mysql</option>\n<option value=\"\">oracle</option>\n</select> -->\n- <ul class=\"tab\" id=\"tabs\">\n+ <!-- <ul class=\"tab\" id=\"tabs\">\n<li class=\"tab__item tab__item--active\">\nMySQL\n</li>\n- </ul>\n+ </ul> -->\n<blockquote class=\"panel\" id=\"error\" v-if=\"error\">\n<p class=\"panel__text\">\nConnection error! <span id=\"errorMessage\" v-text=\"errorMessage\"></span><br />\nusername: 'root',\n}\n},\n+ type: 'password',\ndatabaseType: 'mysql',\nerror: false,\nerrorMessage: ''\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/sshConfig.ts",
"new_path": "src/model/interface/sshConfig.ts",
"diff": "@@ -7,7 +7,7 @@ export interface SSHConfig {\nport: number;\nusername: string;\npassword?: string;\n- private?: string;\n+ privateKeyPath?: string;\nprivateKey?: Buffer;\npassphrase?: string;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/sshTunnelService.ts",
"new_path": "src/service/common/sshTunnelService.ts",
"diff": "@@ -2,6 +2,7 @@ import tunnel = require('tunnel-ssh')\nimport * as getPort from 'get-port'\nimport { Node } from '../../model/interface/node';\nimport { Console } from '../../common/outputChannel';\n+import { existsSync } from 'fs';\nexport class SSHTunnelService {\n@@ -34,8 +35,16 @@ export class SSHTunnelService {\ndstHost: connectionNode.host,\ndstPort: connectionNode.port,\nlocalHost: '127.0.0.1',\n- localPort: port\n+ localPort: port,\n+ passphrase: ssh.passphrase,\n+ privateKey: (() => {\n+ if (ssh.privateKeyPath && existsSync(ssh.privateKeyPath)) {\n+ return require('fs').readFileSync(ssh.privateKeyPath)\n+ }\n+ return null\n+ })()\n};\n+\nconst localTunnel = tunnel(config, (error, server) => {\nthis.tunelMark[key] = localTunnel\nif (error && errorCallback) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
ssh tunnel support private key
|
141,908 |
29.04.2020 00:00:58
| -28,800 |
d2cb8ffd384209fe7fbae3a707fff37f4a69d378
|
update to 1.9.2
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"1.9.0\",\n+ \"version\": \"1.9.2\",\n\"publisher\": \"cweijan\",\n\"icon\": \"logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -96,6 +96,7 @@ export function activate(context: vscode.ExtensionContext) {\nif (databaseOrConnectionNode) {\ndatabaseOrConnectionNode.newQuery();\n} else {\n+ // QueryUnit.showSQLTextDocument(\"\", `sql/${new Date().getTime()}.sql`)\nConnectionNode.tryOpenQuery();\n}\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -55,7 +55,7 @@ export class ConnectionNode extends Node {\n}\npublic async newQuery() {\n- ConnectionManager.getConnection(this);\n+ ConnectionManager.getConnection(this, true);\nConnectionNode.tryOpenQuery()\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 1.9.2
|
141,908 |
29.04.2020 09:15:43
| -28,800 |
4b004cdea6b47682578ca6b3d8266c73dff5070b
|
fix create tunnel bug
|
[
{
"change_type": "MODIFY",
"old_path": "package-lock.json",
"new_path": "package-lock.json",
"diff": "{\n\"name\": \"vscode-mysql-client\",\n- \"version\": \"1.9.2\",\n+ \"version\": \"1.9.3\",\n\"lockfileVersion\": 1,\n\"requires\": true,\n\"dependencies\": {\n\"is-property\": \"^1.0.2\"\n}\n},\n- \"get-port\": {\n- \"version\": \"5.1.1\",\n- \"resolved\": \"https://registry.npm.taobao.org/get-port/download/get-port-5.1.1.tgz\",\n- \"integrity\": \"sha1-BGntB1Y0ed5u+5hrrwU9zX1OMZM=\"\n- },\n\"getpass\": {\n\"version\": \"0.1.7\",\n\"resolved\": \"https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"dependencies\": {\n\"async-lock\": \"^1.2.2\",\n\"date-format\": \"^3.0.0\",\n- \"get-port\": \"^5.1.1\",\n\"mockjs\": \"^1.1.0\",\n\"mysql\": \"^2.18.1\",\n\"mysqldump\": \"^3.1.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/sshTunnelService.ts",
"new_path": "src/service/common/sshTunnelService.ts",
"diff": "import tunnel = require('tunnel-ssh')\n-import * as getPort from 'get-port'\nimport { Node } from '../../model/interface/node';\nimport { Console } from '../../common/outputChannel';\nimport { existsSync } from 'fs';\n+import * as portfinder from 'portfinder'\nexport class SSHTunnelService {\n- private tunelMark: { [key: string]: any } = {};\n+ private tunelMark: { [key: string]: { tunnel: any, tunnelPort: number } } = {};\npublic closeTunnel(connectId: string) {\nif (this.tunelMark[connectId]) {\n- this.tunelMark[connectId].close()\n+ this.tunelMark[connectId].tunnel.close()\ndelete this.tunelMark[connectId]\n}\n}\n@@ -18,15 +18,13 @@ export class SSHTunnelService {\npublic createTunnel(connectionNode: Node, errorCallback: (error) => void): Promise<Node> {\nreturn new Promise(async (resolve) => {\nconst ssh = connectionNode.ssh\n- if (!connectionNode.ssh.tunnelPort) {\n- connectionNode.ssh.tunnelPort = await getPort({ port: 10567 })\n- }\n- const port = connectionNode.ssh.tunnelPort;\nconst key = connectionNode.getConnectId();\nif (this.tunelMark[key]) {\n- resolve({ ...connectionNode, port } as Node)\n+ resolve({ ...connectionNode, port: this.tunelMark[key].tunnelPort } as Node)\nreturn;\n}\n+ const port = await portfinder.getPortPromise();\n+ connectionNode.ssh.tunnelPort = port\nconst config = {\nusername: ssh.username,\npassword: ssh.password,\n@@ -46,7 +44,7 @@ export class SSHTunnelService {\n};\nconst localTunnel = tunnel(config, (error, server) => {\n- this.tunelMark[key] = localTunnel\n+ this.tunelMark[key] = { tunnel: localTunnel, tunnelPort: port }\nif (error && errorCallback) {\ndelete this.tunelMark[key]\nerrorCallback(error)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix create tunnel bug
|
141,908 |
29.04.2020 09:29:39
| -28,800 |
a5195f8a81731b0e6474a771ab91e49a691d462d
|
fix node extension fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -10,7 +10,9 @@ export class Util {\nconst tableMatch = new RegExp(tablePattern, 'img').exec(sql)\nif (tableMatch) {\nreturn tableMatch[0].replace(/\\bfrom|join|update|into\\b/i, \"\") // remove keyword\n- .replace(/(\\w|\\s|-|`)*\\./, \"\").trim() // remove databasename\n+ .replace(/(\\w|\\s|-|`)*\\./, \"\")// remove databasename\n+ .replace(/`/g, \"\")// trim tableName\n+ .trim()\n}\nreturn null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -45,8 +45,8 @@ export abstract class Node extends vscode.TreeItem {\nreturn `${this.host}_${this.port}_${this.user}`;\n}\n- public getHost = () => this.usingSSH ? this.ssh.host : this.host\n- public getPort = () => this.usingSSH ? this.ssh.port : this.port\n- public getUser = () => this.usingSSH ? this.ssh.username : this.user\n+ public getHost(): string { return this.usingSSH ? this.ssh.host : this.host }\n+ public getPort(): number { return this.usingSSH ? this.ssh.port : this.port }\n+ public getUser(): string { return this.usingSSH ? this.ssh.username : this.user }\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix node extension fail
|
141,908 |
29.04.2020 16:32:41
| -28,800 |
4c90be5e8823564d397cca4de432c5e6f48a490c
|
trim connect white space
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -33,12 +33,29 @@ export class Util {\nreturn origin;\n}\n+ public static trim(origin: any): any {\n+\n+ if (origin) {\n+ const originType = typeof origin\n+ if (originType == \"string\") {\n+ return origin.trim()\n+ }\n+ if (originType == \"object\") {\n+ for (const key in origin) {\n+ origin[key] = this.trim(origin[key])\n+ }\n+ }\n+ }\n+\n+ return origin\n+ }\n+\n/**\n* trim array, got from SO.\n* @param origin origin array\n* @param attr duplicate check attribute\n*/\n- public static trim<T>(origin: T[], attr: string): T[] {\n+ public static trimArray<T>(origin: T[], attr: string): T[] {\nconst seen = new Set();\nreturn origin.filter((item) => {\nconst temp = item[attr];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/sshTunnelService.ts",
"new_path": "src/service/common/sshTunnelService.ts",
"diff": "@@ -52,7 +52,7 @@ export class SSHTunnelService {\nresolve({ ...connectionNode, port } as Node)\n});\nlocalTunnel.on('error', (err) => {\n- Console.log('Ssh tunel occur eror : ' + err);\n+ Console.log('Ssh tunel occur error : ' + err);\nif (err && errorCallback) {\nlocalTunnel.close()\ndelete this.tunelMark[key]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/abstractConnectService.ts",
"new_path": "src/service/connect/abstractConnectService.ts",
"diff": "@@ -3,6 +3,7 @@ import { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\nimport { ViewManager } from \"../../view/viewManager\";\nimport { Node } from \"../../model/interface/node\";\nimport { NodeUtil } from \"../../model/nodeUtil\";\n+import { Util } from \"../../common/util\";\nexport abstract class AbstractConnectService {\n@@ -30,7 +31,7 @@ export abstract class AbstractConnectService {\n},\nreceiveListener: async (webviewPanel, params) => {\nif (params.type === 'CONNECT_TO_SQL_SERVER') {\n- const connectNode = NodeUtil.build(params.connectionOption)\n+ const connectNode = Util.trim(NodeUtil.build(params.connectionOption))\ntry {\nawait this.connect(connectNode)\nprovider.addConnection(connectNode)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
trim connect white space
|
141,908 |
29.04.2020 18:34:16
| -28,800 |
26d4502f91b83a3883ab971e82c919dda1ae3ead
|
fix text type not quote
|
[
{
"change_type": "MODIFY",
"old_path": "resources/webview/pages/result/index.html",
"new_path": "resources/webview/pages/result/index.html",
"diff": "}\nconst type = this.getTypeByColumn(columnName).toLowerCase()\nswitch (type) {\n- case \"varchar\": case \"char\": case \"date\": case \"time\": case \"timestamp\": case \"datetime\":\n+ case \"varchar\": case \"char\": case \"date\": case \"time\": case \"timestamp\": case \"datetime\": case \"set\": case \"json\":\nreturn `'${value}'`\n+ default:\n+ if (type.indexOf(\"text\") != -1 || type.indexOf(\"blob\") != -1) { return `'${value}'` }\n}\nreturn value;\n},\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix text type not quote
|
141,908 |
29.04.2020 18:42:10
| -28,800 |
d3b0fb0f970dae249d29826efd5ad27f1d44759e
|
fix mock fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -93,7 +93,7 @@ export class MockRunner {\nsqlList.push(tempInsertSql)\n}\n- const connection = await ConnectionManager.getConnection({ ...mockModel, timezone: tableNode.timezone, getConnectId: () => `${mockModel.host}_${mockModel.port}_${mockModel.user}` } as any as Node)\n+ const connection = await ConnectionManager.getConnection({ ...tableNode } as any as Node)\nconst success = await QueryUnit.runBatch(connection, sqlList)\nvscode.commands.executeCommand(\"mysql.template.sql\", tableNode, true)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix mock fail
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.