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
|
25.01.2021 16:00:02
| -28,800
|
98676d213931fdede1d4fae38eceff531d991e29
|
Add snippet.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"configuration\": \"./syntaxes/es.configuration.json\"\n}\n],\n+ \"snippets\": [\n+ {\n+ \"language\": \"sql\",\n+ \"path\": \"./syntaxes/snippets.json\"\n+ }\n+ ],\n\"grammars\": [\n{\n\"language\": \"sql\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "syntaxes/snippets.json",
"diff": "+{\n+ \"SelectTemplate\": {\n+ \"prefix\": \"sel\",\n+ \"body\": [\n+ \"SELECT * FROM $1;\"\n+ ]\n+ }\n+}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add snippet.
|
141,908
|
25.01.2021 17:39:04
| -28,800
|
38e072c71eb359d69c46c3f975a8f56e077c79db
|
Implment column cache refresh.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -126,7 +126,7 @@ export class TableNode extends Node implements CopyAble {\npublic indexTemplate() {\nViewManager.createWebviewPanel({\n- path: \"app\", title: \"Design Table\",\n+ path: \"app\", title: `${this.table}@${this.database}`,\nsplitView: false, iconPath: Global.getExtPath(\"resources\", \"icon\", \"add.svg\"),\neventHandler: (handler => {\nhandler.on(\"init\", () => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<template>\n<div>\n<div class=\"design-toolbar\">\n- <el-button @click=\"index.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n+ <el-button @click=\"column.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n- <ux-grid :data=\"designData.editIndex\" stripe style=\"width: 100%\">\n- <ux-table-column align=\"center\" field=\"index_name\" title=\"index_name\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"column_name\" title=\"column_name\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"non_unique\" title=\"non_unique\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"index_type\" title=\"index_type\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\">\n+ <ux-table-column align=\"center\" field=\"name\" title=\"name\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"key\" title=\"key\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"nullable\" title=\"nullable\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"type\" title=\"type\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"simpleType\" title=\"simpleType\" show-overflow-tooltip=\"true\"></ux-table-column>\n<ux-table-column title=\"Operation\" width=\"120\">\n<template v-slot=\"{ row }\">\n<el-button @click=\"deleteConfirm(row)\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle> </el-button>\n</template>\n</ux-table-column>\n</ux-grid>\n- <el-dialog :title=\"'Add Index'\" :visible.sync=\"index.visible\" width=\"30%\" top=\"3vh\" size=\"mini\">\n+ <el-dialog :title=\"'Add Column'\" :visible.sync=\"column.visible\" width=\"30%\" top=\"3vh\" size=\"mini\">\n<el-form>\n- <el-form-item label=\"Export File Type\">\n- <el-select v-model=\"index.type\">\n- <el-option :label=\"'UNIQUE'\" value=\"UNIQUE\"></el-option>\n- <el-option :label=\"'INDEX'\" value=\"INDEX\"></el-option>\n- <el-option :label=\"'PRIMARY KEY'\" value=\"PRIMARY KEY\"></el-option>\n- </el-select>\n+ <el-form-item label=\"Column Name\">\n+ <el-input v-model=\"column.name\"></el-input>\n</el-form-item>\n- <el-form-item label=\"Column\">\n- <el-input v-model=\"index.column\"></el-input>\n+ <el-form-item label=\"Column type\">\n+ <el-input v-model=\"column.type\"></el-input>\n</el-form-item>\n</el-form>\n<span slot=\"footer\" class=\"dialog-footer\">\n- <el-button type=\"primary\" :loading=\"index.loading\" @click=\"createIndex\">Create</el-button>\n- <el-button @click=\"index.visible=false\">Cancel</el-button>\n+ <el-button type=\"primary\" :loading=\"column.loading\" @click=\"createcolumn\">Create</el-button>\n+ <el-button @click=\"column.visible=false\">Cancel</el-button>\n</span>\n</el-dialog>\n</div>\n<script>\nimport { getVscodeEvent } from \"../util/vscode\";\nimport { wrapByDb } from \"@/common/wrapper\";\n-const vscodeEvent = getVscodeEvent();\n+let vscodeEvent;\nexport default {\ndata() {\nreturn {\n- designData: { indexs: [], table: null, dbType: null },\n- index: {\n+ designData: {\n+ table: null,\n+ dbType: null,\n+ columnList: [],\n+ editColumnList: [],\n+ },\n+ column: {\nvisible: false,\nloading: false,\ncolumn: null,\n@@ -52,36 +54,37 @@ export default {\n};\n},\nmounted() {\n+ vscodeEvent = getVscodeEvent();\nvscodeEvent\n.on(\"design-data\", (data) => {\n- console.log(123123)\nthis.designData = data;\n- this.designData.editIndex = [...this.designData.indexs];\n+ this.designData.editColumnList = [...this.designData.columnList];\n})\n.on(\"success\", () => {\n- this.index.loading = false;\n- this.index.visible = false;\n+ this.column.loading = false;\n+ this.column.visible = false;\nthis.refresh();\n})\n.on(\"error\", (msg) => {\nthis.$message.error(msg);\n});\n+ vscodeEvent.emit(\"route-\" + this.$route.name);\n},\nmethods: {\n- createIndex() {\n- this.index.loading = true;\n+ createcolumn() {\n+ this.column.loading = true;\nthis.execute(\n`ALTER TABLE ${wrapByDb(\nthis.designData.table,\nthis.designData.dbType\n- )} ADD ${this.index.type} (${wrapByDb(\n- this.index.column,\n+ )} ADD ${wrapByDb(\n+ this.column.name,\nthis.designData.dbType\n- )})`\n+ )} ${this.column.type}`\n);\n},\ndeleteConfirm(row) {\n- this.$confirm(\"Are you sure you want to delete this data?\", \"Warning\", {\n+ this.$confirm(\"Are you sure you want to delete this column?\", \"Warning\", {\nconfirmButtonText: \"OK\",\ncancelButtonText: \"Cancel\",\ntype: \"warning\",\n@@ -90,7 +93,7 @@ export default {\n`ALTER TABLE ${wrapByDb(\nthis.designData.table,\nthis.designData.dbType\n- )} DROP INDEX ${row.index_name}`\n+ )} DROP COLUMN ${row.name}`\n);\n});\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/IndexPanel.vue",
"new_path": "src/vue/design/IndexPanel.vue",
"diff": "</ux-grid>\n<el-dialog :title=\"'Add Index'\" :visible.sync=\"index.visible\" width=\"30%\" top=\"3vh\" size=\"mini\">\n<el-form>\n- <el-form-item label=\"Export File Type\">\n+ <el-form-item label=\"Index Type\">\n<el-select v-model=\"index.type\">\n<el-option :label=\"'UNIQUE'\" value=\"UNIQUE\"></el-option>\n<el-option :label=\"'INDEX'\" value=\"INDEX\"></el-option>\n<script>\nimport { getVscodeEvent } from \"../util/vscode\";\nimport { wrapByDb } from \"@/common/wrapper\";\n-const vscodeEvent = getVscodeEvent();\n+let vscodeEvent;\nexport default {\ndata() {\nreturn {\n@@ -52,6 +52,7 @@ export default {\n};\n},\nmounted() {\n+ vscodeEvent = getVscodeEvent();\nvscodeEvent\n.on(\"design-data\", (data) => {\nthis.designData = data;\n@@ -65,6 +66,7 @@ export default {\n.on(\"error\", (msg) => {\nthis.$message.error(msg);\n});\n+ vscodeEvent.emit(\"route-\" + this.$route.name);\n},\nmethods: {\ncreateIndex() {\n@@ -80,7 +82,7 @@ export default {\n);\n},\ndeleteConfirm(row) {\n- this.$confirm(\"Are you sure you want to delete this data?\", \"Warning\", {\n+ this.$confirm(\"Are you sure you want to delete this index?\", \"Warning\", {\nconfirmButtonText: \"OK\",\ncancelButtonText: \"Cancel\",\ntype: \"warning\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "<script>\nimport { getVscodeEvent } from \"../util/vscode\";\nimport { wrapByDb } from \"@/common/wrapper\";\n-const vscodeEvent = getVscodeEvent();\n+let vscodeEvent;\nexport default {\ndata() {\nreturn {\n@@ -52,6 +52,7 @@ export default {\n};\n},\nmounted() {\n+ vscodeEvent = getVscodeEvent();\nvscodeEvent\n.on(\"design-data\", (data) => {\nthis.designData = data;\n@@ -65,6 +66,7 @@ export default {\n.on(\"error\", (msg) => {\nthis.$message.error(msg);\n});\n+ vscodeEvent.emit(\"route-\" + this.$route.name);\n},\nmethods: {\ncreateIndex() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/index.vue",
"new_path": "src/vue/design/index.vue",
"diff": "@@ -35,7 +35,7 @@ export default {\nvscodeEvent.destroy();\n},\nmounted() {\n- vscodeEvent.emit(\"route-\" + this.$route.name);\n+\n},\nmethods: {\nrefresh() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Implment column cache refresh.
|
141,908
|
25.01.2021 18:18:45
| -28,800
|
3f675fd6794a7e914b460efa842851776925fd66
|
Refresh when design table.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -144,6 +144,7 @@ export class TableNode extends Node implements CopyAble {\n}).on(\"execute\", async sql => {\ntry {\nawait this.execute(sql)\n+ await this.getChildren(true)\nhandler.emit(\"success\")\n} catch (error) {\nhandler.emit(\"error\", error.message)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Refresh when design table.
|
141,908
|
25.01.2021 21:10:16
| -28,800
|
bb3d4a8b1a823c23877f9627e7662be696e18ba6
|
Support close connection.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+# 3.3.0 Preview\n+\n+- Support close connection.\n+- Add `sel` snippet.\n+- compatible with old vscode version.\n+\n# 3.2.2 2020/1/25\n- Fix redis folder Infinite recursion load bug.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"command\": \"mysql.connection.edit\",\n\"title\": \"%command.connection.edit%\",\n\"category\": \"MySQL\"\n+ },{\n+ \"command\": \"mysql.connection.disable\",\n+ \"title\": \"%command.connection.disable%\",\n+ \"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.server.info\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n\"group\": \"1_mysql@2\"\n},\n+ {\n+ \"command\": \"mysql.connection.disable\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n+ \"group\": \"1_mysql@4\"\n+ },\n{\n\"command\": \"mysql.host.copy\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n- \"group\": \"1_mysql@3\"\n+ \"group\": \"1_mysql@6\"\n},\n{\n\"command\": \"mysql.database.add\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.diagram.drop\": \"Drop Diagram\",\n\"command.connection.add\": \"Add Connection\",\n\"command.connection.edit\": \"Edit Connection\",\n+ \"command.connection.disable\": \"Close Connection\",\n\"command.struct.diff\": \"Database Struct Sync\",\n\"command.server.info\": \"Server Status\",\n\"command.connection.delete\": \"Delete Connection\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/icon/close.svg",
"diff": "+<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->\n+<svg version=\"1.1\" id=\"Layer_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n+ viewBox=\"0 0 512 512\" style=\"enable-background:new 0 0 512 512;\" xml:space=\"preserve\">\n+<ellipse style=\"fill:#E04F5F;\" cx=\"256\" cy=\"256\" rx=\"256\" ry=\"255.832\"/>\n+<g transform=\"matrix(-0.7071 0.7071 -0.7071 -0.7071 77.26 32)\">\n+ <rect x=\"3.98\" y=\"-427.615\" style=\"fill:#FFFFFF;\" width=\"55.992\" height=\"285.672\"/>\n+ <rect x=\"-110.828\" y=\"-312.815\" style=\"fill:#FFFFFF;\" width=\"285.672\" height=\"55.992\"/>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+</svg>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -85,7 +85,13 @@ export function activate(context: vscode.ExtensionContext) {\nserviceManager.connectService.openConnect(serviceManager.provider)\n},\n\"mysql.connection.edit\": (connectionNode: ConnectionNode) => {\n- serviceManager.connectService.openConnect(serviceManager.provider, connectionNode)\n+ serviceManager.connectService.openConnect(connectionNode.provider, connectionNode)\n+ },\n+ \"mysql.connection.open\":(connectionNode: ConnectionNode)=>{\n+ connectionNode.provider.openConnection(connectionNode)\n+ },\n+ \"mysql.connection.disable\": (connectionNode: ConnectionNode) => {\n+ connectionNode.provider.disableConnection(connectionNode)\n},\n\"mysql.connection.delete\": (connectionNode: ConnectionNode) => {\nconnectionNode.deleteConnection(context);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -8,7 +8,7 @@ import { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { CopyAble } from \"../interface/copyAble\";\n-import { Node } from \"../interface/node\";\n+import { CommandKey, Node } from \"../interface/node\";\nimport { NodeUtil } from \"../nodeUtil\";\nimport { InfoNode } from \"../other/infoNode\";\nimport { DatabaseNode } from \"./databaseNode\";\n@@ -30,15 +30,21 @@ export class ConnectionNode extends Node implements CopyAble {\nthis.label = `${parent.name}_${this.uid}`\nthis.name = parent.name\n}\n- if (this.dbType == DatabaseType.PG) {\n- this.iconPath = path.join(Constants.RES_PATH, \"icon/pg_server.svg\");\n- } else if (this.dbType == DatabaseType.MSSQL) {\n- this.iconPath = path.join(Constants.RES_PATH, \"icon/mssql_server.png\");\n+ if (this.disable) {\n+ this.collapsibleState = vscode.TreeItemCollapsibleState.None;\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/close.svg\");\n+ return;\n}\nconst lcp = ConnectionManager.getLastConnectionOption(false);\nif (lcp && lcp.getConnectId() == this.getConnectId()) {\nthis.iconPath = path.join(Constants.RES_PATH, \"icon/connection-active.svg\");\nthis.description = `Active`\n+ return;\n+ }\n+ if (this.dbType == DatabaseType.PG) {\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/pg_server.svg\");\n+ } else if (this.dbType == DatabaseType.MSSQL) {\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/mssql_server.png\");\n}\n}\n@@ -124,13 +130,7 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async deleteConnection(context: vscode.ExtensionContext) {\nUtil.confirm(`Are you want to Delete Connection ${this.uid} ? `, async () => {\n- const targetContext = this.global === false ? context.workspaceState : context.globalState;\n- const connections = targetContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n- ConnectionManager.removeConnection(this.uid)\n- DatabaseCache.clearDatabaseCache(this.uid)\n- delete connections[this.uid];\n- await targetContext.update(CacheKey.ConectionsKey, NodeUtil.removeParent(connections));\n- DbTreeDataProvider.refresh();\n+ this.indent({command:CommandKey.delete})\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/es/model/esConnectionNode.ts",
"new_path": "src/model/es/model/esConnectionNode.ts",
"diff": "import { FileManager } from \"@/common/filesManager\";\nimport { Util } from \"@/common/util\";\n-import { NodeUtil } from \"@/model/nodeUtil\";\nimport { QueryGroup } from \"@/model/query/queryGroup\";\nimport { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\n-import { DatabaseCache } from \"@/service/common/databaseCache\";\nimport * as path from \"path\";\n-import { ExtensionContext, Range } from \"vscode\";\n-import { CacheKey, Constants, ModelType } from \"../../../common/constants\";\n+import { ExtensionContext, Range, TreeItemCollapsibleState } from \"vscode\";\n+import { Constants, ModelType } from \"../../../common/constants\";\nimport { ConnectionManager } from \"../../../service/connectionManager\";\n-import { Node } from \"../../interface/node\";\n+import { CommandKey, Node } from \"../../interface/node\";\nimport { EsBaseNode } from \"./esBaseNode\";\nimport { EsIndexGroup } from \"./esIndexGroupNode\";\nimport { EsTemplate } from \"./esTemplate\";\n@@ -27,6 +25,12 @@ export class EsConnectionNode extends EsBaseNode {\nthis.cacheSelf()\nconst lcp = ConnectionManager.getLastConnectionOption(false);\n+ if (this.disable) {\n+ this.collapsibleState = TreeItemCollapsibleState.None;\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/close.svg\");\n+ return;\n+ }\n+\nif (lcp && lcp.getConnectId() == this.getConnectId()) {\nthis.iconPath = path.join(Constants.RES_PATH, \"icon/connection-active.svg\");\n}\n@@ -69,13 +73,7 @@ export class EsConnectionNode extends EsBaseNode {\npublic async deleteConnection(context: ExtensionContext) {\nUtil.confirm(`Are you want to Delete Connection ${this.uid} ? `, async () => {\n- const targetContext = this.global === false ? context.workspaceState : context.globalState;\n- const connections = targetContext.get<{ [key: string]: Node }>(CacheKey.NOSQL_CONNECTION);\n- ConnectionManager.removeConnection(this.uid)\n- DatabaseCache.clearDatabaseCache(this.uid)\n- delete connections[this.uid];\n- await targetContext.update(CacheKey.NOSQL_CONNECTION, NodeUtil.removeParent(connections));\n- DbTreeDataProvider.refresh();\n+ this.indent({command:CommandKey.delete})\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "import { DatabaseType, ModelType } from \"@/common/constants\";\nimport { Util } from \"@/common/util\";\n+import { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\nimport { ConnectionManager } from \"@/service/connectionManager\";\nimport { SqlDialect } from \"@/service/dialect/sqlDialect\";\nimport { QueryUnit } from \"@/service/queryUnit\";\nimport { ServiceManager } from \"@/service/serviceManager\";\nimport * as vscode from \"vscode\";\n+import { Memento } from \"vscode\";\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\n+import { NodeUtil } from \"../nodeUtil\";\nimport { CopyAble } from \"./copyAble\";\nimport { SSHConfig } from \"./sshConfig\";\n@@ -31,14 +34,20 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic timezone?: string;\npublic certPath?: string;\npublic includeDatabases?: string;\n- public excludeDatabases?: string;\npublic global?: boolean;\n+ public disable?: boolean;\npublic usingSSH?: boolean;\npublic ssh?: SSHConfig;\npublic dbType?: DatabaseType;\npublic dialect?: SqlDialect;\n+ /**\n+ * contenxt\n+ */\n+ public provider?: DbTreeDataProvider;\n+ public context?: Memento;\n+\n/**\n* es only\n*/\n@@ -64,19 +73,66 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nthis.scheme = source.scheme\nthis.global = source.global\nthis.dbType = source.dbType\n+ this.disable = source.disable\nthis.includeDatabases = source.includeDatabases\n- this.excludeDatabases = source.excludeDatabases\n+ if (!this.provider) this.provider = source.provider\n+ if (!this.context) this.context = source.context\n+ // init dialect\nif (!this.dialect && this.dbType != DatabaseType.REDIS) {\nthis.dialect = ServiceManager.getDialect(this.dbType)\n}\n+ if(this.disable){\n+ this.command={command:\"mysql.connection.open\",title:\"Open Connection\",arguments:[this]}\n+ }\n+ this.initUid();\n+ // init tree state\n+ this.collapsibleState = DatabaseCache.getElementState(this)\n+ }\n+\n+\n+\n+ public initUid() {\n+ if (this.uid) return;\nif (this.contextValue == ModelType.CONNECTION) {\n- this.uid = this.getConnectId()\n+ this.uid = this.getConnectId();\n} else if (this.contextValue == ModelType.DATABASE) {\n- this.uid = `${this.getConnectId({ withDbForce: true })}`\n+ this.uid = `${this.getConnectId({ withDbForce: true })}`;\n} else {\n- this.uid = `${this.getConnectId({ withDbForce: true })}#${this.label}`\n+ this.uid = `${this.getConnectId({ withDbForce: true })}#${this.label}`;\n}\n- this.collapsibleState = DatabaseCache.getElementState(this)\n+ }\n+\n+ public async indent(command: IndentCommand) {\n+\n+ const cacheKey = command.cacheKey || this.provider.connectionKey;\n+ const connections = this.context.get<{ [key: string]: Node }>(cacheKey);\n+ if (!this.uid) {\n+ this.uid = this.getConnectId();\n+ }\n+\n+ switch (command.command) {\n+ case CommandKey.add:\n+ connections[this.uid] = NodeUtil.removeParent(this);\n+ break;\n+ case CommandKey.update:\n+ connections[this.uid] = NodeUtil.removeParent(this);\n+ ConnectionManager.removeConnection(this.uid)\n+ DatabaseCache.clearDatabaseCache(this.uid)\n+ break;\n+ case CommandKey.delete:\n+ ConnectionManager.removeConnection(this.uid)\n+ delete connections[this.uid]\n+ default:\n+ break;\n+ }\n+\n+\n+ await this.context.update(cacheKey, connections);\n+\n+ if (command.refresh !== false) {\n+ DbTreeDataProvider.refresh();\n+ }\n+\n}\npublic static nodeCache = {};\n@@ -148,3 +204,11 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\n}\n}\n+export class IndentCommand {\n+ command: CommandKey;\n+ refresh?: boolean;\n+ cacheKey?: string;\n+}\n+export enum CommandKey {\n+ update, add, delete\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/nodeUtil.ts",
"new_path": "src/model/nodeUtil.ts",
"diff": "@@ -21,13 +21,13 @@ export abstract class NodeUtil {\nif (!nodes) return null;\n// if is node instance\nif (nodes instanceof Node) {\n- return { ...nodes, parent: null };\n+ return { ...nodes, parent: null, provider: null, context: null,command:null };\n}\n// if is node object map\nlet result = {};\nfor (const nodeKey of Object.keys(nodes)) {\nif (!nodes[nodeKey]) continue;\n- result[nodeKey] = { ...nodes[nodeKey], parent: null }\n+ result[nodeKey] = { ...nodes[nodeKey], parent: null, provider: null, context: null,command:null }\n}\nreturn result;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/redisConnectionNode.ts",
"new_path": "src/model/redis/redisConnectionNode.ts",
"diff": "-import { CacheKey, Constants, ModelType } from \"@/common/constants\";\n-import { Node } from \"@/model/interface/node\";\n+import { Constants, ModelType } from \"@/common/constants\";\n+import { Util } from \"@/common/util\";\n+import { CommandKey, Node } from \"@/model/interface/node\";\nimport { NodeUtil } from \"@/model/nodeUtil\";\nimport { ViewManager } from \"@/view/viewManager\";\nimport * as path from \"path\";\nimport { promisify } from \"util\";\nimport * as vscode from \"vscode\";\n-import RedisBaseNode from \"./redisBaseNode\";\nimport { FolderNode } from \"./folderNode\";\n-import KeyNode from \"./keyNode\";\n-import { Util } from \"@/common/util\";\n-import { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\n-import { DatabaseCache } from \"@/service/common/databaseCache\";\n-import { ConnectionManager } from \"@/service/connectionManager\";\n+import RedisBaseNode from \"./redisBaseNode\";\nexport class RedisConnectionNode extends RedisBaseNode {\n@@ -23,6 +19,11 @@ export class RedisConnectionNode extends RedisBaseNode {\nconstructor(readonly uid: string, readonly parent: Node) {\nsuper(uid)\nthis.init(parent)\n+ if (this.disable) {\n+ this.collapsibleState = vscode.TreeItemCollapsibleState.None;\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/close.svg\");\n+ return;\n+ }\n}\nasync getChildren(): Promise<RedisBaseNode[]> {\n@@ -81,13 +82,7 @@ export class RedisConnectionNode extends RedisBaseNode {\npublic async deleteConnection(context: vscode.ExtensionContext) {\nUtil.confirm(`Are you want to Delete Connection ${this.uid} ? `, async () => {\n- const targetContext = this.global === false ? context.workspaceState : context.globalState;\n- const connections = targetContext.get<{ [key: string]: Node }>(CacheKey.NOSQL_CONNECTION);\n- ConnectionManager.removeConnection(this.uid)\n- DatabaseCache.clearDatabaseCache(this.uid)\n- delete connections[this.uid];\n- await targetContext.update(CacheKey.NOSQL_CONNECTION, NodeUtil.removeParent(connections));\n- DbTreeDataProvider.refresh();\n+ this.indent({command:CommandKey.delete})\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -4,7 +4,7 @@ import { ConnectionManager } from \"../service/connectionManager\";\nimport { DatabaseCache } from \"../service/common/databaseCache\";\nimport { ConnectionNode } from \"../model/database/connectionNode\";\nimport { DatabaseNode } from \"../model/database/databaseNode\";\n-import { Node } from \"../model/interface/node\";\n+import { CommandKey, Node } from \"../model/interface/node\";\nimport { UserGroup } from \"../model/database/userGroup\";\nimport { Global } from \"../common/global\";\nimport { NodeUtil } from \"@/model/nodeUtil\";\n@@ -18,7 +18,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic readonly onDidChangeTreeData: vscode.Event<Node> = this._onDidChangeTreeData.event;\nprivate static instances: DbTreeDataProvider[] = []\n- constructor(protected context: vscode.ExtensionContext,readonly connectionKey:string) {\n+ constructor(protected context: vscode.ExtensionContext, public readonly connectionKey: string) {\nDbTreeDataProvider.instances.push(this)\n}\n@@ -57,33 +57,25 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\n}\n}\n- public async addConnection(connectionNode: Node) {\n+ public async openConnection(connectionNode: ConnectionNode) {\n+ connectionNode.disable = false;\n+ connectionNode.indent({ command: CommandKey.update })\n+ }\n- await this.removeOldConnection(connectionNode);\n+ public async disableConnection(connectionNode: ConnectionNode) {\n+ connectionNode.disable = true;\n+ connectionNode.indent({ command: CommandKey.update })\n+ }\n- const targetContext = connectionNode.global === false ? this.context.workspaceState : this.context.globalState;\n- let connections = targetContext.get<{ [key: string]: Node }>(this.getKeyByNode(connectionNode), {});\n- const connectId = connectionNode.getConnectId();\n- connections[connectId] = connectionNode;\n- ConnectionManager.removeConnection(connectId)\n- await targetContext.update(this.getKeyByNode(connectionNode), NodeUtil.removeParent(connections));\n- DbTreeDataProvider.refresh();\n+ public async addConnection(node: Node) {\n+ if ((node as any).isGlobal != null) {\n+ await node.indent({ command: CommandKey.delete })\n}\n- /**\n- * if is add from edit, clear previous connection info.\n- * isGlobal is a temp properties.\n- */\n- private async removeOldConnection(connectionNode: Node) {\n- const editGlobal = (connectionNode as any).isGlobal;\n- if (editGlobal != null) {\n- const isGlobal = editGlobal !== false;\n- const oldContext = isGlobal ? this.context.globalState : this.context.workspaceState;\n- const oldConnections = oldContext.get<{ [key: string]: Node; }>(this.getKeyByNode(connectionNode));\n- delete oldConnections[connectionNode.getConnectId({ isGlobal })];\n- await oldContext.update(this.getKeyByNode(connectionNode), NodeUtil.removeParent(oldConnections));\n- }\n+ node.context = node.global === false ? this.context.workspaceState : this.context.globalState\n+ node.indent({ command: CommandKey.add, cacheKey: this.getKeyByNode(node) })\n+\n}\nprivate getKeyByNode(connectionNode: Node): string {\n@@ -117,24 +109,28 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nreturn Object.keys(connections).map(key => {\nconst connectInfo = connections[key];\n- const connection = this.getNode(connectInfo, key);\n- if (typeof connectInfo.global == \"undefined\") {\n- // Compatible with older versions, will remove in the feature\n- connectInfo.global = true;\n- }\n- return connection;\n+ return this.getNode(connectInfo, key);\n})\n}\nprivate getNode(connectInfo: Node, key: string) {\n+ let node: Node;\nif (connectInfo.dbType == DatabaseType.ES) {\n- return new EsConnectionNode(key, connectInfo);\n+ node = new EsConnectionNode(key, connectInfo);\n}\nif (connectInfo.dbType == DatabaseType.REDIS) {\n- return new RedisConnectionNode(key, connectInfo)\n+ node = new RedisConnectionNode(key, connectInfo)\n+ } else {\n+ node = new ConnectionNode(key, connectInfo)\n+ }\n+ node.provider = this\n+ // Compatible with older versions\n+ if (node.global !== false) {\n+ node.global = true;\n}\n- return new ConnectionNode(key, connectInfo);\n+ node.context = node.global === false ? this.context.workspaceState : this.context.globalState;\n+ return node;\n}\npublic async activeDb() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support close connection.
|
141,908
|
25.01.2021 21:13:57
| -28,800
|
1edb8bc44033c4902d42c09e14abfa78ff61468f
|
fix code len detect comment as sql.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "- Support close connection.\n- Add `sel` snippet.\n- compatible with old vscode version.\n+- Fix code len detect comment as sql.\n# 3.2.2 2020/1/25\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/sqlCodeLensProvider.ts",
"new_path": "src/provider/sqlCodeLensProvider.ts",
"diff": "@@ -19,7 +19,7 @@ export class SqlCodeLensProvider implements vscode.CodeLensProvider {\nconst lineCount = Math.min(document.lineCount, 500);\nfor (var i = 0; i < lineCount; i++) {\nvar line = document.lineAt(i)\n- var text = line.text;\n+ var text = line.text?.replace(/(--|#).+/,'');\nsql = sql +\"\\n\"+ text;\nif (text?.trim() && !start) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix code len detect comment as sql.
|
141,908
|
25.01.2021 22:16:54
| -28,800
|
71eed4c7751619e29fbf4220a9efef2d7b6bc107
|
Add more chinese content.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "- compatible with old vscode version.\n- Fix code len detect comment as sql.\n- Add context menu to result view.\n+- Add more chinese content.\n# 3.2.2 2020/1/25\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"configuration\": {\n\"type\": \"object\",\n- \"title\": \"MySQL\",\n+ \"title\": \"%config.title%\",\n\"properties\": {\n\"vscode-mysql.enableDelimiter\": {\n\"type\": \"boolean\",\n\"default\": false,\n- \"description\": \"Support delimiter when import sql.\"\n+ \"description\": \"%config.enableDelimiter%\"\n},\n\"vscode-mysql.loadMetaOnConnect\": {\n\"type\": \"boolean\",\n\"default\": true,\n- \"description\": \"Load database meta info when connected, If your machine's performance is low, turn it off.\"\n+ \"description\": \"%config.loadMetaOnConnect%\"\n},\n\"vscode-mysql.defaultSelectLimit\": {\n\"type\": \"integer\",\n\"default\": 100,\n- \"description\": \"Default limit of query sql.\"\n+ \"description\": \"%config.defaultSelectLimit%\"\n},\n\"vscode-mysql.showTotal\": {\n\"type\": \"boolean\",\n\"default\": true,\n- \"description\": \"Show total on result view.\"\n+ \"description\": \"%config.showTotal%\"\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.redis.connection.terminal\": \"Open Terminal\",\n\"command.redis.connection.status\": \"Server status\",\n\"command.redis.key.del\": \"Delete Key\",\n- \"command.redis.key.detail\": \"View Key Detail\"\n+ \"command.redis.key.detail\": \"View Key Detail\",\n+ \"config.title\":\"Database Client\",\n+ \"config.enableDelimiter\":\"Support delimiter when import sql.\",\n+ \"config.loadMetaOnConnect\":\"Load database meta info when connected, If your machine's performance is low, turn it off.\",\n+ \"config.defaultSelectLimit\":\"Default limit of query sql.\",\n+ \"config.showTotal\": \"Show total on result view.\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "syntaxes/snippets.json",
"new_path": "syntaxes/snippets.json",
"diff": "\"SelectTemplate\": {\n\"prefix\": \"sel\",\n\"body\": [\n- \"SELECT * FROM $1;\"\n+ \"SELECT * FROM $1\"\n]\n}\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add more chinese content.
|
141,908
|
25.01.2021 22:21:29
| -28,800
|
b7e375356b8965a49244d8c92794588838438c97
|
Adjust view.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<div class=\"design-toolbar\">\n<el-button @click=\"column.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n- <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\">\n+ <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '35px'}\">\n<ux-table-column align=\"center\" field=\"name\" title=\"name\" show-overflow-tooltip=\"true\"></ux-table-column>\n<ux-table-column align=\"center\" field=\"key\" title=\"key\" show-overflow-tooltip=\"true\"></ux-table-column>\n<ux-table-column align=\"center\" field=\"nullable\" title=\"nullable\" show-overflow-tooltip=\"true\"></ux-table-column>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/IndexPanel.vue",
"new_path": "src/vue/design/IndexPanel.vue",
"diff": "<div class=\"design-toolbar\">\n<el-button @click=\"index.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n- <ux-grid :data=\"designData.editIndex\" stripe style=\"width: 100%\">\n+ <ux-grid :data=\"designData.editIndex\" stripe style=\"width: 100%\" :cell-style=\"{height: '35px'}\">\n<ux-table-column align=\"center\" field=\"index_name\" title=\"index_name\" show-overflow-tooltip=\"true\"></ux-table-column>\n<ux-table-column align=\"center\" field=\"column_name\" title=\"column_name\" show-overflow-tooltip=\"true\"></ux-table-column>\n<ux-table-column align=\"center\" field=\"non_unique\" title=\"non_unique\" show-overflow-tooltip=\"true\"></ux-table-column>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adjust view.
|
141,908
|
25.01.2021 22:24:52
| -28,800
|
7c50429c7030e689288960f06ea0a37ee7f81c28
|
Fix es connection gone.
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -118,8 +118,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nlet node: Node;\nif (connectInfo.dbType == DatabaseType.ES) {\nnode = new EsConnectionNode(key, connectInfo);\n- }\n- if (connectInfo.dbType == DatabaseType.REDIS) {\n+ }else if (connectInfo.dbType == DatabaseType.REDIS) {\nnode = new RedisConnectionNode(key, connectInfo)\n} else {\nnode = new ConnectionNode(key, connectInfo)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix es connection gone.
|
141,908
|
25.01.2021 22:31:28
| -28,800
|
d2af8275fa885ec6b7f95eb7e01c0f408ecc3f13
|
Adjust context.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"when\": \"view =~ /cweijan.+?ql/ && viewItem == table && false\",\n\"group\": \"inline@1\"\n},\n+ {\n+ \"command\": \"mysql.index.template\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n+ \"group\": \"1_inline@0\"\n+ },\n{\n\"command\": \"mysql.table.source\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(table|view)$/\",\n- \"group\": \"1_inline@0\"\n+ \"group\": \"1_inline@2\"\n},\n{\n\"command\": \"mysql.count.sql\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(table|view|esIndex)$/\",\n- \"group\": \"1_inline@3\"\n+ \"group\": \"1_inline@4\"\n},\n{\n\"command\": \"mysql.column.add\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n- \"group\": \"1_inline@4\"\n+ \"group\": \"1_inline@6\"\n},\n{\n\"command\": \"mysql.mock.table\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n\"group\": \"2_mysql@2\"\n},\n- {\n- \"command\": \"mysql.index.template\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n- \"group\": \"1_inline@7\"\n- },\n{\n\"command\": \"mysql.refresh\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == tableGroup\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adjust context.
|
141,908
|
25.01.2021 22:41:21
| -28,800
|
650b4f6e2b05ed04b9a33d97064dddfc57e3c97d
|
Support rename
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -90,6 +90,10 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\n}\n+ public async refresh(){\n+ await this.getChildren(true)\n+ this.provider.reload(this)\n+ }\npublic initUid() {\nif (this.uid) return;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -141,10 +141,19 @@ export class TableNode extends Node implements CopyAble {\nreturn columnNode.column;\n});\nhandler.emit('design-data', { indexs: result, table: this.table, comment: this.comment, columnList, primaryKey, dbType: this.dbType })\n+ }).on(\"rename\", async newTableName => {\n+ const sql = this.dialect.renameTable(this.database, this.table, newTableName);\n+ try {\n+ await this.execute(sql)\n+ await this.parent.refresh()\n+ handler.emit(\"success\")\n+ } catch (error) {\n+ handler.emit(\"error\", error.message)\n+ }\n}).on(\"execute\", async sql => {\ntry {\nawait this.execute(sql)\n- await this.getChildren(true)\n+ await this.parent.refresh()\nhandler.emit(\"success\")\n} catch (error) {\nhandler.emit(\"error\", error.message)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -87,6 +87,10 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\n}\n+ public reload(element?:Node){\n+ this._onDidChangeTreeData.fire(element);\n+ }\n+\n/**\n* refresh treeview context\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "<el-form-item label=\"Table\">\n<el-input v-model=\"table.name\"></el-input>\n</el-form-item>\n- <el-form-item label=\"Comment\">\n+ <!-- <el-form-item label=\"Comment\">\n<el-input v-model=\"table.comment\"></el-input>\n- </el-form-item>\n- <el-button>Update</el-button>\n+ </el-form-item> -->\n+ <el-button @click=\"rename\">Update</el-button>\n</el-form>\n</div>\n</template>\n@@ -39,8 +39,7 @@ export default {\nthis.designData.editIndex = [...this.designData.indexs];\n})\n.on(\"success\", () => {\n- this.index.loading = false;\n- this.index.visible = false;\n+ this.$message.success(\"Rename success!\")\nthis.refresh();\n})\n.on(\"error\", (msg) => {\n@@ -49,6 +48,9 @@ export default {\nvscodeEvent.emit(\"route-\" + this.$route.name);\n},\nmethods: {\n+ rename(){\n+ vscodeEvent.emit('rename',this.table.name)\n+ },\ncreateIndex() {\nthis.index.loading = true;\nthis.execute(\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support rename
|
141,908
|
26.01.2021 11:02:22
| -28,800
|
371ff216291921f7f67a6760ede5fe11e44fa521
|
Support change table comment.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -127,8 +127,8 @@ export class TableNode extends Node implements CopyAble {\nreturn columnNode.column;\n});\nhandler.emit('design-data', { indexs: result, table: this.table, comment: this.comment, columnList, primaryKey, dbType: this.dbType })\n- }).on(\"rename\", async newTableName => {\n- const sql = this.dialect.renameTable(this.database, this.table, newTableName);\n+ }).on(\"updateTable\", async ({newTableName,newComment}) => {\n+ const sql = this.dialect.updateTable({table:this.table,newTableName,comment:this.comment,newComment});\ntry {\nawait this.execute(sql)\nawait this.refresh()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/esDialect.ts",
"new_path": "src/service/dialect/esDialect.ts",
"diff": "+import { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class EsDialect extends SqlDialect{\n@@ -58,7 +59,7 @@ export class EsDialect extends SqlDialect{\ntruncateDatabase(database: string): string {\nreturn \"\";\n}\n- renameTable(database: string, tableName: string, newName: string): string {\n+ updateTable(update: UpdateTableParam): string {\nreturn \"\";\n}\nshowTableSource(database: string, table: string): string {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "import { window } from \"vscode\";\n+import { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect extends SqlDialect {\n@@ -33,8 +34,9 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\nshowUsers(): string {\nreturn `SELECT name [user] from sys.database_principals where type='S'`\n}\n- renameTable(database: string, tableName: string, newName: string): string {\n- return `sp_rename '${tableName}', '${newName}'`;\n+ updateTable(update: UpdateTableParam):string{\n+ const {database,table,newTableName}=update\n+ return `sp_rename '${table}', '${newTableName}'`;\n}\ntruncateDatabase(database: string): string {\nreturn `SELECT Concat('TRUNCATE TABLE [',table_schema,'].[',TABLE_NAME, '];') trun FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_CATALOG='${database}'`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "+import { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect extends SqlDialect {\n@@ -40,8 +41,16 @@ export class MysqlDialect extends SqlDialect{\n}\nreturn `use \\`${database}\\``;\n}\n- renameTable(database: string, tableName: string, newName: string): string {\n- return `RENAME TABLE \\`${database}\\`.\\`${tableName}\\` to \\`${database}\\`.\\`${newName}\\``;\n+ updateTable(update: UpdateTableParam): string {\n+ const { table, newTableName, comment, newComment } = update\n+ let sql = \"\";\n+ if (newComment && newComment != comment) {\n+ sql = `ALTER TABLE ${table} COMMENT = '${newComment}';`;\n+ }\n+ if (newTableName && table != newTableName) {\n+ sql += `ALTER TABLE ${table} RENAME TO ${newTableName};`\n+ }\n+ return sql;\n}\ntruncateDatabase(database: string): string {\nreturn `SELECT Concat('TRUNCATE TABLE \\`',table_schema,'\\`.\\`',TABLE_NAME, '\\`;') trun FROM INFORMATION_SCHEMA.TABLES where table_schema ='${database}' and TABLE_TYPE<>'VIEW';`\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dialect/param/updateTableParam.ts",
"diff": "+export class UpdateTableParam {\n+ database?: string;\n+ table: string;\n+ newTableName: string;\n+ comment: string;\n+ newComment: string;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "+import { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect extends SqlDialect {\n@@ -32,8 +33,9 @@ ALTER TABLE ${table} ALTER COLUMN ${column} [SET|Drop] NOT NULL; -- update colum\nshowUsers(): string {\nreturn `SELECT usename \"user\" from pg_user `;\n}\n- renameTable(database: string, tableName: string, newName: string): string {\n- return `RENAME TABLE \"${database}\".\"${tableName}\" to \"${database}\".\"${newName}\"`;\n+ updateTable(update: UpdateTableParam): string {\n+ const {database,table,newTableName}=update\n+ return `RENAME TABLE \"${database}\".\"${table}\" to \"${database}\".\"${newTableName}\"`;\n}\ntruncateDatabase(database: string): string {\nreturn `SELECT Concat('TRUNCATE TABLE \"',TABLE_NAME, '\";') trun FROM INFORMATION_SCHEMA.TABLES WHERE table_schema ='public' AND table_type='BASE TABLE';`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "+import { UpdateTableParam } from \"./param/updateTableParam\";\n/**\n* TODO\n@@ -24,7 +25,7 @@ export abstract class SqlDialect {\nabstract countSql(database: string, table: string): string;\nabstract createDatabase(database: string): string;\nabstract truncateDatabase(database: string): string;\n- abstract renameTable(database: string, tableName: string, newName: string): string;\n+ abstract updateTable(update: UpdateTableParam): string;\nabstract showTableSource(database: string, table: string): string;\nabstract showViewSource(database: string, table: string): string;\nabstract showProcedureSource(database: string, name: string): string;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "<el-form-item label=\"Table\">\n<el-input v-model=\"table.name\"></el-input>\n</el-form-item>\n- <!-- <el-form-item label=\"Comment\">\n+ <el-form-item label=\"Comment\">\n<el-input v-model=\"table.comment\"></el-input>\n- </el-form-item> -->\n+ </el-form-item>\n<el-button @click=\"rename\">Update</el-button>\n</el-form>\n</div>\n@@ -47,7 +47,10 @@ export default {\n},\nmethods: {\nrename() {\n- this.emit(\"rename\", this.table.name);\n+ this.emit(\"updateTable\", {\n+ newTableName: this.table.name,\n+ newComment: this.table.comment,\n+ });\n},\ncreateIndex() {\nthis.index.loading = true;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support change table comment.
|
141,908
|
26.01.2021 11:18:24
| -28,800
|
9ccca7a9c66053b04225858cd35520dad4a0d7ce
|
Add snippets.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# 3.3.0 Preview\n- Support close connection.\n-- Add `sel` snippet.\n+- Add snippet to sql editor.\n- compatible with old vscode version.\n- Fix code len detect comment as sql.\n- Add context menu to result view.\n- Add more chinese content.\n+- Init design table.\n# 3.2.2 2020/1/25\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"dark\": \"resources/dark/query.svg\"\n}\n},\n- {\n- \"command\": \"mysql.template.sql\",\n- \"title\": \"%command.template.sql%\",\n- \"category\": \"MySQL\"\n- },\n{\n\"command\": \"mysql.data.import\",\n\"title\": \"%command.data.import%\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(table|view)$/\",\n\"group\": \"1_inline1@3\"\n},\n- {\n- \"command\": \"mysql.template.sql\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n- \"group\": \"1_mysql@0\"\n- },\n{\n\"command\": \"mysql.table.truncate\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.db.drop\": \"Drop Database\",\n\"command.runQuery\": \"Run MySQL Query\",\n\"command.query.switch\": \"Open Query\",\n- \"command.template.sql\": \"Select SQL Template\",\n- \"command.template.delete\": \"Delete SQL Template\",\n\"command.data.import\": \"Import Sql\",\n\"command.data.export\": \"Export Data\",\n\"command.struct.export\": \"Export Struct\",\n- \"command.copy.insert\": \"Insert SQL Template\",\n- \"command.copy.update\": \"Update SQL Template\",\n\"command.db.active\": \"Change Active Database\",\n\"command.table.truncate\": \"Truncate Table\",\n\"command.db.truncate\": \"Truncate Database\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -244,8 +244,8 @@ export function activate(context: vscode.ExtensionContext) {\n},\n// template\n...{\n- \"mysql.template.sql\": (tableNode: TableNode, run: boolean) => {\n- tableNode.selectSqlTemplate(run);\n+ \"mysql.table.find\": (tableNode: TableNode) => {\n+ tableNode.openTable();\n},\n\"mysql.codeLens.run\": (sql:string) => {\nQueryUnit.runQuery(sql)\n@@ -253,15 +253,6 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.table.design\": (tableNode: TableNode) => {\ntableNode.designTable();\n},\n- \"mysql.template.delete\": (tableNode: TableNode) => {\n- tableNode.deleteSqlTemplate();\n- },\n- \"mysql.copy.insert\": (tableNode: TableNode) => {\n- tableNode.insertSqlTemplate();\n- },\n- \"mysql.copy.update\": (tableNode: TableNode) => {\n- tableNode.updateSqlTemplate();\n- },\n},\n// show source\n...{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -28,7 +28,7 @@ export class TableNode extends Node implements CopyAble {\nthis.init(parent)\nthis.cacheSelf()\nthis.command = {\n- command: \"mysql.template.sql\",\n+ command: \"mysql.table.find\",\ntitle: \"Run Select Statement\",\narguments: [this, true],\n}\n@@ -169,16 +169,10 @@ export class TableNode extends Node implements CopyAble {\nQueryUnit.runQuery(this.dialect.countSql(this.wrap(this.database), this.wrap(this.table)), this);\n}\n- public async selectSqlTemplate(run: boolean) {\n+ public async openTable() {\nconst pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\nconst sql = this.dialect.buildPageSql(this.wrap(this.database), this.wrap(this.table), pageSize);\n-\n- if (run) {\nQueryUnit.runQuery(sql, this);\n- } else {\n- QueryUnit.showSQLTextDocument(this, sql, Template.table);\n- }\n-\n}\npublic insertSqlTemplate(show: boolean = true): Promise<string> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -86,7 +86,7 @@ export class MockRunner {\nconst connection = await ConnectionManager.getConnection({ ...tableNode } as any as Node)\nconst success = await QueryUnit.runBatch(connection, sqlList)\n- vscode.commands.executeCommand(\"mysql.template.sql\", tableNode, true)\n+ vscode.commands.executeCommand(\"mysql.table.find\", tableNode, true)\nQueryPage.send({ connection: tableNode, type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "syntaxes/snippets.json",
"new_path": "syntaxes/snippets.json",
"diff": "\"SelectTemplate\": {\n\"prefix\": \"sel\",\n\"body\": [\n- \"SELECT * FROM $1\"\n+ \"SELECT * FROM \"\n+ ]\n+ },\n+ \"SelectWhereTemplate\": {\n+ \"prefix\": \"selw\",\n+ \"body\": [\n+ \"SELECT * FROM $1 WHERE $2\"\n+ ]\n+ },\n+ \"DeleteTemplate\": {\n+ \"prefix\": \"del\",\n+ \"body\": [\n+ \"DELETE FROM \"\n+ ]\n+ },\n+ \"DeleteWhereTemplate\": {\n+ \"prefix\": \"delw\",\n+ \"body\": [\n+ \"DELETE FROM $1 WHERE $2\"\n+ ]\n+ },\n+ \"InsertTemplate\": {\n+ \"prefix\": \"ins\",\n+ \"body\": [\n+ \"INSERT INTO $1 VALUES ($2)\"\n+ ]\n+ },\n+ \"UpdateTemplate\": {\n+ \"prefix\": \"upd\",\n+ \"body\": [\n+ \"UPDATE $1 SET $2 WHERE $3\"\n+ ]\n+ },\"JoinTemplate\": {\n+ \"prefix\": \"joi\",\n+ \"body\": [\n+ \"JOIN $1 ON $2\"\n+ ]\n+ },\"BetweenTemplate\": {\n+ \"prefix\": \"bet\",\n+ \"body\": [\n+ \"BETWEEN $1 AND $2\"\n]\n}\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add snippets.
|
141,908
|
26.01.2021 16:30:17
| -28,800
|
70104f9155c0ef61ac5d15893303d6f08a499e8f
|
Extra createIndex dialect.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "-import { ViewManager } from \"@/common/viewManager\";\n+import { Hanlder, ViewManager } from \"@/common/viewManager\";\n+import { HistoryRecorder } from \"@/service/common/historyRecorder\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\nimport { ConfigKey, Constants, DatabaseType, MessageType, ModelType, Template } from \"../../common/constants\";\n@@ -110,7 +111,21 @@ export class TableNode extends Node implements CopyAble {\n}\n+\n+\npublic designTable() {\n+\n+ const executeAndRefresh=async(sql: string, handler: Hanlder)=>{\n+ try {\n+ await this.execute(sql)\n+ await this.refresh()\n+ await this.parent.refresh()\n+ handler.emit(\"success\")\n+ } catch (error) {\n+ handler.emit(\"error\", error.message)\n+ }\n+ }\n+\nViewManager.createWebviewPanel({\npath: \"app\", title: \"Design Table(Preview)\",\nsplitView: false, iconPath: Global.getExtPath(\"resources\", \"icon\", \"add.svg\"),\n@@ -129,23 +144,12 @@ export class TableNode extends Node implements CopyAble {\nhandler.emit('design-data', { indexs: result, table: this.table, comment: this.comment, columnList, primaryKey, dbType: this.dbType })\n}).on(\"updateTable\", async ({ newTableName, newComment }) => {\nconst sql = this.dialect.updateTable({ table: this.table, newTableName, comment: this.comment, newComment });\n- try {\n- await this.execute(sql)\n- await this.refresh()\n- await this.parent.refresh()\n- handler.emit(\"success\")\n- } catch (error) {\n- handler.emit(\"error\", error.message)\n- }\n+ await executeAndRefresh(sql,handler)\n}).on(\"execute\", async sql => {\n- try {\n- await this.execute(sql)\n- await this.refresh()\n- await this.parent.refresh()\n- handler.emit(\"success\")\n- } catch (error) {\n- handler.emit(\"error\", error.message)\n- }\n+ await executeAndRefresh(sql,handler)\n+ }).on(\"createIndex\",async ({column,type,indexType})=>{\n+ const sql = this.dialect.createIndex({column,type,indexType,table:this.wrap(this.table)});\n+ await executeAndRefresh(sql,handler)\n})\n})\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "import { window } from \"vscode\";\n+import { CreateIndexParam } from \"./param/createIndexParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect extends SqlDialect {\n+ createIndex(createIndexParam:CreateIndexParam): string{\n+ return `ALTER TABLE ${createIndexParam.table} ADD ${createIndexParam.type} (${createIndexParam.column})`;\n+ }\nshowIndex(database: string, table: string): string {\nthrow new Error(\"Method not implemented.\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "+import { CreateIndexParam } from \"./param/createIndexParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect extends SqlDialect {\n+ createIndex(createIndexParam:CreateIndexParam): string{\n+ return `ALTER TABLE ${createIndexParam.table} ADD ${createIndexParam.type} (${createIndexParam.column})`;\n+ }\nshowIndex(database: string, table: string): string {\nreturn `SELECT column_name,index_name,non_unique,index_type FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${database}' and table_name='${table}';`\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dialect/param/createIndexParam.ts",
"diff": "+export interface CreateIndexParam{\n+ table:string;\n+ column:string;\n+ type:string;\n+ indexType:string;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "+import { CreateIndexParam } from \"./param/createIndexParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect extends SqlDialect {\n+ createIndex(createIndexParam:CreateIndexParam): string{\n+ const indexType=createIndexParam.indexType||\"btree\"\n+ return `CREATE INDEX ${createIndexParam.column}_index ON ${createIndexParam.table} USING ${indexType} (${createIndexParam.column});`;\n+ }\nshowIndex(database: string, table: string): string {\nthrow new Error(\"Method not implemented.\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/IndexPanel.vue",
"new_path": "src/vue/design/IndexPanel.vue",
"diff": "@@ -54,8 +54,7 @@ export default {\n};\n},\nmounted() {\n- this\n- .on(\"design-data\", (data) => {\n+ this.on(\"design-data\", (data) => {\nthis.designData = data;\nthis.designData.editIndex = [...this.designData.indexs];\n})\n@@ -66,20 +65,17 @@ export default {\n})\n.on(\"error\", (msg) => {\nthis.$message.error(msg);\n- }).init()\n+ })\n+ .init();\n},\nmethods: {\ncreateIndex() {\nthis.index.loading = true;\n- this.execute(\n- `ALTER TABLE ${wrapByDb(\n- this.designData.table,\n- this.designData.dbType\n- )} ADD ${this.index.type} (${wrapByDb(\n- this.index.column,\n- this.designData.dbType\n- )})`\n- );\n+ this.emit(\"createIndex\", {\n+ column: this.index.column,\n+ type: this.index.type,\n+ indexType: this.index.indexType,\n+ });\n},\ndeleteConfirm(row) {\nthis.$confirm(\"Are you sure you want to delete this index?\", \"Warning\", {\n@@ -99,7 +95,7 @@ export default {\nif (!sql) return;\nthis.emit(\"execute\", sql);\n},\n- }\n+ },\n};\n</script>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Extra createIndex dialect.
|
141,908
|
26.01.2021 21:12:16
| -28,800
|
3dc0266e899c3062d7eff1b28129d89457bd5620
|
Support design postgresql table info.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnMeta.ts",
"new_path": "src/model/other/columnMeta.ts",
"diff": "@@ -38,5 +38,7 @@ export interface ColumnMeta {\n* extra info, auto_increment\n*/\nextra:any;\n+ isAutoIncrement:boolean;\n+ isUnique:boolean;\nisPrimary:boolean;\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": "@@ -18,7 +18,7 @@ export class ColumnNode extends Node implements CopyAble {\nsuper(column.name)\nthis.init(parent)\nthis.type = `${this.column.type}`\n- this.description = `${this.column.type} ${this.getIndex(this.column.key)} ${this.column.nullable == \"YES\" ? \"Nullable\" : \"NotNull\"} ${this.column.comment}`\n+ this.description = `${this.column.type} ${this.column.nullable == \"YES\" ? \"Nullable\" : \"NotNull\"} ${this.column.comment}`\nif (column && this.isPrimaryKey) {\nMockRunner.primaryKeyMap[this.parent.uid] = column.name\n}\n@@ -29,15 +29,21 @@ export class ColumnNode extends Node implements CopyAble {\ntitle: \"Update Column Statement\",\narguments: [this, true],\n}\n+ this.buildInfo()\n}\npublic copyName(): void {\nUtil.copyToBoard(this.column.name)\n}\n- private getIndex(columnKey: string) {\n+ private buildInfo() {\n+ if(this.column.extra=='auto_increment'){\n+ this.column.isAutoIncrement=true;\n+ }\n+ const columnKey: string = this.column.key;\nswitch (columnKey) {\ncase 'UNI':\ncase 'UNIQUE':\n+ this.column.isUnique = true;\nreturn \"UniqueKey\";\ncase 'MUL': return \"IndexKey\";\ncase 'PRI':\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mysqlConnection.ts",
"new_path": "src/service/connect/mysqlConnection.ts",
"diff": "@@ -13,11 +13,11 @@ export class MysqlConnection implements IConnection {\nconnectTimeout: 5000,\ntypeCast: function (field, next) {\n// if (field.type === 'TINY' && field.length === 1)\n- if (field.type === 'JSON') {\n+ // if (field.type === 'JSON') {\nreturn field?.buffer()?.toString();\n- } else {\n- return next();\n- }\n+ // } else {\n+ // return next();\n+ // }\n}\n} as mysql.ConnectionConfig;\nif (node.certPath && fs.existsSync(node.certPath)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -8,7 +8,21 @@ export class MssqlDIalect extends SqlDialect {\nreturn `ALTER TABLE ${createIndexParam.table} ADD ${createIndexParam.type} (${createIndexParam.column})`;\n}\nshowIndex(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ return `SELECT\n+ index_name = ind.name,\n+ column_name = col.name,\n+ ind.is_primary_key,\n+ ind.is_unique,\n+ ind.is_unique_constraint\n+ FROM\n+ sys.indexes ind\n+ INNER JOIN sys.index_columns ic ON ind.object_id = ic.object_id\n+ and ind.index_id = ic.index_id\n+ INNER JOIN sys.columns col ON ic.object_id = col.object_id\n+ and ic.column_id = col.column_id\n+ INNER JOIN sys.tables t ON ind.object_id = t.object_id\n+ WHERE\n+ t.name = '${table.split('.')[1]}';`\n}\nvariableList(): string {\nthrow new Error(\"Method not implemented.\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -8,7 +8,7 @@ export class PostgreSqlDialect extends SqlDialect {\nreturn `CREATE INDEX ${createIndexParam.column}_index ON ${createIndexParam.table} USING ${indexType} (${createIndexParam.column});`;\n}\nshowIndex(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ return `SELECT indexname index_name, indexdef FROM pg_indexes WHERE schemaname = 'public' and tablename='${table}'`\n}\nvariableList(): string {\nreturn 'SHOW ALL'\n@@ -39,8 +39,15 @@ ALTER TABLE ${table} ALTER COLUMN ${column} [SET|Drop] NOT NULL; -- update colum\nreturn `SELECT usename \"user\" from pg_user `;\n}\nupdateTable(update: UpdateTableParam): string {\n- const {database,table,newTableName}=update\n- return `RENAME TABLE \"${database}\".\"${table}\" to \"${database}\".\"${newTableName}\"`;\n+ const { table, newTableName, comment, newComment } = update\n+ let sql = \"\";\n+ if (newComment && newComment != comment) {\n+ sql = `COMMENT ON TABLE ${table} IS '${newComment}';`;\n+ }\n+ if (newTableName && table != newTableName) {\n+ sql += `ALTER TABLE ${table} RENAME TO ${newTableName};`\n+ }\n+ return sql;\n}\ntruncateDatabase(database: string): string {\nreturn `SELECT Concat('TRUNCATE TABLE \"',TABLE_NAME, '\";') trun FROM INFORMATION_SCHEMA.TABLES WHERE table_schema ='public' AND table_type='BASE TABLE';`\n@@ -95,7 +102,12 @@ ALTER TABLE ${table} ALTER COLUMN ${column} [SET|Drop] NOT NULL; -- update colum\nreturn `SELECT count(*) FROM ${table};`;\n}\nshowTables(database: string): string {\n- return `select table_name \"name\" from information_schema.tables where table_schema='public' and table_type='BASE TABLE' ;`\n+ return ` SELECT t.table_name \"name\", pg_catalog.obj_description(pgc.oid, 'pg_class') \"comment\"\n+ FROM information_schema.tables t\n+ INNER JOIN pg_catalog.pg_class pgc\n+ ON t.table_name = pgc.relname\n+ WHERE t.table_type='BASE TABLE'\n+ AND t.table_schema='public';`\n}\nshowDatabases(): string {\nreturn `SELECT datname \"Database\" FROM pg_database WHERE datistemplate = false;`\n@@ -103,8 +115,8 @@ ALTER TABLE ${table} ALTER COLUMN ${column} [SET|Drop] NOT NULL; -- update colum\ntableTemplate(): string {\nreturn `CREATE TABLE [name](\nid SERIAL NOT NULL primary key,\n- created_time DATETIME,\n- updated_time DATETIME,\n+ created_time DATE,\n+ updated_time DATE,\n[column] varchar(255)\n);\nCOMMENT ON TABLE [table] IS '[comment'];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<div class=\"design-toolbar\">\n<el-button @click=\"column.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n- <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '35px'}\">\n- <ux-table-column align=\"center\" field=\"name\" title=\"name\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"key\" title=\"key\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"nullable\" title=\"nullable\" show-overflow-tooltip=\"true\"></ux-table-column>\n- <ux-table-column align=\"center\" field=\"type\" title=\"type\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '25px'}\">\n<ux-table-column title=\"Operation\" width=\"120\">\n<template v-slot=\"{ row }\">\n<el-button @click=\"deleteConfirm(row)\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle> </el-button>\n</template>\n</ux-table-column>\n+ <ux-table-column align=\"center\" field=\"name\" title=\"Name\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"type\" title=\"Type\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"comment\" title=\"Comment\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"maxLength\" width=\"80\" title=\"Length\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" field=\"defaultValue\" width=\"120\" title=\"Default\" show-overflow-tooltip=\"true\"></ux-table-column>\n+ <ux-table-column align=\"center\" title=\"Primary Key\" width=\"100\" show-overflow-tooltip=\"true\">\n+ <template v-slot=\"{ row }\">\n+ <el-checkbox :checked=\"row.isPrimary\"></el-checkbox>\n+ </template>\n+ </ux-table-column>\n+ <ux-table-column align=\"center\" title=\"Unique\" width=\"80\" show-overflow-tooltip=\"true\">\n+ <template v-slot=\"{ row }\">\n+ <el-checkbox :checked=\"row.isUnique\"></el-checkbox>\n+ </template>\n+ </ux-table-column>\n+ <ux-table-column align=\"center\" title=\"Not Null\" width=\"80\" show-overflow-tooltip=\"true\">\n+ <template v-slot=\"{ row }\">\n+ <el-checkbox :checked=\"row.nullable=='NO'\"></el-checkbox>\n+ </template>\n+ </ux-table-column>\n+ <ux-table-column align=\"center\" title=\"Auto Incrment\" width=\"140\" show-overflow-tooltip=\"true\">\n+ <template v-slot=\"{ row }\">\n+ <el-checkbox :checked=\"row.isAutoIncrement\"></el-checkbox>\n+ </template>\n+ </ux-table-column>\n</ux-grid>\n<el-dialog :title=\"'Add Column'\" :visible.sync=\"column.visible\" top=\"3vh\" size=\"mini\">\n<el-form :inline='true'>\n@@ -97,7 +118,7 @@ export default {\nif (!sql) return;\nthis.emit(\"execute\", sql);\n},\n- }\n+ },\n};\n</script>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "@@ -39,7 +39,7 @@ export default {\nthis.designData.editIndex = [...this.designData.indexs];\n})\n.on(\"success\", () => {\n- this.$message.success(\"Rename success!\");\n+ this.$message.success(\"Update success!\");\nthis.refresh();\n})\n.on(\"error\", (msg) => {\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(TEMPORARY|RLIKE|ignore|REGEXP|source|INNER|FULL|RIGHT|LEFT|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|OPTIMIZE|ANALYZE|REPAIR|CHARSET|ENGINE|FOREIGN|CASCADE|RESTRICT|UNSIGNED)\\\\b\",\n+ \"match\": \"(?i)\\\\b(TEMPORARY|RENAME|RLIKE|ignore|REGEXP|source|INNER|FULL|RIGHT|LEFT|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|OPTIMIZE|ANALYZE|REPAIR|CHARSET|ENGINE|FOREIGN|CASCADE|RESTRICT|UNSIGNED)\\\\b\",\n\"name\": \"keyword.mysql\"\n},\n{\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support design postgresql table info.
|
141,908
|
26.01.2021 21:55:58
| -28,800
|
dcb8bd6ce8f0825662a21e544f70f5ac92172fd4
|
Support drop index.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -145,6 +145,9 @@ export class TableNode extends Node implements CopyAble {\n}).on(\"updateTable\", async ({ newTableName, newComment }) => {\nconst sql = this.dialect.updateTable({ table: this.table, newTableName, comment: this.comment, newComment });\nawait executeAndRefresh(sql, handler)\n+ }).on(\"dropIndex\", async indexName => {\n+ const sql = this.dialect.dropIndex(this.table, indexName);\n+ await executeAndRefresh(sql, handler)\n}).on(\"execute\", async sql => {\nawait executeAndRefresh(sql, handler)\n}).on(\"createIndex\", async ({ column, type, indexType }) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -7,6 +7,9 @@ export class MssqlDIalect extends SqlDialect {\ncreateIndex(createIndexParam:CreateIndexParam): string{\nreturn `ALTER TABLE ${createIndexParam.table} ADD ${createIndexParam.type} (${createIndexParam.column})`;\n}\n+ dropIndex(table: string, indexName: string): string {\n+ return `DROP INDEX ${table}.${indexName}`\n+ }\nshowIndex(database: string, table: string): string {\nreturn `SELECT\nindex_name = ind.name,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -6,6 +6,9 @@ export class MysqlDialect extends SqlDialect {\ncreateIndex(createIndexParam: CreateIndexParam): string {\nreturn `ALTER TABLE ${createIndexParam.table} ADD ${createIndexParam.type} (${createIndexParam.column})`;\n}\n+ dropIndex(table: string, indexName: string): string {\n+ return `ALTER TABLE ${table} DROP INDEX ${indexName}`\n+ }\nshowIndex(database: string, table: string): string {\nreturn `SELECT column_name,index_name,non_unique,index_type FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${database}' and table_name='${table}';`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -5,7 +5,10 @@ import { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect extends SqlDialect {\ncreateIndex(createIndexParam:CreateIndexParam): string{\nconst indexType=createIndexParam.indexType||\"btree\"\n- return `CREATE INDEX ${createIndexParam.column}_index ON ${createIndexParam.table} USING ${indexType} (${createIndexParam.column});`;\n+ return `CREATE INDEX ${createIndexParam.column}_${new Date().getTime()}_index ON ${createIndexParam.table} USING ${indexType} (${createIndexParam.column});`;\n+ }\n+ dropIndex(table: string, indexName: string): string {\n+ return `DROP INDEX ${indexName}`\n}\nshowIndex(database: string, table: string): string {\nreturn `SELECT indexname index_name, indexdef FROM pg_indexes WHERE schemaname = 'public' and tablename='${table}'`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/IndexPanel.vue",
"new_path": "src/vue/design/IndexPanel.vue",
"diff": "@@ -83,12 +83,7 @@ export default {\ncancelButtonText: \"Cancel\",\ntype: \"warning\",\n}).then(() => {\n- this.execute(\n- `ALTER TABLE ${wrapByDb(\n- this.designData.table,\n- this.designData.dbType\n- )} DROP INDEX ${row.index_name}`\n- );\n+ this.emit(\"dropIndex\",row.index_name)\n});\n},\nexecute(sql) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "@@ -40,7 +40,7 @@ export default {\n})\n.on(\"success\", () => {\nthis.$message.success(\"Update success!\");\n- this.refresh();\n+ this.init();\n})\n.on(\"error\", (msg) => {\nthis.$message.error(msg);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support drop index.
|
141,908
|
26.01.2021 23:01:09
| -28,800
|
145afd416e24e915915aa6fe3f507cfbac46320f
|
Support update postgresql column.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"%comman.table.design%\",\n\"category\": \"MySQL\"\n},\n- {\n- \"command\": \"mysql.column.changeName\",\n- \"title\": \"%command.column.changeName%\",\n- \"category\": \"MySQL\",\n- \"icon\": {\n- \"light\": \"resources/light/edit.svg\",\n- \"dark\": \"resources/dark/edit.svg\"\n- }\n- },\n{\n\"command\": \"mysql.column.add\",\n\"title\": \"%command.column.add%\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == column\",\n\"group\": \"inline@2\"\n},\n- {\n- \"command\": \"mysql.column.changeName\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == column\",\n- \"group\": \"inline@4\"\n- },\n{\n\"command\": \"mysql.column.drop\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == column\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.mock.table\": \"Generate Mock Data\",\n\"command.changeTableName\": \"Change Name\",\n\"comman.table.design\": \"Design Table\",\n- \"command.column.changeName\": \"Change Column Name\",\n\"command.column.add\": \"Add Column\",\n\"command.column.up\": \"Move Column Up\",\n\"command.column.down\": \"Move Column Down\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -223,9 +223,6 @@ export function activate(context: vscode.ExtensionContext) {\n},\n// column node\n...{\n- \"mysql.column.changeName\": (columnNode: ColumnNode) => {\n- columnNode.changeColumnName();\n- },\n\"mysql.column.up\": (columnNode: ColumnNode) => {\ncolumnNode.moveUp();\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -23,7 +23,7 @@ export class TableNode extends Node implements CopyAble {\npublic iconPath: string = path.join(Constants.RES_PATH, \"icon/table.svg\");\npublic contextValue: string = ModelType.TABLE;\n- constructor(public readonly table: string, readonly comment: string, readonly parent: Node) {\n+ constructor(public table: string, readonly comment: string, readonly parent: Node) {\nsuper(`${table}`)\nthis.description = comment\nthis.init(parent)\n@@ -141,10 +141,15 @@ export class TableNode extends Node implements CopyAble {\n}\nreturn columnNode.column;\n});\n- handler.emit('design-data', { indexs: result, table: this.table, comment: this.comment, columnList, primaryKey, dbType: this.dbType })\n+ const node = this.getByRegion(this.table) as TableNode || this\n+ handler.emit('design-data', { indexs: result, table: node.table, comment: node.comment, columnList, primaryKey, dbType: node.dbType })\n}).on(\"updateTable\", async ({ newTableName, newComment }) => {\nconst sql = this.dialect.updateTable({ table: this.table, newTableName, comment: this.comment, newComment });\nawait executeAndRefresh(sql, handler)\n+ this.table=newTableName\n+ }).on(\"updateColumn\",async (updateColumnParam)=>{\n+ const sql = this.dialect.updateColumnSql(updateColumnParam);\n+ await executeAndRefresh(sql, handler)\n}).on(\"dropIndex\", async indexName => {\nconst sql = this.dialect.dropIndex(this.table, indexName);\nawait executeAndRefresh(sql, handler)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnMeta.ts",
"new_path": "src/model/other/columnMeta.ts",
"diff": "@@ -38,6 +38,7 @@ export interface ColumnMeta {\n* extra info, auto_increment\n*/\nextra:any;\n+ isNotNull:boolean;\nisAutoIncrement:boolean;\nisUnique:boolean;\nisPrimary:boolean;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnNode.ts",
"new_path": "src/model/other/columnNode.ts",
"diff": "@@ -39,6 +39,7 @@ export class ColumnNode extends Node implements CopyAble {\nif (this.column.extra == 'auto_increment') {\nthis.column.isAutoIncrement = true;\n}\n+ this.column.isNotNull = this.column.nullable != 'YES'\nconst columnKey: string = this.column.key;\nswitch (columnKey) {\ncase 'UNI':\n@@ -60,20 +61,6 @@ export class ColumnNode extends Node implements CopyAble {\nreturn [];\n}\n- public async changeColumnName() {\n-\n- const columnName = this.column.name;\n- vscode.window.showInputBox({ value: columnName, placeHolder: 'newColumnName', prompt: `You will changed ${this.table}.${columnName} to new column name!` }).then(async (newColumnName) => {\n- if (!newColumnName) { return; }\n- const sql = `alter table ${this.wrap(this.table)} change column ${this.wrap(columnName)} ${this.wrap(newColumnName)} ${this.column.type} comment '${this.column.comment}'`;\n- this.execute(sql).then((rows) => {\n- DatabaseCache.clearColumnCache(`${this.parent.uid}`);\n- DbTreeDataProvider.refresh(this.parent);\n- });\n-\n- });\n- }\n-\npublic updateColumnTemplate() {\nQueryUnit.showSQLTextDocument(this, this.dialect.updateColumn(this.table, this.column.name, this.column.type, this.column.comment, this.column.nullable), Template.alter);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "import { window } from \"vscode\";\nimport { CreateIndexParam } from \"./param/createIndexParam\";\n+import { UpdateColumnParam } from \"./param/updateColumnParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\n@@ -52,6 +53,12 @@ export class MssqlDIalect extends SqlDialect {\nALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\n`;\n}\n+ updateColumnSql(updateColumnParam: UpdateColumnParam): string {\n+ let {columnName,columnType,newColumnName,comment,nullable,table}=updateColumnParam\n+ const defaultDefinition = nullable ? \"\" : \" NOT NULL\";\n+ comment = comment ? ` comment '${comment}'` : \"\";\n+ return `ALTER TABLE\\n\\t${table} CHANGE ${columnName} ${newColumnName} ${columnType}${defaultDefinition}${comment};`;\n+ }\nshowUsers(): string {\nreturn `SELECT name [user] from sys.database_principals where type='S'`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "import { CreateIndexParam } from \"./param/createIndexParam\";\n+import { UpdateColumnParam } from \"./param/updateColumnParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\n@@ -38,6 +39,12 @@ export class MysqlDialect extends SqlDialect {\ncomment = comment ? ` comment '${comment}'` : \"\";\nreturn `ALTER TABLE\\n\\t${table} CHANGE ${column} ${column} ${type}${defaultDefinition}${comment};`;\n}\n+ updateColumnSql(updateColumnParam: UpdateColumnParam): string {\n+ let {columnName,columnType,newColumnName,comment,nullable,table}=updateColumnParam\n+ const defaultDefinition = nullable ? \"\" : \" NOT NULL\";\n+ comment = comment ? ` comment '${comment}'` : \"\";\n+ return `ALTER TABLE\\n\\t${table} CHANGE ${columnName} ${newColumnName} ${columnType}${defaultDefinition}${comment};`;\n+ }\nshowUsers(): string {\nreturn `SELECT concat(user,'@',host) user FROM mysql.user;`;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dialect/param/updateColumnParam.ts",
"diff": "+export interface UpdateColumnParam {\n+ table: string;\n+ comment: string;\n+ columnName: string;\n+ newColumnName: string;\n+ columnType: string;\n+ nullable: boolean;\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "import { CreateIndexParam } from \"./param/createIndexParam\";\n+import { UpdateColumnParam } from \"./param/updateColumnParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\nimport { SqlDialect } from \"./sqlDialect\";\n@@ -32,11 +33,22 @@ export class PostgreSqlDialect extends SqlDialect {\nreturn `CREATE USER [name] WITH PASSWORD 'password'`\n}\nupdateColumn(table: string, column: string, type: string, comment: string, nullable: string): string {\n- const defaultDefinition = nullable == \"YES\" ? \"DROP NOT NULL\" : \"SET NOT NULL\";\ncomment = comment ? ` comment '${comment}'` : \"\";\n- return `ALTER TABLE ${table} RENAME ${column} TO [newName]; -- update column name\n-ALTER TABLE ${table} ALTER COLUMN ${column} TYPE ${type}; -- update column type\n-ALTER TABLE ${table} ALTER COLUMN ${column} [SET|Drop] NOT NULL; -- update column nullable`;\n+ return `ALTER TABLE ${table} ALTER COLUMN ${column} TYPE ${type};\n+ALTER TABLE ${table} ALTER RENAME COLUMN ${column} TO [newColumnName];`;\n+ }\n+ updateColumnSql(updateColumnParam: UpdateColumnParam): string {\n+ let { columnName, columnType, newColumnName, comment, nullable, table } = updateColumnParam\n+ const defaultDefinition = nullable ? \"DROP NOT NULL\" : \"SET NOT NULL\";\n+ let sql = `ALTER TABLE ${table} ALTER COLUMN ${columnName} TYPE ${columnType};\n+ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\n+ if (comment) {\n+ sql = sql + `COMMENT ON COLUMN ${table}.${columnName} is '${comment}';`\n+ }\n+ if (columnName != newColumnName) {\n+ sql = sql + `ALTER TABLE ${table} RENAME COLUMN ${columnName} TO ${newColumnName};`\n+ }\n+ return sql;\n}\nshowUsers(): string {\nreturn `SELECT usename \"user\" from pg_user `;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "import { CreateIndexParam } from \"./param/createIndexParam\";\n+import { UpdateColumnParam } from \"./param/updateColumnParam\";\nimport { UpdateTableParam } from \"./param/updateTableParam\";\n/**\n@@ -10,6 +11,9 @@ export abstract class SqlDialect {\ndropIndex(table: string, indexName: string): string {\nthrow new Error(\"Method not implemented.\");\n}\n+ updateColumnSql(updateColumnParam: UpdateColumnParam): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\nshowIndex(database: string, table: string): string { return null; }\ncreateIndex(createIndexParam: CreateIndexParam): string { return null };\nabstract updateColumn(table: string, column: string, type: string, comment: string, nullable: string): string;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '25px'}\">\n<ux-table-column title=\"Operation\" width=\"120\">\n<template v-slot=\"{ row }\">\n+ <el-button @click=\"openEdit(row)\" title=\"edit\" size=\"mini\" icon=\"el-icon-edit\" circle> </el-button>\n<el-button @click=\"deleteConfirm(row)\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle> </el-button>\n</template>\n</ux-table-column>\n</template>\n</ux-table-column>\n</ux-grid>\n+ <el-dialog :title=\"'Update Column'\" :visible.sync=\"column.editVisible\" top=\"3vh\" size=\"mini\">\n+ <el-form :inline='true'>\n+ <el-form-item label=\"Name\">\n+ <el-input v-model=\"editColumn.name\"></el-input>\n+ </el-form-item>\n+ <el-form-item label=\"Type\">\n+ <el-input v-model=\"editColumn.type\"></el-input>\n+ </el-form-item>\n+ <el-form-item label=\"Comment\">\n+ <el-input v-model=\"editColumn.comment\"></el-input>\n+ </el-form-item>\n+ <el-form-item label=\"Not Null\">\n+ <el-checkbox v-model=\"editColumn.isNotNull\"></el-checkbox>\n+ </el-form-item>\n+ </el-form>\n+ <span slot=\"footer\" class=\"dialog-footer\">\n+ <el-button type=\"primary\" :loading=\"column.editloading\" @click=\"updateColumn\">Update</el-button>\n+ <el-button @click=\"column.editVisible=false\">Cancel</el-button>\n+ </span>\n+ </el-dialog>\n<el-dialog :title=\"'Add Column'\" :visible.sync=\"column.visible\" top=\"3vh\" size=\"mini\">\n<el-form :inline='true'>\n<el-form-item label=\"Name\">\n<el-input v-model=\"column.name\"></el-input>\n</el-form-item>\n- <el-form-item label=\"type\">\n+ <el-form-item label=\"Type\">\n<el-input v-model=\"column.type\"></el-input>\n</el-form-item>\n</el-form>\n@@ -65,11 +86,16 @@ export default {\ncolumnList: [],\neditColumnList: [],\n},\n+ editColumn: {},\ncolumn: {\nvisible: false,\n+ editVisible: false,\nloading: false,\n+ editLoading: false,\n+\ncolumn: null,\ntype: null,\n+ nullable: false,\n},\n};\n},\n@@ -80,7 +106,9 @@ export default {\n})\n.on(\"success\", () => {\nthis.column.loading = false;\n+ this.column.editLoading = false;\nthis.column.visible = false;\n+ this.column.editVisible = false;\nthis.init();\n})\n.on(\"error\", (msg) => {\n@@ -89,6 +117,16 @@ export default {\n.init();\n},\nmethods: {\n+ updateColumn() {\n+ this.emit(\"updateColumn\", {\n+ newColumnName: this.editColumn.name,\n+ columnType: this.editColumn.type,\n+ comment: this.editColumn.comment,\n+ nullable: !this.editColumn.isNotNull,\n+ table: this.designData.table,\n+ columnName: this.column.name,\n+ });\n+ },\ncreatecolumn() {\nthis.column.loading = true;\nthis.execute(\n@@ -100,6 +138,12 @@ export default {\n}`\n);\n},\n+ openEdit(row) {\n+ this.column.name = row.name;\n+ this.editColumn = {...row};\n+ this.column.editVisible = true;\n+ this.column.editLoading = false;\n+ },\ndeleteConfirm(row) {\nthis.$confirm(\"Are you sure you want to delete this column?\", \"Warning\", {\nconfirmButtonText: \"OK\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/index.vue",
"new_path": "src/vue/design/index.vue",
"diff": "<template>\n<div class=\"mt-2\">\n+ <el-button @click=\"init\" type=\"success\" title=\"Refresh\" size=\"mini\" >Refresh </el-button>\n<el-tag>Table:</el-tag>\n{{table}}\n- <div v-if=\"activePanel=='info'\"></div>\n<ul class=\"tab\">\n<li class=\"tab__item \" :class=\"{'tab__item--active':activePanel=='info'}\" @click=\"activePanel='info'\">Info </li>\n<li class=\"tab__item \" :class=\"{'tab__item--active':activePanel=='column'}\" @click=\"activePanel='column'\">Column </li>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support update postgresql column.
|
141,908
|
27.01.2021 01:53:34
| -28,800
|
405329dcf7b700d9344cff31de435418b3981aad
|
Better performance.
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -50,7 +50,7 @@ export function activate(context: vscode.ExtensionContext) {\nvscode.window.onDidChangeActiveTextEditor((e) => {\nconst fileNode = ConnectionManager.getByActiveFile()\nif (fileNode) {\n- ConnectionManager.getConnection(fileNode, this)\n+ ConnectionManager.changeActive(fileNode)\n}\n}),\n@@ -63,7 +63,9 @@ export function activate(context: vscode.ExtensionContext) {\nawait node.getChildren(true)\nDbTreeDataProvider.refresh(node)\n} else {\n- serviceManager.provider.init();\n+ for (const instance of DbTreeDataProvider.instances) {\n+ instance.init()\n+ }\n}\n},\n[CommandKey.RecordHistory]: (sql: string, costTime: number) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -109,9 +109,7 @@ export class ConnectionNode extends Node implements CopyAble {\ndbName = await vscode.window.showQuickPick(dbNameList, { placeHolder: \"active database\" })\n}\nif (dbName) {\n- await ConnectionManager.getConnection({\n- ...this, database: dbName\n- } as Node, true);\n+ ConnectionManager.changeActive(this)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -118,8 +118,6 @@ export class TableNode extends Node implements CopyAble {\nconst executeAndRefresh = async (sql: string, handler: Hanlder) => {\ntry {\nawait this.execute(sql)\n- await this.refresh()\n- await this.parent.refresh()\nhandler.emit(\"success\")\n} catch (error) {\nhandler.emit(\"error\", error.message)\n@@ -146,15 +144,21 @@ export class TableNode extends Node implements CopyAble {\n}).on(\"updateTable\", async ({ newTableName, newComment }) => {\nconst sql = this.dialect.updateTable({ table: this.table, newTableName, comment: this.comment, newComment });\nawait executeAndRefresh(sql, handler)\n- this.table=newTableName\n+ DatabaseCache.setChildListOfDatabase(this.parent.uid, null);\n+ this.provider.reload(this.parent)\n}).on(\"updateColumn\", async (updateColumnParam) => {\nconst sql = this.dialect.updateColumnSql(updateColumnParam);\nawait executeAndRefresh(sql, handler)\n+ DatabaseCache.setColumnListOfTable(this.uid, null);\n+ this.provider.reload(this.parent)\n}).on(\"dropIndex\", async indexName => {\nconst sql = this.dialect.dropIndex(this.table, indexName);\nawait executeAndRefresh(sql, handler)\n}).on(\"execute\", async sql => {\nawait executeAndRefresh(sql, handler)\n+ DatabaseCache.setColumnListOfTable(this.uid, null);\n+ DatabaseCache.setChildListOfDatabase(this.parent.uid, null);\n+ this.provider.reload(this.parent)\n}).on(\"createIndex\", async ({ column, type, indexType }) => {\nconst sql = this.dialect.createIndex({ column, type, indexType, table: this.wrap(this.table) });\nawait executeAndRefresh(sql, handler)\n@@ -169,6 +173,7 @@ export class TableNode extends Node implements CopyAble {\nconst sql = this.dialect.buildPageSql(this.wrap(this.database), this.wrap(this.table), pageSize);\nconst connection = await ConnectionManager.getConnection(this);\n+ ConnectionManager.changeActive(this)\nconst executeTime = new Date().getTime();\nconnection.query(sql, (err: Error, data, fields) => {\nconst costTime = new Date().getTime() - executeTime;\n@@ -185,6 +190,7 @@ export class TableNode extends Node implements CopyAble {\nconst pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\nconst sql = this.dialect.buildPageSql(this.wrap(this.database), this.wrap(this.table), pageSize);\nQueryUnit.runQuery(sql, this);\n+ ConnectionManager.changeActive(this)\n}\npublic insertSqlTemplate(show: boolean = true): Promise<string> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/keyNode.ts",
"new_path": "src/model/redis/keyNode.ts",
"diff": "@@ -34,7 +34,7 @@ export default class KeyNode extends RedisBaseNode {\npublic async delete() {\nconst client = await this.getClient();\nawait promisify(client.del).bind(client)(this.label)\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ this.provider.reload()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -16,7 +16,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic _onDidChangeTreeData: vscode.EventEmitter<Node> = new vscode.EventEmitter<Node>();\npublic readonly onDidChangeTreeData: vscode.Event<Node> = this._onDidChangeTreeData.event;\n- private static instances: DbTreeDataProvider[] = []\n+ public static instances: DbTreeDataProvider[] = []\nconstructor(protected context: vscode.ExtensionContext, public readonly connectionKey: string) {\nDbTreeDataProvider.instances.push(this)\n@@ -151,7 +151,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nvscode.window.showQuickPick(dbIdList).then(async (dbId) => {\nif (dbId) {\nconst dbNode = dbIdMap.get(dbId);\n- await ConnectionManager.getConnection(dbNode, true)\n+ ConnectionManager.changeActive(dbNode)\nvscode.window.showInformationMessage(`Change active database to ${dbNode.database} success!`)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mysqlConnection.ts",
"new_path": "src/service/connect/mysqlConnection.ts",
"diff": "@@ -5,6 +5,7 @@ import { IConnection, queryCallback } from \"./connection\";\nexport class MysqlConnection implements IConnection {\nprivate con: mysql.Connection;\n+ private dead:boolean;\nconstructor(node: Node) {\nconst newConnectionOptions = {\nhost: node.host, port: node.port, user: node.user, password: node.password, database: node.database,\n@@ -28,7 +29,7 @@ export class MysqlConnection implements IConnection {\nthis.con = mysql.createConnection(newConnectionOptions);\n}\nisAlive(): boolean {\n- return this.con.state == 'authenticated' || this.con.authorized\n+ return !this.dead && (this.con.state == 'authenticated' || this.con.authorized)\n}\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\n@@ -48,6 +49,7 @@ export class MysqlConnection implements IConnection {\nthis.con.commit()\n}\nend(): void {\n+ this.dead=true;\nthis.con.end()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -13,6 +13,7 @@ types.setTypeParser(114, (val) => val)\n*/\nexport class PostgreSqlConnection implements IConnection {\nprivate client: Client;\n+ private dead: boolean;\nconstructor(opt: Node) {\nconst config = {\nhost: opt.host, port: opt.port,\n@@ -26,7 +27,7 @@ export class PostgreSqlConnection implements IConnection {\n}\nisAlive(): boolean {\nconst temp = this.client as any;\n- return temp._connected && !temp._ending && temp._queryable;\n+ return !this.dead && temp._connected && !temp._ending && temp._queryable;\n}\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\n@@ -73,6 +74,7 @@ export class PostgreSqlConnection implements IConnection {\nawait this.client.query(\"COMMIT\")\n}\nend(): void {\n+ this.dead = true;\nthis.client.end()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -75,7 +75,7 @@ export class QueryUnit {\nconst executeTime = new Date().getTime();\ntry {\n- (await ConnectionManager.getConnection(connectionNode, true)).query(sql, (err: Error, data, fields, total) => {\n+ (await ConnectionManager.getConnection(connectionNode)).query(sql, (err: Error, data, fields, total) => {\nif (err) {\nQueryPage.send({ connection: connectionNode, type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\nreturn;\n@@ -86,7 +86,7 @@ export class QueryUnit {\n}\nif (data.affectedRows) {\nQueryPage.send({ connection: connectionNode, type: MessageType.DML, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse });\n- vscode.commands.executeCommand(CommandKey.Refresh);\n+ // vscode.commands.executeCommand(CommandKey.Refresh);\nreturn;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Better performance.
|
141,908
|
27.01.2021 12:10:23
| -28,800
|
e80536438b417dd5fc83900e173be8a6b143751d
|
Better peformance.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"default\": false,\n\"description\": \"%config.enableDelimiter%\"\n},\n- \"vscode-mysql.loadMetaOnConnect\": {\n- \"type\": \"boolean\",\n- \"default\": true,\n- \"description\": \"%config.loadMetaOnConnect%\"\n- },\n\"vscode-mysql.defaultSelectLimit\": {\n\"type\": \"integer\",\n\"default\": 100,\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.redis.key.detail\": \"View Key Detail\",\n\"config.title\":\"Database Client\",\n\"config.enableDelimiter\":\"Support delimiter when import sql.\",\n- \"config.loadMetaOnConnect\":\"Load database meta info when connected, If your machine's performance is low, turn it off.\",\n\"config.defaultSelectLimit\":\"Default limit of query sql.\",\n\"config.showTotal\": \"Show total on result view.\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -26,7 +26,6 @@ export enum CacheKey {\nexport enum ConfigKey {\nENABLE_DELIMITER = \"enableDelimiter\",\n- LOAD_META_ON_CONNECT = \"loadMetaOnConnect\",\nDEFAULT_LIMIT = \"defaultSelectLimit\",\nSHOW_TOTAL = \"showTotal\",\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -36,6 +36,7 @@ import { activeEs } from \"./model/es/provider/main\";\nimport { RedisConnectionNode } from \"./model/redis/redisConnectionNode\";\nimport KeyNode from \"./model/redis/keyNode\";\nimport { DiffService } from \"./service/diff/diffService\";\n+import { DatabaseCache } from \"./service/common/databaseCache\";\nexport function activate(context: vscode.ExtensionContext) {\n@@ -57,20 +58,18 @@ export function activate(context: vscode.ExtensionContext) {\n...initCommand({\n// util\n...{\n- \"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n[CommandKey.Refresh]: async (node: Node) => {\nif (node) {\nawait node.getChildren(true)\n- DbTreeDataProvider.refresh(node)\n} else {\n- for (const instance of DbTreeDataProvider.instances) {\n- instance.init()\n- }\n+ DatabaseCache.clearCache()\n}\n+ DbTreeDataProvider.refresh(node)\n},\n[CommandKey.RecordHistory]: (sql: string, costTime: number) => {\nserviceManager.historyService.recordHistory(sql, costTime);\n},\n+ \"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n\"mysql.setting.open\": () => {\nserviceManager.settingService.open();\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "-import { Global } from \"@/common/global\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\n-import { CacheKey, ConfigKey, Constants, DatabaseType, ModelType } from \"../../common/constants\";\n+import { Constants, DatabaseType, ModelType } from \"../../common/constants\";\nimport { FileManager } from \"../../common/filesManager\";\nimport { Util } from \"../../common/util\";\nimport { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\n@@ -9,7 +8,6 @@ import { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { CopyAble } from \"../interface/copyAble\";\nimport { CommandKey, Node } from \"../interface/node\";\n-import { NodeUtil } from \"../nodeUtil\";\nimport { InfoNode } from \"../other/infoNode\";\nimport { DatabaseNode } from \"./databaseNode\";\nimport { UserGroup } from \"./userGroup\";\n@@ -19,7 +17,6 @@ import { UserGroup } from \"./userGroup\";\n*/\nexport class ConnectionNode extends Node implements CopyAble {\n- private static initMark = {}\npublic iconPath: string = path.join(Constants.RES_PATH, \"icon/server.png\");\npublic contextValue: string = ModelType.CONNECTION;\nconstructor(readonly uid: string, readonly parent: Node) {\n@@ -46,6 +43,7 @@ export class ConnectionNode extends Node implements CopyAble {\n} else if (this.dbType == DatabaseType.MSSQL) {\nthis.iconPath = path.join(Constants.RES_PATH, \"icon/mssql_server.png\");\n}\n+ this.getChildren()\n}\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n@@ -74,14 +72,6 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn new DatabaseNode(database.Database, this);\n});\n- if (!ConnectionNode.initMark[this.uid] && Global.getConfig<boolean>(ConfigKey.LOAD_META_ON_CONNECT)) {\n- for (const databaseNode of databaseNodes) {\n- for (const groupNode of databaseNode.getChildren() as Node[]) {\n- groupNode.getChildren(true);\n- }\n- }\n- }\n-\ndatabaseNodes.unshift(new UserGroup(\"USER\", this));\nDatabaseCache.setDataBaseListOfConnection(this.uid, databaseNodes);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/tableChain.ts",
"new_path": "src/provider/complete/chain/tableChain.ts",
"diff": "+import { UserGroup } from \"@/model/database/userGroup\";\n+import { DiagramGroup } from \"@/model/diagram/diagramGroup\";\n+import { ProcedureGroup } from \"@/model/main/procedureGroup\";\n+import { TableGroup } from \"@/model/main/tableGroup\";\n+import { TriggerGroup } from \"@/model/main/triggerGroup\";\n+import { ViewGroup } from \"@/model/main/viewGroup\";\n+import { QueryGroup } from \"@/model/query/queryGroup\";\nimport * as vscode from \"vscode\";\nimport { ModelType } from \"../../../common/constants\";\nimport { TableNode } from \"../../../model/main/tableNode\";\n@@ -8,6 +15,7 @@ export class TableChain implements ComplectionChain {\npublic async getComplection(complectionContext: ComplectionContext): Promise<vscode.CompletionItem[]> {\n+ await this.getNodeList();\nif (complectionContext.preWord?.match(/\\b(into|from|update|table|join)\\b/ig)) {\nreturn await this.generateTableComplectionItem();\n}\n@@ -19,18 +27,7 @@ export class TableChain implements ComplectionChain {\n}\nprivate async generateTableComplectionItem(): Promise<vscode.CompletionItem[]> {\n-\n- const lcp = ConnectionManager.getLastConnectionOption();\n-\n- const nodes = await lcp?.getByRegion()?.getChildren()\n- if (!nodes) {\n- return []\n- }\n-\n- let nodeList = []\n- for (const node of nodes) {\n- nodeList.push(...await node.getChildren())\n- }\n+ const nodeList = await this.getNodeList();\nreturn nodeList.map<vscode.CompletionItem>((tableNode: TableNode) => {\nconst completionItem = new vscode.CompletionItem(tableNode.table);\nif (tableNode.comment) {\n@@ -58,4 +55,19 @@ export class TableChain implements ComplectionChain {\nreturn completionItem;\n});\n}\n+\n+ private async getNodeList() {\n+ let nodeList = []\n+ const lcp = ConnectionManager.getLastConnectionOption();\n+ const groupNodes = await lcp?.getByRegion()?.getChildren();\n+ if (!groupNodes) {\n+ return nodeList\n+ }\n+ for (const groupNode of groupNodes) {\n+ if (groupNode instanceof TableGroup || groupNode instanceof ViewGroup){\n+ nodeList.push(...await groupNode.getChildren());\n+ }\n+ }\n+ return nodeList;\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -11,6 +11,9 @@ import { NodeUtil } from \"@/model/nodeUtil\";\nimport { InfoNode } from \"@/model/other/infoNode\";\nimport { EsConnectionNode } from \"@/model/es/model/esConnectionNode\";\nimport { RedisConnectionNode } from \"@/model/redis/redisConnectionNode\";\n+import { DiagramGroup } from \"@/model/diagram/diagramGroup\";\n+import { QueryGroup } from \"@/model/query/queryGroup\";\n+import { TriggerGroup } from \"@/model/main/triggerGroup\";\nexport class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\n@@ -22,23 +25,6 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nDbTreeDataProvider.instances.push(this)\n}\n- /**\n- * reload treeview context\n- */\n- public async init() {\n- DatabaseCache.clearDatabaseCache()\n- DatabaseCache.clearChildCache()\n- if (Global.getConfig<boolean>(ConfigKey.LOAD_META_ON_CONNECT)) {\n- (await this.getConnectionNodes()).forEach(async (connectionNode) => {\n- (await connectionNode.getChildren(true)).forEach(async (databaseNode) => {\n- (await databaseNode.getChildren(true)).forEach(async (groupNode) => {\n- });\n- });\n- })\n- }\n- DbTreeDataProvider.refresh()\n- }\n-\npublic getTreeItem(element: Node): Promise<vscode.TreeItem> | vscode.TreeItem {\nreturn element;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "-import { Global } from \"@/common/global\";\nimport { ExtensionContext, TreeItemCollapsibleState } from \"vscode\";\n-import { CacheKey, ConfigKey, ModelType } from \"../../common/constants\";\n+import { CacheKey, ModelType } from \"../../common/constants\";\nimport { DatabaseNode } from \"../../model/database/databaseNode\";\nimport { Node } from \"../../model/interface/node\";\n@@ -25,10 +24,6 @@ export class DatabaseCache {\nreturn TreeItemCollapsibleState.None;\n}\n- if (!Global.getConfig<boolean>(ConfigKey.LOAD_META_ON_CONNECT)) {\n- return TreeItemCollapsibleState.Collapsed;\n- }\n-\nif (!this.collpaseState || Object.keys(this.collpaseState).length == 0) {\nthis.collpaseState =\n(element.global === false) ?\n@@ -79,16 +74,19 @@ export class DatabaseCache {\nthis.context = context;\n}\n+ public static clearCache() {\n+ this.childCache = {}\n+ this.cache.database = {}\n+ }\n+\n/**\n* clear table data for database\n* @param dbChildid\n*/\n- public static clearChildCache(dbChildid?: string) {\n+ public static clearChildCache(dbChildid: string) {\nif (dbChildid) {\ndelete this.childCache[dbChildid];\n- } else {\n- this.childCache = {};\n}\n}\n@@ -104,11 +102,9 @@ export class DatabaseCache {\n* clear database data for connection\n* @param connectionid\n*/\n- public static clearDatabaseCache(connectionid?: string) {\n+ public static clearDatabaseCache(connectionid: string) {\nif (connectionid) {\ndelete this.cache.database[connectionid];\n- } else {\n- this.cache.database = {};\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Better peformance.
|
141,908
|
27.01.2021 12:18:39
| -28,800
|
51d74d8a12f73c50873c7eb138ed272b499c7883
|
Add full result view icon.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+# 3.4.0\n+\n+- Better peformance.\n+- Add full result view icon.\n+\n# 3.3.2 2020-1-27\n- Fix 3.3.1 add connection fail.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/result/query.ts",
"new_path": "src/service/result/query.ts",
"diff": "@@ -3,7 +3,7 @@ import { EsRequest } from \"@/model/es/esRequest\";\nimport { ESIndexNode } from \"@/model/es/model/esIndexNode\";\nimport { ServiceManager } from \"@/service/serviceManager\";\nimport { basename, extname } from \"path\";\n-import { env, StatusBarAlignment, StatusBarItem, Uri, window } from \"vscode\";\n+import { env, StatusBarAlignment, StatusBarItem, Uri, ViewColumn, window } from \"vscode\";\nimport { Trans } from \"~/common/trans\";\nimport { ConfigKey, DatabaseType, MessageType, OperateType } from \"../../common/constants\";\nimport { Global } from \"../../common/global\";\n@@ -66,6 +66,8 @@ export class QueryPage {\ndbOption.execute(sql).then((rows) => {\nhandler.emit(MessageType.NEXT_PAGE, { sql, data: rows })\n})\n+ }).on(\"full\",()=>{\n+ handler.panel.reveal(ViewColumn.One)\n}).on('esFilter', (query) => {\nconst esQuery = EsRequest.build(queryParam.res.sql, obj => {\nobj.query = query;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<div class=\"toolbar\">\n<el-button type=\"primary\" size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n<el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" :clearable=\"true\" />\n+ <el-button @click=\"full\" type=\"primary\" title=\"Full Result View\" icon=\"el-icon-rank\" size=\"mini\" circle>\n+ </el-button>\n<el-button @click=\"$refs.editor.openInsert()\" :disabled=\"result.tableCount!=1\" type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle>\n</el-button>\n<el-button @click=\"$refs.editor.openEdit(update.current)\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!toolbar.show\">\n@@ -216,6 +218,9 @@ export default {\n});\n},\nmethods: {\n+ full(){\n+ vscodeEvent.emit(\"full\")\n+ },\nopenCoffee() {\nvscodeEvent.emit(\"openCoffee\");\n},\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add full result view icon.
|
141,908
|
27.01.2021 16:35:52
| -28,800
|
875a428076bdfe9645985fbd4cf98940a45773ef
|
Fix diff fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/diff/diffService.ts",
"new_path": "src/service/diff/diffService.ts",
"diff": "@@ -9,6 +9,9 @@ import { ViewManager } from \"@/common/viewManager\";\nimport { DatabaseCache } from \"../common/databaseCache\";\nimport { ConnectionManager } from \"../connectionManager\";\nimport { QueryUnit } from \"../queryUnit\";\n+import { DatabaseNode } from \"@/model/database/databaseNode\";\n+import { UserGroup } from \"@/model/database/userGroup\";\n+import { TableGroup } from \"@/model/main/tableGroup\";\nexport class DiffService {\nstartDiff(provider: DbTreeDataProvider) {\n@@ -23,7 +26,7 @@ export class DiffService {\nconst nodes = (await provider.getConnectionNodes())\nlet databaseList = {}\nfor (const node of nodes) {\n- databaseList[node.label] = await node.getChildren()\n+ databaseList[node.uid] = (await node.getChildren()).filter(dbNode => !(dbNode instanceof UserGroup))\n}\nconst data = { nodes: NodeUtil.removeParent(nodes), databaseList: NodeUtil.removeParent(databaseList) };\nhandler.emit('structDiffData', data)\n@@ -35,8 +38,9 @@ export class DiffService {\nhandler.emit(\"error\", error.message)\n}\n}).on(\"start\", async (opt) => {\n- const fromTables = DatabaseCache.getChildCache(`${opt.from.connection}_${opt.from.database}#TABLE`)\n- const toTables = DatabaseCache.getChildCache(`${opt.to.connection}_${opt.to.database}#TABLE`)\n+\n+ const fromTables =await new TableGroup(Node.nodeCache[`${opt.from.connection}_${opt.from.database}`]).getChildren()\n+ const toTables =await new TableGroup(Node.nodeCache[`${opt.to.connection}_${opt.to.database}`]).getChildren()\nlet sqlList = await this.compareTables(fromTables, toTables);\nhandler.emit(\"compareResult\", { sqlList })\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/structDiff/index.vue",
"new_path": "src/vue/structDiff/index.vue",
"diff": "<el-form>\n<el-form-item label=\"Target\">\n<el-select v-model=\"option.from.connection\">\n- <el-option :label=\"node.label\" :value=\"node.label\" :key=\"node.label\" v-for=\"node in initData.nodes\"></el-option>\n+ <el-option :label=\"node.label\" :value=\"node.uid\" :key=\"node.uid\" v-for=\"node in initData.nodes\"></el-option>\n</el-select>\n</el-form-item>\n<el-form-item label=\"database\">\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix diff fail.
|
141,908
|
27.01.2021 17:30:34
| -28,800
|
88d13578bbd78858e90541e08f9c9f82501a4c43
|
Fix add connection fail.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.3.4\",\n+ \"version\": \"3.4.1\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -109,7 +109,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic async indent(command: IndentCommand) {\nconst cacheKey = command.cacheKey || this.provider?.connectionKey;\n- const connections = this.context.get<{ [key: string]: Node }>(cacheKey);\n+ const connections = this.context.get<{ [key: string]: Node }>(cacheKey,{});\nif (!this.uid) {\nthis.uid = this.getConnectId();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/nodeUtil.ts",
"new_path": "src/model/nodeUtil.ts",
"diff": "@@ -20,8 +20,8 @@ export abstract class NodeUtil {\npublic static removeParent(nodes: any): any {\nif (!nodes) return null;\n// if is node instance\n- if (nodes instanceof Node) {\n- return { ...nodes, parent: null, provider: null, context: null, command: null };\n+ if (nodes instanceof Node || nodes.uid) {\n+ return NodeUtil.of( { ...nodes, parent: null, provider: null, context: null, command: null })\n}\nif (nodes instanceof Array) {\nlet tempNodes = []\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/connectService.ts",
"new_path": "src/service/connect/connectService.ts",
"diff": "@@ -40,7 +40,7 @@ export class ConnectService {\nconst connectNode = Util.trim(NodeUtil.of(connectionOption))\ntry {\nawait this.connect(connectNode)\n- provider.addConnection(connectNode)\n+ await provider.addConnection(connectNode)\n// handler.panel.dispose();\nhandler.emit(\"success\", 'connect success!')\n} catch (err) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix add connection fail.
|
141,908
|
27.01.2021 18:37:04
| -28,800
|
0fd572325eb67be71a94cfa377c7e8f5c36f9cf4
|
Fix new table view cannot execute sql.
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -175,7 +175,7 @@ export function activate(context: vscode.ExtensionContext) {\n...{\n\"mysql.runQuery\": (sql) => {\nif (typeof sql != 'string') { sql = null; }\n- QueryUnit.runQuery(sql);\n+ QueryUnit.runQuery(sql,ConnectionManager.getLastConnectionOption());\n},\n\"mysql.query.switch\": async (databaseOrConnectionNode: DatabaseNode | ConnectionNode | EsConnectionNode | ESIndexNode) => {\nif (databaseOrConnectionNode) {\n@@ -248,7 +248,7 @@ export function activate(context: vscode.ExtensionContext) {\ntableNode.openTable();\n},\n\"mysql.codeLens.run\": (sql: string) => {\n- QueryUnit.runQuery(sql)\n+ QueryUnit.runQuery(sql,ConnectionManager.getLastConnectionOption())\n},\n\"mysql.table.design\": (tableNode: TableNode) => {\ntableNode.designTable();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -171,15 +171,8 @@ export class TableNode extends Node implements CopyAble {\npublic async openInNew() {\nconst pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\nconst sql = this.dialect.buildPageSql(this.wrap(this.database), this.wrap(this.table), pageSize);\n-\n- const connection = await ConnectionManager.getConnection(this);\n+ QueryUnit.runQuery(sql, this, { viewId: new Date().getTime() });\nConnectionManager.changeActive(this)\n- const executeTime = new Date().getTime();\n- connection.query(sql, (err: Error, data, fields) => {\n- const costTime = new Date().getTime() - executeTime;\n- QueryPage.send({ singlePage: false, type: MessageType.DATA, connection: this, res: { sql, costTime, data, fields, pageSize: pageSize } as DataResponse });\n- })\n-\n}\npublic async countSql() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -37,8 +37,7 @@ export class QueryUnit {\nprivate static importPattern = /^\\s*\\bsource\\b\\s+(.+)/i;\nprotected static delimiterHodler = new DelimiterHolder()\n- public static async runQuery(sql?: string, connectionNode: Node = ConnectionManager.getLastConnectionOption()): Promise<null> {\n-\n+ public static async runQuery(sql: string, connectionNode: Node, queryOption?: QueryOption): Promise<null> {\nTrans.begin()\nconnectionNode = NodeUtil.of(connectionNode)\n@@ -60,7 +59,7 @@ export class QueryUnit {\nconst parseResult = this.delimiterHodler.parseBatch(sql, connectionNode.getConnectId())\nsql = parseResult.sql\nif (!sql && parseResult.replace) {\n- QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE, res: { message: `change delimiter success`, success: true } as MessageResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE,queryOption, res: { message: `change delimiter success`, success: true } as MessageResponse });\nreturn;\n}\n@@ -70,14 +69,14 @@ export class QueryUnit {\nreturn;\n}\n- QueryPage.send({ connection: connectionNode, type: MessageType.RUN, res: { sql } as RunResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.RUN,queryOption, res: { sql } as RunResponse });\n}\nconst executeTime = new Date().getTime();\ntry {\n(await ConnectionManager.getConnection(connectionNode)).query(sql, (err: Error, data, fields, total) => {\nif (err) {\n- QueryPage.send({ connection: connectionNode, type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.ERROR,queryOption, res: { sql, message: err.message } as ErrorResponse });\nreturn;\n}\nconst costTime = new Date().getTime() - executeTime;\n@@ -85,7 +84,7 @@ export class QueryUnit {\nvscode.commands.executeCommand(CommandKey.RecordHistory, sql, costTime);\n}\nif (data.affectedRows) {\n- QueryPage.send({ connection: connectionNode, type: MessageType.DML, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.DML,queryOption, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse });\n// vscode.commands.executeCommand(CommandKey.Refresh);\nreturn;\n}\n@@ -96,13 +95,13 @@ export class QueryUnit {\nif (data[1] && (\ndata[1].__proto__.constructor.name == \"array\" || data[1].__proto__.constructor.name == \"OkPacket\" || data[1].__proto__.constructor.name == \"ResultSetHeader\")\n) {\n- QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE,queryOption, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\nreturn;\n}\n- QueryPage.send({ connection: connectionNode, type: MessageType.DATA, res: { sql, costTime, data, fields, total, pageSize: Global.getConfig(ConfigKey.DEFAULT_LIMIT) } as DataResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.DATA,queryOption, res: { sql, costTime, data, fields, total, pageSize: Global.getConfig(ConfigKey.DEFAULT_LIMIT) } as DataResponse });\n} else {\n// unknow result, send sql success\n- QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n+ QueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE,queryOption, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n}\n});\n@@ -196,8 +195,12 @@ export class QueryUnit {\n-export class QueryResult<T>{\n- public rows: T;\n- public fields: FieldInfo[];\n- public total?: number;\n+export interface QueryResult<T> {\n+ rows: T; fields: FieldInfo[];\n+ total?: number;\n+}\n+\n+\n+export interface QueryOption {\n+ viewId?: any;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/result/query.ts",
"new_path": "src/service/result/query.ts",
"diff": "import { Util } from \"@/common/util\";\nimport { EsRequest } from \"@/model/es/esRequest\";\n-import { ESIndexNode } from \"@/model/es/model/esIndexNode\";\nimport { ServiceManager } from \"@/service/serviceManager\";\nimport { basename, extname } from \"path\";\nimport { env, StatusBarAlignment, StatusBarItem, Uri, ViewColumn, window } from \"vscode\";\nimport { Trans } from \"~/common/trans\";\nimport { ConfigKey, DatabaseType, MessageType, OperateType } from \"../../common/constants\";\nimport { Global } from \"../../common/global\";\n+import { ViewManager } from \"../../common/viewManager\";\nimport { Node } from \"../../model/interface/node\";\nimport { ColumnNode } from \"../../model/other/columnNode\";\n-import { DatabaseCache } from \"../common/databaseCache\";\nimport { ExportService } from \"../export/exportService\";\n-import { QueryUnit } from \"../queryUnit\";\n-import { ViewManager } from \"../../common/viewManager\";\n+import { QueryOption, QueryUnit } from \"../queryUnit\";\nimport { DataResponse } from \"./queryResponse\";\nexport class QueryParam<T> {\n@@ -20,12 +18,12 @@ export class QueryParam<T> {\npublic singlePage?: boolean;\npublic type: MessageType;\npublic res: T;\n+ public queryOption?: QueryOption;\n}\nexport class QueryPage {\nprivate static exportService: ExportService = new ExportService()\n- private static hodlder: Map<string, string> = new Map()\nprivate static statusBar: StatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, -200);\nprivate static costStatusBar: StatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, -250);\n@@ -55,12 +53,10 @@ export class QueryPage {\nhandler.panel.title = `${queryParam.res.table}@${dbOption.database}`\n}\nqueryParam.res.transId = Trans.transId;\n+ queryParam.res.viewId = queryParam.queryOption?.viewId;\nhandler.emit(queryParam.type, { ...queryParam.res, dbType: dbOption.dbType })\n}).on(OperateType.execute, (params) => {\n- if (!queryParam.singlePage) {\n- this.hodlder.set(params.sql.trim(), type)\n- }\n- QueryUnit.runQuery(params.sql, dbOption);\n+ QueryUnit.runQuery(params.sql, dbOption, queryParam.queryOption);\n}).on(OperateType.next, async (params) => {\nconst sql = ServiceManager.getPageService(dbOption.dbType).build(params.sql, params.pageNum, params.pageSize)\ndbOption.execute(sql).then((rows) => {\n@@ -72,12 +68,12 @@ export class QueryPage {\nconst esQuery = EsRequest.build(queryParam.res.sql, obj => {\nobj.query = query;\n})\n- QueryUnit.runQuery(esQuery, dbOption);\n+ QueryUnit.runQuery(esQuery, dbOption, queryParam.queryOption);\n}).on('esSort', (sort) => {\nconst esQuery = EsRequest.build(queryParam.res.sql, obj => {\nobj.sort = sort;\n})\n- QueryUnit.runQuery(esQuery, dbOption);\n+ QueryUnit.runQuery(esQuery, dbOption, queryParam.queryOption);\n}).on('copy', value => {\nUtil.copyToBoard(value)\n}).on('count', async (params) => {\n@@ -121,16 +117,12 @@ export class QueryPage {\nif (typeof queryParam.singlePage == 'undefined') {\nqueryParam.singlePage = true;\n}\n- let type = queryParam.singlePage ? \"Query\" : \"Query\" + new Date().getTime();\n- const olderTitle = this.hodlder.get(queryParam.res.sql);\n- if (olderTitle) {\n- type = olderTitle;\n- queryParam.singlePage = false;\n- if (queryParam.type == MessageType.DATA) {\n- this.hodlder.delete(queryParam.res.sql);\n+ if (!queryParam.queryOption) {\n+ queryParam.queryOption = {\n+ viewId: \"Query\"\n}\n}\n- return type;\n+ return queryParam.queryOption.viewId;\n}\nprivate static updateStatusBar(queryParam: QueryParam<any>) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix new table view cannot execute sql.
|
141,908
|
28.01.2021 10:21:00
| -28,800
|
91b16bb349d04a53f2f3a0f081de4dc3458147ea
|
Update dump flow.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -78,4 +78,16 @@ export class Util {\nreturn new Promise((resolve, reject) => callback(resolve, reject))\n}\n+ public static process(title: string, task: (done) => void) {\n+ vscode.window.withProgress({ title, location: vscode.ProgressLocation.Notification }, () => {\n+ return new Promise(async (resolve) => {\n+ try {\n+ task(resolve)\n+ } catch (error) {\n+ vscode.window.showErrorMessage(error.message)\n+ }\n+ })\n+ })\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/abstractDumpService.ts",
"new_path": "src/service/dump/abstractDumpService.ts",
"diff": "@@ -15,7 +15,7 @@ export abstract class AbstractDumpService {\nconst dbType = node.dbType\nif (dbType == DatabaseType.MSSQL || dbType == DatabaseType.PG) {\n- vscode.window.showErrorMessage(\"Dump only support mysql.\")\n+ vscode.window.showErrorMessage(\"Dump only support mysql right now!\")\nreturn;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "@@ -4,6 +4,7 @@ import { Console } from \"../../common/Console\";\nimport { Node } from \"../../model/interface/node\";\nimport { NodeUtil } from \"../../model/nodeUtil\";\nimport { AbstractDumpService } from \"./abstractDumpService\";\n+import { Util } from '@/common/util';\nexport class MysqlDumpService extends AbstractDumpService {\nprotected dumpData(node: Node, dumpFilePath: string, withData: boolean, tables: string[]): void {\n@@ -11,9 +12,6 @@ export class MysqlDumpService extends AbstractDumpService {\nconst host = node.usingSSH ? \"127.0.0.1\" : node.host\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\n- Console.log(`Doing backup ${host}_${node.database}...\n-Origin command : \\`mysqldump -h ${host} -P ${port} -u ${node.user} -p --database ${node.database} > ${dumpFilePath}\\`.`);\n-\nconst option: Options = {\nconnection: {\nhost: host,\n@@ -44,17 +42,16 @@ Origin command : \\`mysqldump -h ${host} -P ${port} -u ${node.user} -p --database\nmaxRowsPerInsertStatement: 5000\n}\n}\n+ Util.process(`Doing backup ${host}_${node.database}...`, (done) => {\nmysqldump(option).then(() => {\nvscode.window.showInformationMessage(`Backup ${node.getHost()}_${node.database} success!`, 'open').then(action => {\nif (action == 'open') {\nvscode.commands.executeCommand('vscode.open', vscode.Uri.file(dumpFilePath));\n}\n})\n- }).catch((err) => {\n- vscode.window.showErrorMessage(`Backup ${node.getHost()}_${node.database} fail!\\n${err}`);\n- }).then(() => {\n- Console.log(`backup end.`);\n+ }).finally(done)\n})\n+\n}\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update dump flow.
|
141,908
|
28.01.2021 15:41:11
| -28,800
|
a54d388fd7bf782862ce7bc3d3c6444eac96fe90
|
Extra SP, function, trigger logic.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -7,6 +7,7 @@ import { QueryUnit } from \"@/service/queryUnit\";\nimport { ServiceManager } from \"@/service/serviceManager\";\nimport * as vscode from \"vscode\";\nimport { Memento } from \"vscode\";\n+import { resourceLimits } from \"worker_threads\";\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { NodeUtil } from \"../nodeUtil\";\nimport { CopyAble } from \"./copyAble\";\n@@ -199,6 +200,14 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nreturn (await QueryUnit.queryPromise<T>(await ConnectionManager.getConnection(this), sql)).rows\n}\n+ public async multiExecute(sql: string, sessionId: string): Promise<any> {\n+ const result = (await QueryUnit.queryPromise<any>(await ConnectionManager.getConnection(this, { sessionId }), sql)).rows;\n+ if (result.length == 1) {\n+ return [result]\n+ }\n+ return result\n+ }\n+\npublic async getConnection() {\nreturn ConnectionManager.getConnection(this)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -73,19 +73,19 @@ export class MysqlDialect extends SqlDialect {\nreturn `create database \\`${database}\\` default character set = 'utf8mb4' `;\n}\nshowTableSource(database: string, table: string): string {\n- return `SHOW CREATE TABLE \\`${database}\\`.\\`${table}\\``\n+ return `SHOW CREATE TABLE \\`${database}\\`.\\`${table}\\`;`\n}\nshowViewSource(database: string, table: string): string {\n- return `SHOW CREATE VIEW \\`${database}\\`.\\`${table}\\``\n+ return `SHOW CREATE VIEW \\`${database}\\`.\\`${table}\\`;`\n}\nshowProcedureSource(database: string, name: string): string {\n- return `SHOW CREATE PROCEDURE \\`${database}\\`.\\`${name}\\``\n+ return `SHOW CREATE PROCEDURE \\`${database}\\`.\\`${name}\\`;`\n}\nshowFunctionSource(database: string, name: string): string {\n- return `SHOW CREATE FUNCTION \\`${database}\\`.\\`${name}\\``;\n+ return `SHOW CREATE FUNCTION \\`${database}\\`.\\`${name}\\`;`;\n}\nshowTriggerSource(database: string, name: string): string {\n- return `SHOW CREATE TRIGGER \\`${database}\\`.\\`${name}\\``;\n+ return `SHOW CREATE TRIGGER \\`${database}\\`.\\`${name}\\`;`;\n}\nshowColumns(database: string, table: string): string {\nreturn `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength,COLUMN_DEFAULT defaultValue,EXTRA extra FROM information_schema.columns WHERE table_schema = '${database}' AND table_name = '${table}' ORDER BY ORDINAL_POSITION;`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getDataDump.ts",
"new_path": "src/service/dump/mysql/getDataDump.ts",
"diff": "@@ -10,9 +10,9 @@ interface QueryRes {\n[k: string]: unknown;\n}\n-function buildInsert(table: Table, values: Array<string>): string {\n+function buildInsert(row: QueryRes, table: Table, values: Array<string>): string {\nconst sql = [\n- `INSERT INTO \\`${table.name}\\` (\\`${table.columnsOrdered.join(\n+ `INSERT INTO \\`${table.name}\\` (\\`${Object.keys(row).join(\n'`,`',\n)}\\`)`,\n`VALUES ${values.join(',')};`,\n@@ -21,7 +21,7 @@ function buildInsert(table: Table, values: Array<string>): string {\nreturn sql;\n}\nfunction buildInsertValue(row: QueryRes, table: Table): string {\n- return `(${table.columnsOrdered.map(c => row[c]).join(',')})`;\n+ return `(${Object.keys(row).map(c => row[c]).join(',')})`;\n}\nfunction executeSql(connection: mysql.Connection, sql: string): Promise<void> {\n@@ -140,15 +140,17 @@ async function getDataDump(\nlet rowQueue: Array<string> = [];\n+ let tempRow: QueryRes;\n// stream the data to the file\nquery.on('result', (row: QueryRes) => {\n// build the values list\nrowQueue.push(buildInsertValue(row, table));\n+ if (!tempRow) tempRow = row;\n// if we've got a full queue\nif (rowQueue.length === options.maxRowsPerInsertStatement) {\n// create and write a fresh statement\n- const insert = buildInsert(table, rowQueue);\n+ const insert = buildInsert(row, table, rowQueue);\nsaveChunk(insert);\nrowQueue = [];\n}\n@@ -156,7 +158,7 @@ async function getDataDump(\nquery.on('end', () => {\n// write the remaining rows to disk\nif (rowQueue.length > 0) {\n- const insert = buildInsert(table, rowQueue);\n+ const insert = buildInsert(tempRow, table, rowQueue);\nsaveChunk(insert);\nrowQueue = [];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getFunctionDump.ts",
"new_path": "src/service/dump/mysql/getFunctionDump.ts",
"diff": "import { FunctionDumpOptions } from './interfaces/Options';\nimport { DB } from './DB';\n+import { Node } from '@/model/interface/node';\ninterface ShowFunctions {\nName: string;\n@@ -18,33 +19,17 @@ interface ShowCreateFunction {\n'Database Collation': string;\n}\n-async function getFunctionDump(\n- connection: DB,\n- dbName: string,\n- options: Required<FunctionDumpOptions>,\n-): Promise<Array<string>> {\n+async function getFunctionDump(node: Node, sessionId: string, options: Required<FunctionDumpOptions>, functions: Array<string>): Promise<string> {\nconst output: Array<string> = [];\n- const Functions = await connection.query<ShowFunctions>(\n- `SHOW Function STATUS WHERE Db = '${dbName}'`,\n- );\n-\n- // we create a multi query here so we can query all at once rather than in individual connections\n- const getSchemaMultiQuery: Array<string> = [];\n- Functions.forEach(proc => {\n- getSchemaMultiQuery.push(`SHOW CREATE Function \\`${proc.Name}\\`;`);\n- });\n-\n- if(getSchemaMultiQuery.length==0){\n- return [];\n+ if (functions.length == 0) {\n+ return \"\";\n}\n-\n- const result = await connection.multiQuery<ShowCreateFunction>(\n- getSchemaMultiQuery.join('\\n'),\n- );\n- // mysql2 returns an array of arrays which will all have our one row\n- result\n- .map(r => r[0])\n- .forEach(res => {\n+ const getSchemaMultiQuery = functions.map(fun => {\n+ return node.dialect.showFunctionSource(node.database, fun)\n+ }).join(\"\")\n+ const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateFunction[][];\n+ result.forEach(r => {\n+ const res = r[0]\n// clean up the generated SQL\nlet sql = `${res['Create Function']}`;\n@@ -57,10 +42,10 @@ async function getFunctionDump(\nsql = `DROP Function IF EXISTS ${res.Function};\\n${sql}`;\n}\n- return output.push(`\\n${sql};\\n`);\n+ output.push(`\\n${sql};\\n`);\n});\n- return output;\n+ return output.join(\"\\n\");\n}\nexport { ShowFunctions, ShowCreateFunction, getFunctionDump };\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getProcedureDump.ts",
"new_path": "src/service/dump/mysql/getProcedureDump.ts",
"diff": "+import { Node } from '@/model/interface/node';\nimport { ProcedureDumpOptions } from './interfaces/Options';\n-import { DB } from './DB';\ninterface ShowProcedures {\nName: string;\n@@ -18,33 +18,18 @@ interface ShowCreateProcedure {\n'Database Collation': string;\n}\n-async function getProcedureDump(\n- connection: DB,\n- dbName: string,\n- options: Required<ProcedureDumpOptions>,\n-): Promise<Array<string>> {\n+async function getProcedureDump(node: Node, sessionId: string, options: Required<ProcedureDumpOptions>, procedures: Array<string>): Promise<string> {\nconst output: Array<string> = [];\n- const procedures = await connection.query<ShowProcedures>(\n- `SHOW PROCEDURE STATUS WHERE Db = '${dbName}'`,\n- );\n-\n- // we create a multi query here so we can query all at once rather than in individual connections\n- const getSchemaMultiQuery: Array<string> = [];\n- procedures.forEach(proc => {\n- getSchemaMultiQuery.push(`SHOW CREATE PROCEDURE \\`${proc.Name}\\`;`);\n- });\n-\n- if(getSchemaMultiQuery.length==0){\n- return [];\n+ if (procedures.length == 0) {\n+ return \"\";\n}\n-\n- const result = await connection.multiQuery<ShowCreateProcedure>(\n- getSchemaMultiQuery.join('\\n'),\n- );\n+ const getSchemaMultiQuery = procedures.map(proc => {\n+ return node.dialect.showProcedureSource(node.database, proc)\n+ }).join(\"\")\n+ const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateProcedure[][];\n// mysql2 returns an array of arrays which will all have our one row\n- result\n- .map(r => r[0])\n- .forEach(res => {\n+ result.forEach(r => {\n+ const res = r[0]\n// clean up the generated SQL\nlet sql = `${res['Create Procedure']}`;\n@@ -60,7 +45,7 @@ async function getProcedureDump(\nreturn output.push(`\\n${sql};\\n`);\n});\n- return output;\n+ return output.join(\"\\n\");\n}\nexport { ShowProcedures, ShowCreateProcedure, getProcedureDump };\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getSchemaDump.ts",
"new_path": "src/service/dump/mysql/getSchemaDump.ts",
"diff": "+import { Node } from '@/model/interface/node';\nimport { SchemaDumpOptions } from './interfaces/Options';\nimport { Table } from './interfaces/Table';\n-import { DB } from './DB';\ninterface ShowCreateView {\nView: string;\n@@ -14,21 +14,18 @@ interface ShowCreateTable {\n}\ntype ShowCreateTableStatementRes = ShowCreateView | ShowCreateTable;\n-async function getSchemaDump( connection: DB, options: Required<SchemaDumpOptions>, tables: Array<Table> ): Promise<Array<Table>> {\n+async function getSchemaDump(node: Node, sessionId: string, options: Required<SchemaDumpOptions>, tables: Array<string>): Promise<Array<Table>> {\n// we create a multi query here so we can query all at once rather than in individual connections\nconst getSchemaMultiQuery = tables\n- .map(t => `SHOW CREATE TABLE \\`${t.name}\\`;`)\n+ .map(t => `SHOW CREATE TABLE \\`${t}\\`;`)\n.join('\\n');\n- const createStatements = (await connection.multiQuery<\n- ShowCreateTableStatementRes\n- >(getSchemaMultiQuery))\n- // mysql2 returns an array of arrays which will all have our one row\n- .map(r => r[0])\n- .map((res, i) => {\n- const table = tables[i];\n+ const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateTableStatementRes[];\n+ const createStatements = result\n+ .map((r, i) => {\n+ const res = r[0]\nif ('View' in res) {\nreturn {\n- ...table,\n+ triggers: [],\nname: res.View,\nschema: res['Create View'],\ndata: null,\n@@ -36,7 +33,7 @@ async function getSchemaDump( connection: DB, options: Required<SchemaDumpOption\n};\n}\nreturn {\n- ...table,\n+ triggers: [],\nname: res.Table,\nschema: res['Create Table'],\ndata: null,\n@@ -109,3 +106,4 @@ export {\nShowCreateTableStatementRes,\ngetSchemaDump,\n};\n+\n"
},
{
"change_type": "DELETE",
"old_path": "src/service/dump/mysql/getTables.ts",
"new_path": null,
"diff": "-import { Table, ColumnList } from './interfaces/Table';\n-import { DB } from './DB';\n-\n-interface ShowTableRes {\n- Table_type: 'BASE TABLE' | 'VIEW';\n-\n- [k: string]: string;\n-}\n-\n-interface ShowColumnsRes {\n- Field: string;\n- Type: string;\n- Null: 'YES' | 'NO';\n- Key: string;\n- Default: string | null;\n- Extra: string;\n-}\n-\n-async function getTables(\n- connection: DB,\n- dbName: string,\n- restrictedTables: Array<string>,\n- restrictedTablesIsBlacklist: boolean,\n-): Promise<Array<Table>> {\n- // list the tables\n- const showTablesKey = `Tables_in_${dbName}`;\n- const tablesRes = await connection.query<ShowTableRes>(\n- `SHOW FULL TABLES FROM \\`${dbName}\\``,\n- );\n- const actualTables = tablesRes.map<Table>(r => ({\n- name: r[showTablesKey].replace(/'/g, ''),\n- schema: null,\n- data: null,\n- isView: r.Table_type === 'VIEW',\n- columns: {},\n- columnsOrdered: [],\n- triggers: [],\n- }));\n-\n- let tables = actualTables;\n- if (restrictedTables.length > 0) {\n- if (restrictedTablesIsBlacklist) {\n- // exclude the tables from the options that actually exist in the db\n- tables = tables.filter(\n- t => restrictedTables.indexOf(t.name) === -1,\n- );\n- } else {\n- // only include the tables from the options that actually exist in the db\n- // keeping the order of the passed-in whitelist and filtering out non-existing tables\n- tables = restrictedTables\n- .map(tableName => actualTables.find(t => t.name === tableName))\n- .filter((t): t is Table => t !== undefined);\n- }\n- }\n-\n- // get the column definitions\n- const columnsMultiQuery = tables\n- .map(t => `SHOW COLUMNS FROM \\`${t.name}\\` FROM \\`${dbName}\\`;`)\n- .join('\\n');\n- const columns = await connection.multiQuery<ShowColumnsRes>(\n- columnsMultiQuery,\n- );\n-\n- columns.forEach((cols, i) => {\n- tables[i].columns = cols.reduce<ColumnList>((acc, c) => {\n- acc[c.Field] = {\n- type: c.Type\n- // split to remove things like 'unsigned' from the string\n- .split(' ')[0]\n- // split to remove the lengths\n- .split('(')[0]\n- .toLowerCase(),\n- nullable: c.Null === 'YES',\n- };\n-\n- return acc;\n- }, {});\n- tables[i].columnsOrdered = cols.map(c => c.Field);\n- });\n-\n- return tables;\n-}\n-\n-export { getTables };\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getTriggerDump.ts",
"new_path": "src/service/dump/mysql/getTriggerDump.ts",
"diff": "+import { Node } from '@/model/interface/node';\nimport { TriggerDumpOptions } from './interfaces/Options';\n-import { Table } from './interfaces/Table';\n-import { DB } from './DB';\ninterface ShowTriggers {\nTrigger: string;\n@@ -23,51 +22,20 @@ interface ShowCreateTrigger {\n'Database Collation': string;\n}\n-async function getTriggerDump(\n- connection: DB,\n- dbName: string,\n- options: Required<TriggerDumpOptions>,\n- tables: Array<Table>,\n-): Promise<Array<Table>> {\n- const triggers = (await connection.query<ShowTriggers>(\n- `SHOW TRIGGERS FROM \\`${dbName}\\``,\n- ))\n- // only include triggers from the tables that we have\n- .filter(trig => tables.some(t => t.name === trig.Table))\n- // convert to a trigger name => table index map for easy lookup\n- .reduce((acc, trig) => {\n- tables.some((t, i) => {\n- if (t.name === trig.Table) {\n- acc.set(trig.Trigger, i);\n-\n- return true;\n- }\n-\n- return false;\n- });\n-\n- return acc;\n- }, new Map<string, number>());\n-\n- if (triggers.size === 0) {\n- // no triggers to process\n- return tables;\n+async function getTriggerDump(node: Node, sessionId: string, options: Required<TriggerDumpOptions>, triggers: Array<string>): Promise<string> {\n+ const output: Array<string> = [];\n+ if (triggers.length === 0) {\n+ return \"\";\n}\n// we create a multi query here so we can query all at once rather than in individual connections\n- const getSchemaMultiQuery: Array<string> = [];\n- triggers.forEach((_, t) =>\n- getSchemaMultiQuery.push(`SHOW CREATE TRIGGER \\`${t}\\`;`),\n- );\n+ const getSchemaMultiQuery = triggers.map(trigger => {\n+ return node.dialect.showTriggerSource(node.database, trigger)\n+ }).join(\"\")\n- const result = await connection.multiQuery<ShowCreateTrigger>(\n- getSchemaMultiQuery.join('\\n'),\n- );\n- // mysql2 returns an array of arrays which will all have our one row\n- result\n- .map(r => r[0])\n- .forEach(res => {\n- const table = tables[triggers.get(res.Trigger)!];\n+ const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateTrigger[][];\n+ result.forEach(r => {\n+ const res = r[0]\n// clean up the generated SQL\nlet sql = `${res['SQL Original Statement']}`;\nif (!options.definer) {\n@@ -77,11 +45,11 @@ async function getTriggerDump(\nif (options.dropIfExist) {\nsql = `DROP TRIGGER IF EXISTS ${res.Trigger};\\n${sql}`;\n}\n- table.triggers.push(`\\n${sql};\\n`);\n- return table;\n+ output.push(`\\n${sql};\\n`);\n});\n- return tables;\n+ return output.join(\"\\n\");\n}\nexport { ShowTriggers, ShowCreateTrigger, getTriggerDump };\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/interfaces/DumpReturn.ts",
"new_path": "src/service/dump/mysql/interfaces/DumpReturn.ts",
"diff": "@@ -15,21 +15,6 @@ interface DumpReturn {\n* Null if configured not to dump.\n*/\ndata: string | null;\n- /**\n- * The concatenated SQL trigger dump for the entire database.\n- * Null if configured not to dump.\n- */\n- trigger: string | null;\n- /**\n- * The concatenated SQL procedure dump for the entire database.\n- * Null if configured not to dump.\n- */\n- procedure: string | null;\n- /**\n- * The concatenated SQL procedure dump for the entire database.\n- * Null if configured not to dump.\n- */\n- function: string | null;\n};\ntables: Array<Table>;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/interfaces/Options.ts",
"new_path": "src/service/dump/mysql/interfaces/Options.ts",
"diff": "@@ -200,6 +200,10 @@ interface DumpOptions {\n* Defaults to all tables (signalled by passing an empty array).\n*/\ntables?: Array<string>;\n+ viewList?: Array<string>;\n+ procedureList?: Array<string>;\n+ functionList?: Array<string>;\n+ triggerList?: Array<string>;\n/**\n* Dump file with database\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/interfaces/Table.ts",
"new_path": "src/service/dump/mysql/interfaces/Table.ts",
"diff": "@@ -29,14 +29,6 @@ interface Table {\n* Null if configured to not dump.\n*/\ndata: string | null;\n- /**\n- * The list of column definitions for the table.\n- */\n- columns: ColumnList;\n- /**\n- * An ordered list of columns (for consistently outputing as per the DB definition)\n- */\n- columnsOrdered: Array<string>;\n/**\n* True if the table is actually a view, false otherwise.\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "-import * as fs from 'fs';\n+import { Node } from '@/model/interface/node';\nimport { all as merge } from 'deepmerge';\n-\n-import {\n- Options,\n- CompletedOptions,\n- DataDumpOptions,\n-} from './interfaces/Options';\n-import { DumpReturn } from './interfaces/DumpReturn';\n-import { getTables } from './getTables';\n-import { getSchemaDump } from './getSchemaDump';\n-import { getTriggerDump } from './getTriggerDump';\n-import { getProcedureDump } from './getProcedureDump';\n-import { getFunctionDump } from './getFunctionDump';\n-import { getDataDump } from './getDataDump';\n+import * as fs from 'fs';\nimport { DB } from './DB';\nimport { ERRORS } from './Errors';\n-import { Node } from '@/model/interface/node';\n+import { getDataDump } from './getDataDump';\n+import { getFunctionDump } from './getFunctionDump';\n+import { getProcedureDump } from './getProcedureDump';\n+import { getSchemaDump } from './getSchemaDump';\n+import { getTriggerDump } from './getTriggerDump';\n+import { DumpReturn } from './interfaces/DumpReturn';\n+import {\n+ CompletedOptions, Options\n+} from './interfaces/Options';\n+\nexport {\nOptions\n-}\n+};\nconst defaultOptions: Options = {\nconnection: {\n@@ -68,7 +65,6 @@ function assert(condition: unknown, message: string): void {\n}\n}\nexport default async function main(inputOptions: Options, node: Node): Promise<DumpReturn> {\n- let connection;\ntry {\n// assert the given options have all the required properties\nassert(inputOptions.connection, ERRORS.MISSING_CONNECTION_CONFIG);\n@@ -78,139 +74,65 @@ export default async function main(inputOptions: Options, node: Node): Promise<D\n// note that you can have empty string passwords, hence the type assertion\nassert(typeof inputOptions.connection.password === 'string', ERRORS.MISSING_CONNECTION_PASSWORD,);\n- const options = merge([\n- defaultOptions,\n- inputOptions,\n- ]) as CompletedOptions;\n+ const options = merge([defaultOptions, inputOptions]) as CompletedOptions;\n// make sure the port is a number\noptions.connection.port = parseInt(`${options.connection.port}`, 10);\n- // write to the destination file (i.e. clear it)\n+ // write to the destination file (clear it)\nif (options.dumpToFile) {\nfs.writeFileSync(options.dumpToFile, '');\n}\n- connection = await DB.connect(\n- merge([options.connection, { multipleStatements: true }]),\n- );\n-\n// list the tables\nconst res: DumpReturn = {\ndump: {\nschema: null,\n- data: null,\n- trigger: null,\n- procedure: null,\n- function: null\n+ data: null\n},\n- tables: await getTables(\n- connection,\n- options.connection.database,\n- options.dump.tables,\n- options.dump.excludeTables,\n- ),\n+ tables: null,\n};\nif (options.dumpToFile && options.connection.database && options.dump.withDatabase) {\nfs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ \\`${options.connection.database}\\` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\n-USE \\`${options.connection.database}\\`;\\n`);\n+USE \\`${options.connection.database}\\`;\\n\\n`);\n}\n+ const sessionId = new Date().getTime() + \"\"\n+\n// dump the schema if requested\nif (options.dump.schema !== false) {\n- const tables = res.tables;\nres.tables = await getSchemaDump(\n- connection,\n+ node, sessionId,\noptions.dump.schema,\n- tables,\n+ options.dump.tables\n);\n- res.dump.schema = res.tables\n+ const tableResult = res.tables\n.map(t => t.schema)\n- .filter(t => t)\n- .join('\\n')\n- .trim();\n- }\n-\n- // write the schema to the file\n- if (options.dumpToFile && res.dump.schema) {\n- fs.appendFileSync(options.dumpToFile, `${res.dump.schema}\\n\\n`);\n- }\n+ .join('\\n');\n+ fs.appendFileSync(options.dumpToFile, `${tableResult}\\n\\n`);\n- // dump the procedures if requested\n- if (options.dump.procedure !== false) {\n- const procedures = await getProcedureDump(\n- connection,\n- options.connection.database,\n- options.dump.procedure,\n- );\n- res.dump.procedure = procedures\n- .map(proc => proc)\n- .join('\\n')\n- .trim();\n}\n- // dump the functions if requested\n- if (options.dump.procedure !== false) {\n- const functions = await getFunctionDump(\n- connection,\n- options.connection.database,\n- options.dump.function,\n- );\n- res.dump.function = functions\n- .join('\\n')\n- .trim();\n- }\n-\n- // dump the triggers if requested\n- if (options.dump.trigger !== false) {\n- const tables = res.tables;\n- res.tables = await getTriggerDump(\n- connection,\n- options.connection.database,\n- options.dump.trigger,\n- tables,\n- );\n- res.dump.trigger = res.tables\n- .map(t => t.triggers.join('\\n'))\n- .filter(t => t)\n- .join('\\n')\n- .trim();\n- }\n-\n- // data dump uses its own connection so kill ours\n- await connection.end();\n-\n- // dump data if requested\nif (options.dump.data !== false) {\n- // don't even try to run the data dump\nconst tables = res.tables;\n- res.tables = await getDataDump(\n- options.connection,\n- options.dump.data,\n- tables,\n- options.dumpToFile,\n- );\n- res.dump.data = res.tables\n- .map(t => t.data)\n- .filter(t => t)\n- .join('\\n')\n- .trim();\n+ res.tables = await getDataDump(options.connection, options.dump.data, tables, options.dumpToFile,);\n+ res.dump.data = res.tables.map(t => t.data).join('\\n');\n}\n- // write the procedures to the file\n- if (options.dumpToFile && res.dump.procedure) {\n- fs.appendFileSync(options.dumpToFile, `${res.dump.procedure}\\n\\n`);\n+ if (options.dump.procedure !== false) {\n+ const predecureDatas = await getProcedureDump(node, sessionId, options.dump.procedure, options.dump.procedureList);\n+ fs.appendFileSync(options.dumpToFile, `${predecureDatas}\\n`);\n}\n- // write the functions to the file\n- if (options.dumpToFile && res.dump.function) {\n- fs.appendFileSync(options.dumpToFile, `${res.dump.function}\\n\\n`);\n+ if (options.dump.procedure !== false) {\n+ const functionDatas = await getFunctionDump(node, sessionId, options.dump.function, options.dump.functionList);\n+ fs.appendFileSync(options.dumpToFile, `${functionDatas}\\n`);\n}\n- // write the triggers to the file\n- if (options.dumpToFile && res.dump.trigger) {\n- fs.appendFileSync(options.dumpToFile, `${res.dump.trigger}\\n\\n`);\n+ if (options.dump.trigger !== false) {\n+ const triggerDatas = await getTriggerDump(node, sessionId, options.dump.trigger, options.dump.triggerList);\n+ fs.appendFileSync(options.dumpToFile, `${triggerDatas}\\n`);\n}\nreturn res;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "@@ -14,6 +14,10 @@ export class MysqlDumpService extends AbstractDumpService {\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\nconst tables = items.filter(item => item.description == ModelType.TABLE).map(item => item.label)\n+ const viewList = items.filter(item => item.description == ModelType.VIEW).map(item => item.label)\n+ const procedureList = items.filter(item => item.description == ModelType.PROCEDURE).map(item => item.label)\n+ const functionList = items.filter(item => item.description == ModelType.FUNCTION).map(item => item.label)\n+ const triggerList = items.filter(item => item.description == ModelType.TRIGGER).map(item => item.label)\nconst option: Options = {\nconnection: {\n@@ -25,7 +29,7 @@ export class MysqlDumpService extends AbstractDumpService {\n},\ndump: {\nwithDatabase: items.length != 1,\n- tables\n+ tables,viewList,procedureList,functionList,triggerList\n},\ndumpToFile: dumpFilePath,\n};\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Extra SP, function, trigger logic.
|
141,908
|
28.01.2021 16:57:32
| -28,800
|
92094154b77bf5aaa8f380586e08a2762ea1ebff
|
Support config encrypt.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -42,6 +42,10 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic ssh?: SSHConfig;\npublic dbType?: DatabaseType;\npublic dialect?: SqlDialect;\n+ /**\n+ * mssql\n+ */\n+ public encrypt?: boolean;\n/**\n* contenxt\n@@ -74,6 +78,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nthis.scheme = source.scheme\nthis.global = source.global\nthis.dbType = source.dbType\n+ this.encrypt=source.encrypt\nthis.disable = source.disable\nthis.includeDatabases = source.includeDatabases\nif (!this.provider) this.provider = source.provider\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -18,6 +18,7 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\ndatabase: node.database || undefined,\nconnectTimeout: 5000,\nrequestTimeout: 10000,\n+ encrypt:node.encrypt\n},\nauthentication: {\ntype: \"default\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "</div>\n</section>\n+ <section class=\"mb-2\" v-if=\"connectionOption.dbType=='SqlServer'\">\n+ <div class=\"inline-block mr-10\">\n+ <label class=\"font-bold mr-5 inline-block w-14\">Encrypt</label>\n+ <el-switch v-model=\"connectionOption.encrypt\"></el-switch>\n+ ( If connect SqlServer fail, try change this option. )\n+ </div>\n+ </section>\n+\n<section class=\"mb-2\" v-if=\"connectionOption.dbType=='Redis'\">\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-14\"><span class=\"text-red-600 mr-1\">*</span>Password</label>\n@@ -182,6 +190,7 @@ export default {\nusingSSH: false,\nincludeDatabases: null,\ndbType: \"MySQL\",\n+ encrypt:true,\nglobal: true,\nscheme: \"http\",\ntimezone: \"+00:00\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support config encrypt.
|
141,908
|
28.01.2021 18:33:11
| -28,800
|
09e6558277e8ef5110a3930431a33f69eaec2ed3
|
Adapter mssql dump.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -3,6 +3,7 @@ import { Connection, ConnectionConfig, Request } from \"@/bin/tedious\";\nimport { IConnection, queryCallback } from \"./connection\";\nimport { ConnectionPool } from \"./pool/connectionPool\";\nimport format = require('date-format');\n+import { EventEmitter } from \"events\";\n/**\n* tedious not support connection queue, so need using pool.\n@@ -31,34 +32,47 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\n}\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\n- async query(sql: any, values?: any, callback?: any) {\n+ query(sql: any, values?: any, callback?: any) {\nif (!callback && values instanceof Function) {\ncallback = values;\n}\nlet fields = [];\nlet datas = [];\n+ const event = new EventEmitter()\n+\nthis.getConnection(poolConnection => {\n+ let tempDatas = [];\n+ let columnCount = 0;\nconst connection = poolConnection.actual;\nconst isSelect = sql.match(/^\\s*\\bselect\\b/i)\nconnection.execSql(new Request(sql, err => {\n+ const multi = columnCount > 1;\n+ event.emit(\"end\")\n+ if(callback){\nif (err) {\ncallback(err, null)\n} else if (isSelect) {\n- callback(null, datas, fields)\n+ callback(null, multi ? datas : datas[0] || [], multi ? fields : fields[0] || [])\n} else {\ncallback(null, { affectedRows: datas.length })\n}\n+ }\nthis.release(poolConnection)\n}).on('columnMetadata', (columns) => {\n+ columnCount++;\n+ let tempFields = []\ncolumns.forEach((column) => {\n- fields.push({\n+ tempFields.push({\nname: column.colName,\norgTable: ((column) as any).tableName\n})\n});\n+ fields.push(tempFields)\n+ if (columnCount > 0)\n+ datas.push(tempDatas)\n}).on('row', columns => {\nlet temp = {};\ncolumns.forEach((column) => {\n@@ -66,11 +80,19 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\nif (column.value instanceof Date) {\ntemp[column.metadata.colName] = format(\"yyyy-MM-dd hh:mm:ss\", column.value)\n}\n+ if (this.dumpMode) {\n+ temp[column.metadata.colName] = `'${temp[column.metadata.colName]}'`\n+ }\n});\n- datas.push(temp)\n+ if (!callback) {\n+ event.emit(\"result\", temp)\n+ return;\n+ }\n+ tempDatas.push(temp)\n}))\n})\n+ return event;\n}\nconnect(callback: (err: Error) => void): void {\nconst con = new Connection(this.config)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -73,7 +73,7 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\nreturn `create database ${database}`;\n}\nshowTableSource(database: string, table: string): string {\n- return `SHOW CREATE TABLE \"${database}\".\"${table}\";`\n+ return ``\n}\nshowViewSource(database: string, table: string): string {\nreturn `SELECT definition 'Create View' FROM sys.sql_modules WHERE object_id = OBJECT_ID('${table}');`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/dumpService.ts",
"new_path": "src/service/dump/dumpService.ts",
"diff": "@@ -26,6 +26,7 @@ export class DumpService {\nconst functionList = await new FunctionGroup(node).getChildren();\nconst triggerList = await new TriggerGroup(node).getChildren();\nconst childrenList = [...tableList, ...viewList, ...procedureList, ...functionList, ...triggerList]\n+ .filter(item => item.contextValue != ModelType.INFO && item.contextValue != ModelType.SYSTEM_VIEW_GROUP)\nconst pickItems = childrenList.map(node => { return { label: node.label, description: node.contextValue, picked: true }; });\nnodes = await vscode.window.showQuickPick(pickItems, { canPickMany: true, matchOnDescription: true, ignoreFocusOut: true })\nif (!nodes) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getDataDump.ts",
"new_path": "src/service/dump/mysql/getDataDump.ts",
"diff": "@@ -11,9 +11,9 @@ interface QueryRes {\nfunction buildInsert(row: QueryRes, table: string, values: Array<string>): string {\nconst sql = [\n- `INSERT INTO \\`${table}\\` (\\`${Object.keys(row).join(\n+ `INSERT INTO ${table} (${Object.keys(row).join(\n'`,`',\n- )}\\`)`,\n+ )})`,\n`VALUES ${values.join(',')};`,\n].join(' ')\n@@ -96,7 +96,7 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\n? ` WHERE ${options.where[table]}`\n: '';\nconst query = connection.query(\n- `SELECT * FROM \\`${table}\\`${where}`,\n+ `SELECT * FROM ${table}${where}`,\n) as Query;\nlet rowQueue: Array<string> = [];\n@@ -143,9 +143,6 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\n}\n}\n- // clean up our connections\n- await ((connection.end() as unknown) as Promise<void>);\n-\nif (outFileStream) {\n// tidy up the file stream, making sure writes are 100% flushed before continuing\nawait new Promise(resolve => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getTableDump.ts",
"new_path": "src/service/dump/mysql/getTableDump.ts",
"diff": "@@ -11,6 +11,7 @@ export async function getTableDump(node: Node, sessionId: string, options: Requi\nconst getSchemaMultiQuery = tables\n.map(t => node.dialect.showTableSource(node.database, t))\n.join('');\n+ if (!getSchemaMultiQuery) return;\nconst result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateTable[][];\nconst createStatements = result\n.map((r) => {\n@@ -22,7 +23,7 @@ export async function getTableDump(node: Node, sessionId: string, options: Requi\nif (options.table.dropIfExist) {\nschema = schema.replace(\n/^CREATE TABLE/,\n- `DROP TABLE IF EXISTS \\`${res.Table}\\`;\\nCREATE TABLE`,\n+ `DROP TABLE IF EXISTS ${res.Table};\\nCREATE TABLE`,\n);\n} else if (options.table.ifNotExist) {\nschema = schema.replace(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/interfaces/Options.ts",
"new_path": "src/service/dump/mysql/interfaces/Options.ts",
"diff": "@@ -25,10 +25,6 @@ interface SchemaDumpOptions {\n* Defaults to true.\n*/\ncreateOrReplace?: boolean;\n- /**\n- * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the view definition or not\n- * Defaults to false.\n- */\ndefiner?: boolean;\n/**\n* Include the `ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}` in the view definition or not\n@@ -49,10 +45,6 @@ interface TriggerDumpOptions {\n* Defaults to false.\n*/\ndropIfExist?: boolean;\n- /**\n- * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the view definition or not\n- * Defaults to false.\n- */\ndefiner?: boolean;\n}\n@@ -62,10 +54,6 @@ interface FunctionDumpOptions {\n* Defaults to false.\n*/\ndropIfExist?: boolean;\n- /**\n- * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the sp definition or not\n- * Defaults to false.\n- */\ndefiner?: boolean;\n}\n@@ -75,10 +63,6 @@ interface ProcedureDumpOptions {\n* Defaults to false.\n*/\ndropIfExist?: boolean;\n- /**\n- * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the sp definition or not\n- * Defaults to false.\n- */\ndefiner?: boolean;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "@@ -54,8 +54,8 @@ export default async function main(inputOptions: Options, node: Node): Promise<v\n}\nif (options.dumpToFile && node.database && options.dump.withDatabase) {\n- fs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ \\`${node.database}\\` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\n-USE \\`${node.database}\\`;\\n\\n`);\n+ fs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ ${node.database} /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\n+USE ${node.database};\\n\\n`);\n}\nconst sessionId = new Date().getTime() + \"\"\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adapter mssql dump.
|
141,908
|
28.01.2021 18:41:05
| -28,800
|
9676dc3edb4ec13787d0221681675fad787b4ed9
|
Change dml detech.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -47,17 +47,17 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\nlet columnCount = 0;\nconst connection = poolConnection.actual;\n- const isSelect = sql.match(/^\\s*\\bselect\\b/i)\n+ const isDML = sql.match(/^\\s*\\b(insert|update|delete)\\b/i)\nconnection.execSql(new Request(sql, err => {\nconst multi = columnCount > 1;\nevent.emit(\"end\")\nif(callback){\nif (err) {\ncallback(err, null)\n- } else if (isSelect) {\n- callback(null, multi ? datas : datas[0] || [], multi ? fields : fields[0] || [])\n- } else {\n+ } else if (isDML) {\ncallback(null, { affectedRows: datas.length })\n+ } else {\n+ callback(null, multi ? datas : datas[0] || [], multi ? fields : fields[0] || [])\n}\n}\nthis.release(poolConnection)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Change dml detech.
|
141,908
|
28.01.2021 20:46:43
| -28,800
|
b7d40199374c923ea94f3eac5425ef3ebc6e5bf3
|
Adapter postgresql dump.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/connection.ts",
"new_path": "src/service/connect/connection.ts",
"diff": "-import { FieldInfo, Query } from \"mysql2\";\n+import { EventEmitter } from \"events\";\n+import { FieldInfo } from \"mysql2\";\nexport abstract class IConnection {\n- protected dumpMode: boolean = false;\n- public enableDumpMode(){\n- this.dumpMode=true;\n- };\n- abstract query(sql: string, callback?: queryCallback): void | Query;\n- abstract query(sql: string, values: any, callback?: queryCallback): void | Query;\n+ public dumpMode: boolean = false;\n+ public dead: boolean = false;\n+ abstract query(sql: string, callback?: queryCallback): void | EventEmitter;\n+ abstract query(sql: string, values: any, callback?: queryCallback): void | EventEmitter;\nabstract connect(callback: (err: Error) => void): void;\nabstract beginTransaction(callback: (err: Error) => void): void;\nabstract rollback(): void;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mysqlConnection.ts",
"new_path": "src/service/connect/mysqlConnection.ts",
"diff": "@@ -7,7 +7,6 @@ import { dumpTypeCast } from './convert/mysqlTypeCast';\nexport class MysqlConnection extends IConnection {\nprivate con: mysql.Connection;\n- private dead: boolean;\nconstructor(node: Node) {\nsuper()\nconst newConnectionOptions = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -2,6 +2,8 @@ import { Node } from \"@/model/interface/node\";\nimport { Client, QueryArrayResult, types } from \"pg\";\nimport { IConnection, queryCallback } from \"./connection\";\nimport { TypeId } from \"pg-types\";\n+import { EventEmitter } from \"events\";\n+import * as sqlstring from 'sqlstring';\n// date\ntypes.setTypeParser(1082, (val) => val)\n@@ -13,7 +15,6 @@ types.setTypeParser(114, (val) => val)\n*/\nexport class PostgreSqlConnection extends IConnection {\nprivate client: Client;\n- private dead: boolean;\nconstructor(opt: Node) {\nsuper()\nconst config = {\n@@ -37,9 +38,19 @@ export class PostgreSqlConnection extends IConnection {\nif (!callback && values instanceof Function) {\ncallback = values;\n}\n+ const event = new EventEmitter()\nthis.client.query(sql, (err, res) => {\nif (err) {\ncallback(err)\n+ event.emit(\"error\", err.message)\n+ } else if (!callback) {\n+ if (res.rows.length == 0) {\n+ event.emit(\"end\")\n+ }\n+ for (let i = 1; i <= res.rows.length; i++) {\n+ const row = res.rows[i-1];\n+ event.emit(\"result\", this.convertToDump(res.fields, row),res.rows.length == i)\n+ }\n} else {\nif (res instanceof Array) {\ncallback(null, res.map(row => this.adaptResult(row)), res.map(row => row.fields))\n@@ -48,6 +59,18 @@ export class PostgreSqlConnection extends IConnection {\n}\n}\n})\n+ return event;\n+ }\n+ convertToDump(fields: import(\"pg\").FieldDef[], row: any): any {\n+ for (const key in row) {\n+ const element = row[key];\n+ if (!element) {\n+ row[key] = 'NULL'\n+ }else{\n+ row[key]=sqlstring.escape(element)\n+ }\n+ }\n+ return row;\n}\nadaptResult(res: QueryArrayResult<any>) {\nif (res.command != 'SELECT' && res.command != 'SHOW') {\n@@ -79,4 +102,6 @@ export class PostgreSqlConnection extends IConnection {\nthis.client.end()\n}\n+\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -71,19 +71,20 @@ ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\nreturn `create database \"${database}\"`;\n}\nshowTableSource(database: string, table: string): string {\n- return `SHOW CREATE TABLE \"${database}\".\"${table}\";`\n+ return '';\n+ // return `SHOW CREATE TABLE \"${database}\".\"${table}\";`\n}\nshowViewSource(database: string, table: string): string {\nreturn `SELECT CONCAT('CREATE VIEW ',table_name,'\\nAS\\n(',view_definition,');') \"Create View\",table_name,view_definition from information_schema.views where table_name='${table}';`\n}\nshowProcedureSource(database: string, name: string): string {\n- return `select pg_get_functiondef('${name}' :: regproc) \"Create Procedure\";`;\n+ return `select pg_get_functiondef('${name}' :: regproc) \"Create Procedure\",'${name}' \"Procedure\";`;\n}\nshowFunctionSource(database: string, name: string): string {\n- return `select pg_get_functiondef('${name}' :: regproc) \"Create Function\";`;\n+ return `select pg_get_functiondef('${name}' :: regproc) \"Create Function\",'${name}' \"Function\";`;\n}\nshowTriggerSource(database: string, name: string): string {\n- return `select pg_get_triggerdef(oid) \"SQL Original Statement\" from pg_trigger where tgname = '${name}';`;\n+ return `select pg_get_triggerdef(oid) \"SQL Original Statement\",'${name}' \"Trigger\" from pg_trigger where tgname = '${name}';`;\n}\nshowColumns(database: string, table: string): string {\nconst view = table.split('.')[1];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getDataDump.ts",
"new_path": "src/service/dump/mysql/getDataDump.ts",
"diff": "import { Node } from '@/model/interface/node';\nimport { IConnection } from '@/service/connect/connection';\nimport { ConnectionManager } from '@/service/connectionManager';\n+import { EventEmitter } from 'events';\nimport * as fs from 'fs';\nimport { Query } from 'mysql2';\nimport { DataDumpOptions } from './interfaces/Options';\n@@ -12,7 +13,7 @@ interface QueryRes {\nfunction buildInsert(row: QueryRes, table: string, values: Array<string>): string {\nconst sql = [\n`INSERT INTO ${table}(${Object.keys(row).join(\n- '`,`',\n+ ',',\n)})`,\n`VALUES${values.join(',')};`,\n].join(' ')\n@@ -75,7 +76,7 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\nawait executeSql(connection, 'SET GLOBAL read_only = ON');\n}\n- connection.enableDumpMode()\n+ connection.dumpMode=true;\n// to avoid having to load an entire DB's worth of data at once, we select from each table individually\n// note that we use async/await within this loop to only process one table at a time (to reduce memory footprint)\n@@ -97,13 +98,13 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\n: '';\nconst query = connection.query(\n`SELECT * FROM ${table}${where}`,\n- ) as Query;\n+ ) as EventEmitter;\nlet rowQueue: Array<string> = [];\nlet tempRow: QueryRes;\n// stream the data to the file\n- query.on('result', (row: QueryRes) => {\n+ query.on('result', (row: QueryRes,end) => {\n// build the values list\nrowQueue.push(buildInsertValue(row));\n@@ -115,6 +116,9 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\nsaveChunk(insert);\nrowQueue = [];\n}\n+ if(end){\n+ query.emit(\"end\")\n+ }\n});\nquery.on('end', () => {\n// write the remaining rows to disk\n@@ -141,6 +145,7 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\nawait executeSql(connection, 'SET GLOBAL read_only = OFF');\nawait executeSql(connection, 'UNLOCK TABLES');\n}\n+ connection.dumpMode=false;\n}\nif (outFileStream) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getTriggerDump.ts",
"new_path": "src/service/dump/mysql/getTriggerDump.ts",
"diff": "+import { DatabaseType } from '@/common/constants';\nimport { Node } from '@/model/interface/node';\nimport { TriggerDumpOptions } from './interfaces/Options';\n@@ -42,8 +43,12 @@ async function getTriggerDump(node: Node, sessionId: string, options: Required<T\n}\n// drop trigger statement should go outside the delimiter mods\nif (options.dropIfExist) {\n+ if(node.dbType==DatabaseType.PG){\n+ sql = `DROP TRIGGER IF EXISTS ${res.Trigger} ${sql.match(/ON \\S+/)[0]};\\n${sql}`;\n+ }else{\nsql = `DROP TRIGGER IF EXISTS ${res.Trigger};\\n${sql}`;\n}\n+ }\nreturn `${sql};`;\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "+import { DatabaseType } from '@/common/constants';\nimport { Node } from '@/model/interface/node';\nimport { all as merge } from 'deepmerge';\nimport * as fs from 'fs';\n@@ -53,7 +54,7 @@ export default async function main(inputOptions: Options, node: Node): Promise<v\nfs.writeFileSync(options.dumpToFile, '');\n}\n- if (options.dumpToFile && node.database && options.dump.withDatabase) {\n+ if (options.dumpToFile && node.database && options.dump.withDatabase && node.dbType!=DatabaseType.PG) {\nfs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ ${node.database} /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\nUSE ${node.database};\\n\\n`);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adapter postgresql dump.
|
141,908
|
28.01.2021 21:22:42
| -28,800
|
43f7338355ef1a73b902a06e5e064439f868ae0a
|
Support export postgresql.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -162,7 +162,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nreturn Node.nodeCache[`${this.getConnectId()}`]\n}\n- public getByRegion(region?: string): Node {\n+ public getByRegion<T extends Node>(region?: string): T {\nif (!region) {\nreturn Node.nodeCache[`${this.getConnectId({ withDbForce: true })}`]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -71,7 +71,7 @@ export class TableNode extends Node implements CopyAble {\ntables.shift()\ntable = tables.join(\".\")\n}\n- sql = `create table ${table}(\\n`\n+ sql = `CREATE TABLE ${table}(\\n`\nfor (let i = 0; i < childs.length; i++) {\nconst child: ColumnNode = childs[i] as ColumnNode;\nif (i == childs.length - 1) {\n@@ -80,7 +80,7 @@ export class TableNode extends Node implements CopyAble {\nsql += ` ${child.column.name} ${child.type}${child.isPrimaryKey ? ' PRIMARY KEY' : ''},\\n`\n}\n}\n- sql += \");\"\n+ sql += \")\"\n}\nif (open) {\nQueryUnit.showSQLTextDocument(this, sql);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -42,6 +42,7 @@ export class PostgreSqlConnection extends IConnection {\nthis.client.query(sql, (err, res) => {\nif (err) {\ncallback(err)\n+ this.end()\nevent.emit(\"error\", err.message)\n} else if (!callback) {\nif (res.rows.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -75,7 +75,7 @@ ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\n// return `SHOW CREATE TABLE \"${database}\".\"${table}\";`\n}\nshowViewSource(database: string, table: string): string {\n- return `SELECT CONCAT('CREATE VIEW ',table_name,'\\nAS\\n(',view_definition,');') \"Create View\",table_name,view_definition from information_schema.views where table_name='${table}';`\n+ return `SELECT CONCAT('CREATE VIEW ',table_name,'\\nAS\\n(',regexp_replace(view_definition,';$',''),')') \"Create View\",table_name,view_definition from information_schema.views where table_name='${table}';`\n}\nshowProcedureSource(database: string, name: string): string {\nreturn `select pg_get_functiondef('${name}' :: regproc) \"Create Procedure\",'${name}' \"Procedure\";`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getTableDump.ts",
"new_path": "src/service/dump/mysql/getTableDump.ts",
"diff": "import { Node } from '@/model/interface/node';\n+import { TableNode } from '@/model/main/tableNode';\n+import { table } from 'console';\nimport { SchemaDumpOptions } from './interfaces/Options';\nexport interface ShowCreateTable {\n@@ -8,22 +10,15 @@ export interface ShowCreateTable {\nexport async function getTableDump(node: Node, sessionId: string, options: Required<SchemaDumpOptions>, tables: Array<string>): Promise<string> {\nif (tables.length == 0) return '';\n- const getSchemaMultiQuery = tables\n- .map(t => node.dialect.showTableSource(node.database, t))\n- .join('');\n- if (!getSchemaMultiQuery) return;\n- const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateTable[][];\n- const createStatements = result\n- .map((r) => {\n- const res = r[0]\n- let schema = res['Create Table'];\n+ const createStatements = tables.map(async (table) => {\n+ let schema = await node.getByRegion<TableNode>(table).showSource(false);\nif (!options.engine) {\nschema = schema.replace(/ENGINE\\s*=\\s*\\w+ /, '');\n}\nif (options.table.dropIfExist) {\nschema = schema.replace(\n/^CREATE TABLE/,\n- `DROP TABLE IF EXISTS ${res.Table};\\nCREATE TABLE`,\n+ `DROP TABLE IF EXISTS ${table};\\nCREATE TABLE`,\n);\n} else if (options.table.ifNotExist) {\nschema = schema.replace(\n@@ -33,5 +28,5 @@ export async function getTableDump(node: Node, sessionId: string, options: Requi\n}\nreturn `${schema};`;\n});\n- return createStatements.join(\"\\n\\n\");\n+ return (await Promise.all(createStatements)).join(\"\\n\\n\");\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getViewDump.ts",
"new_path": "src/service/dump/mysql/getViewDump.ts",
"diff": "+import { DatabaseType } from '@/common/constants';\nimport { Node } from '@/model/interface/node';\nimport { SchemaDumpOptions } from './interfaces/Options';\n@@ -23,7 +24,7 @@ export async function getViewDump(node: Node, sessionId: string, options: Requir\nif (!options.engine) {\nschema = schema.replace(/ENGINE\\s*=\\s*\\w+ /, '');\n}\n- if (options.view.createOrReplace) {\n+ if (options.view.createOrReplace && node.dbType!=DatabaseType.PG && node.dbType!=DatabaseType.MSSQL) {\nschema = schema.replace(/^CREATE/, 'CREATE OR REPLACE');\n}\nif (!options.view.algorithm) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support export postgresql.
|
141,908
|
28.01.2021 21:27:12
| -28,800
|
c0cafdf80be08530a230b975d8787407642383af
|
Support disable sql code lens.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"object\",\n\"title\": \"%config.title%\",\n\"properties\": {\n- \"vscode-mysql.enableDelimiter\": {\n+ \"database-client.enableDelimiter\": {\n\"type\": \"boolean\",\n\"default\": false,\n\"description\": \"%config.enableDelimiter%\"\n},\n- \"vscode-mysql.defaultSelectLimit\": {\n+ \"database-client.defaultSelectLimit\": {\n\"type\": \"integer\",\n\"default\": 100,\n\"description\": \"%config.defaultSelectLimit%\"\n},\n- \"vscode-mysql.showTotal\": {\n+ \"database-client.showTotal\": {\n\"type\": \"boolean\",\n\"default\": true,\n\"description\": \"%config.showTotal%\"\n+ },\n+ \"database-client.disableSqlCodeLen\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Disable Sql Code lens.\"\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -29,6 +29,7 @@ export enum CacheKey {\nexport enum ConfigKey {\nENABLE_DELIMITER = \"enableDelimiter\",\nDEFAULT_LIMIT = \"defaultSelectLimit\",\n+ DISABLE_SQL_CODELEN = \"disableSqlCodeLen\",\nSHOW_TOTAL = \"showTotal\",\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "import { Hanlder, ViewManager } from \"@/common/viewManager\";\n-import { HistoryRecorder } from \"@/service/common/historyRecorder\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\n-import { ConfigKey, Constants, DatabaseType, MessageType, ModelType, Template } from \"../../common/constants\";\n+import { ConfigKey, Constants, DatabaseType, ModelType, Template } from \"../../common/constants\";\nimport { Global } from \"../../common/global\";\nimport { Util } from \"../../common/util\";\nimport { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\n@@ -10,8 +9,6 @@ import { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { MockRunner } from \"../../service/mock/mockRunner\";\nimport { QueryUnit } from \"../../service/queryUnit\";\n-import { QueryPage } from \"../../service/result/query\";\n-import { DataResponse } from \"../../service/result/queryResponse\";\nimport { CopyAble } from \"../interface/copyAble\";\nimport { Node } from \"../interface/node\";\nimport { ColumnMeta } from \"../other/columnMeta\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/sqlCodeLensProvider.ts",
"new_path": "src/provider/sqlCodeLensProvider.ts",
"diff": "+import { ConfigKey } from '@/common/constants';\n+import { Global } from '@/common/global';\nimport * as vscode from 'vscode';\nexport class SqlCodeLensProvider implements vscode.CodeLensProvider {\n@@ -11,6 +13,10 @@ export class SqlCodeLensProvider implements vscode.CodeLensProvider {\npublic parseCodeLens(document: vscode.TextDocument): vscode.ProviderResult<vscode.CodeLens[]> {\n+ if(Global.getConfig<number>(ConfigKey.DISABLE_SQL_CODELEN)){\n+ return []\n+ }\n+\nconst codeLens = []\nlet start: vscode.Position;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support disable sql code lens.
|
141,908
|
29.01.2021 09:28:00
| -28,800
|
3fe4bcffb72c6a501c987ac404ca1c83233a0c88
|
Add node display setting.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"boolean\",\n\"default\": false,\n\"description\": \"Disable Sql Code lens.\"\n- }\n+ },\n+ \"database-client.showDiagram\": { \"type\": \"boolean\", \"default\": true },\n+ \"database-client.showQuery\": { \"type\": \"boolean\", \"default\": true },\n+ \"database-client.showProcedure\": { \"type\": \"boolean\", \"default\": true },\n+ \"database-client.showFunction\": { \"type\": \"boolean\", \"default\": true },\n+ \"database-client.showTrigger\": { \"type\": \"boolean\", \"default\": true }\n}\n}\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "+import { Global } from \"@/common/global\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\nimport { Constants, ModelType } from \"../../common/constants\";\n@@ -37,11 +38,26 @@ export class DatabaseNode extends Node implements CopyAble {\n}\npublic getChildren(): Promise<Node[]> | Node[] {\n- return [\n- new TableGroup(this), new ViewGroup(this),\n- new QueryGroup(this), new DiagramGroup(this),\n- new ProcedureGroup(this), new FunctionGroup(this), new TriggerGroup(this)\n- ];\n+\n+ let childs:Node[] = [new TableGroup(this), new ViewGroup(this)];\n+\n+ if (Global.getConfig('showQuery')) {\n+ childs.push(new QueryGroup(this))\n+ }\n+ if (Global.getConfig('showDiagram')) {\n+ childs.push(new DiagramGroup(this))\n+ }\n+ if (Global.getConfig('showProcedure')) {\n+ childs.push(new ProcedureGroup(this))\n+ }\n+ if (Global.getConfig('showFunction')) {\n+ childs.push(new FunctionGroup(this))\n+ }\n+ if (Global.getConfig('showTrigger')) {\n+ childs.push(new TriggerGroup(this))\n+ }\n+\n+ return childs;\n}\npublic openOverview() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add node display setting.
|
141,908
|
29.01.2021 09:55:34
| -28,800
|
981eba6b2c8a740692829b124423d907390e2283
|
Fix mssql multiquery fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -57,7 +57,8 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\n} else if (isDML) {\ncallback(null, { affectedRows: datas.length })\n} else {\n- callback(null, multi ? datas : datas[0] || [], multi ? fields : fields[0] || [])\n+ if(multi) datas.push(tempDatas)\n+ callback(null, multi ? datas : tempDatas, multi ? fields : fields[0] || [])\n}\n}\nthis.release(poolConnection)\n@@ -71,8 +72,10 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\n})\n});\nfields.push(tempFields)\n- if (columnCount > 0)\n+ if (columnCount > 1){\ndatas.push(tempDatas)\n+ tempDatas=[]\n+ }\n}).on('row', columns => {\nlet temp = {};\ncolumns.forEach((column) => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix mssql multiquery fail.
|
141,908
|
29.01.2021 10:11:46
| -28,800
|
6df948d71890cf8ba21469ae46f9147bfbb8fa44
|
Support config timeout.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -33,6 +33,8 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic database?: string;\npublic name?: string;\npublic timezone?: string;\n+ public connectTimeout?: number;\n+ public requestTimeout?: number;\npublic certPath?: string;\npublic includeDatabases?: string;\n@@ -78,6 +80,14 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nthis.scheme = source.scheme\nthis.global = source.global\nthis.dbType = source.dbType\n+ if(source.connectTimeout){\n+ this.connectTimeout = parseInt(source.connectTimeout as any)\n+ source.connectTimeout=parseInt(source.connectTimeout as any)\n+ }\n+ if(source.requestTimeout){\n+ this.requestTimeout = parseInt(source.requestTimeout as any)\n+ source.requestTimeout = parseInt(source.requestTimeout as any)\n+ }\nthis.encrypt = source.encrypt\nthis.disable = source.disable\nthis.includeDatabases = source.includeDatabases\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/esConnection.ts",
"new_path": "src/service/connect/esConnection.ts",
"diff": "@@ -30,6 +30,7 @@ export class EsConnection extends IConnection {\nheaders: {\n'Content-Type': 'application/json',\n},\n+ timeout: this.opt.connectTimeout || 2000,\nresponseType: 'json',\ndata: body\n}).then(async ({ data }) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "-import { Node } from \"@/model/interface/node\";\nimport { Connection, ConnectionConfig, Request } from \"@/bin/tedious\";\n-import { IConnection, queryCallback } from \"./connection\";\n+import { Node } from \"@/model/interface/node\";\n+import { EventEmitter } from \"events\";\n+import { queryCallback } from \"./connection\";\nimport { ConnectionPool } from \"./pool/connectionPool\";\nimport format = require('date-format');\n-import { EventEmitter } from \"events\";\n/**\n* tedious not support connection queue, so need using pool.\n@@ -17,8 +17,8 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\nserver: node.host,\noptions: {\ndatabase: node.database || undefined,\n- connectTimeout: 5000,\n- requestTimeout: 10000,\n+ connectTimeout: node.connectTimeout || 5000,\n+ requestTimeout: node.requestTimeout || 10000,\nencrypt: node.encrypt\n},\nauthentication: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mysqlConnection.ts",
"new_path": "src/service/connect/mysqlConnection.ts",
"diff": "@@ -13,7 +13,7 @@ export class MysqlConnection extends IConnection {\nhost: node.host, port: node.port, user: node.user, password: node.password, database: node.database,\ntimezone: node.timezone,\nmultipleStatements: true, dateStrings: true, supportBigNumbers: true, bigNumberStrings: true,\n- connectTimeout: 5000,\n+ connectTimeout: node.connectTimeout||5000,\ntypeCast: (field, next) => {\nif (this.dumpMode) return dumpTypeCast(field as TypecastField)\nconst buf = field.buffer();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -21,8 +21,8 @@ export class PostgreSqlConnection extends IConnection {\nhost: opt.host, port: opt.port,\nuser: opt.user, password: opt.password,\ndatabase: opt.database,\n- connectionTimeoutMillis: 5000,\n- statement_timeout: 10000\n+ connectionTimeoutMillis: opt.connectTimeout || 5000,\n+ statement_timeout: opt.requestTimeout || 10000\n};\nthis.client = new Client(config);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/redisConnection.ts",
"new_path": "src/service/connect/redisConnection.ts",
"diff": "@@ -12,7 +12,7 @@ export class RedisConnection extends IConnection {\nport: opt.port,\ndb: opt.database,\nauth_pass: opt.password,\n- connect_timeout: 5000\n+ connect_timeout: opt.connectTimeout || 5000\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<template v-if=\"connectionOption.dbType=='ElasticSearch'\">\n<section class=\"mb-2\">\n- <label class=\"font-bold mr-5 inline-block w-14\">Scheme</label>\n+ <label class=\"font-bold mr-5 inline-block w-32\">Scheme</label>\n<el-radio v-model=\"connectionOption.scheme\" label=\"http\">Http</el-radio>\n<el-radio v-model=\"connectionOption.scheme\" label=\"https\">Https</el-radio>\n</section>\n<section class=\"mb-2\">\n<div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\"><span class=\"text-red-600 mr-1\">*</span>Host</label>\n+ <label class=\"font-bold mr-5 inline-block w-32\"><span class=\"text-red-600 mr-1\">*</span>Host</label>\n<input class=\"w-64 field__input\" placeholder=\"The host of connection\" required v-model=\"connectionOption.host\" />\n</div>\n<div class=\"inline-block mr-10\">\n<template v-if=\"connectionOption.dbType!='ElasticSearch'\">\n- <section class=\"mb-2\" v-if=\"connectionOption.dbType!='Redis'\">\n- <div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\"><span class=\"text-red-600 mr-1\">*</span>Username</label>\n+ <section class=\"mb-2\">\n+ <div class=\"inline-block mr-10\" v-if=\"connectionOption.dbType!='Redis'\">\n+ <label class=\"font-bold mr-5 inline-block w-32\"><span class=\"text-red-600 mr-1\">*</span>Username</label>\n<input class=\"w-64 field__input\" placeholder=\"Username\" required v-model=\"connectionOption.user\" />\n</div>\n<div class=\"inline-block mr-10\">\n<section class=\"mb-2\" v-if=\"connectionOption.dbType=='SqlServer'\">\n<div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\">Encrypt</label>\n+ <label class=\"font-bold mr-5 inline-block w-32\">Encrypt</label>\n<el-switch v-model=\"connectionOption.encrypt\"></el-switch>\n( If connect SqlServer fail, try change this option. )\n</div>\n</section>\n- <section class=\"mb-2\" v-if=\"connectionOption.dbType=='Redis'\">\n- <div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\"><span class=\"text-red-600 mr-1\">*</span>Password</label>\n- <input class=\"w-64 field__input\" placeholder=\"Password\" type=\"password\" v-model=\"connectionOption.password\" />\n- </div>\n- </section>\n-\n<section class=\"mb-2\">\n<div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\">Databases</label>\n+ <label class=\"font-bold mr-5 inline-block w-32\">Databases</label>\n<input class=\"w-64 field__input\" placeholder=\"Special connection database\" v-model=\"connectionOption.database\" />\n</div>\n<div class=\"inline-block mr-10\" v-if=\"connectionOption.dbType!='Redis'\">\n</div>\n</section>\n+ <section class=\"mb-2\">\n+ <div class=\"inline-block mr-10\">\n+ <label class=\"font-bold mr-5 inline-block w-32\">ConnectTimeout</label>\n+ <input class=\"w-64 field__input\" placeholder=\"millisecond\" required v-model=\"connectionOption.connectTimeout\" />\n+ </div>\n+ <div class=\"inline-block mr-10\">\n+ <label class=\"font-bold mr-5 inline-block w-32\">RequestTimeout</label>\n+ <input class=\"w-64 field__input\" placeholder=\"millisecond\" required type=\"number\" v-model=\"connectionOption.requestTimeout\" />\n+ </div>\n+ </section>\n+\n</template>\n<section class=\"flex items-center mb-2\" v-if=\"connectionOption.dbType=='MySQL'\">\n<div class=\"inline-block mr-10\">\n- <label class=\"font-bold mr-5 inline-block w-14\">Timezone</label>\n+ <label class=\"font-bold mr-5 inline-block w-32\">Timezone</label>\n<input class=\"w-64 field__input\" placeholder=\"+HH:MM\" v-model=\"connectionOption.timezone\" />\n</div>\n</section>\n@@ -336,7 +340,6 @@ input::-webkit-inner-spin-button {\nmargin: 0;\n}\n-\n.button {\npadding: 4px 14px;\nborder: 0;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support config timeout.
|
141,908
|
29.01.2021 10:22:09
| -28,800
|
df8b41815724053d9888573f0a0ea956354c4f54
|
Update design.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<template>\n<div>\n+ <InfoPanel/>\n<div class=\"design-toolbar\">\n<el-button @click=\"column.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n<script>\nimport { inject } from \"../mixin/vscodeInject\";\nimport { wrapByDb } from \"@/common/wrapper\";\n+import InfoPanel from \"./InfoPanel\";\nexport default {\nmixins: [inject],\n+ components:{InfoPanel},\ndata() {\nreturn {\ndesignData: {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/index.vue",
"new_path": "src/vue/design/index.vue",
"diff": "<el-tag>Table:</el-tag>\n{{table}}\n<ul class=\"tab\">\n- <li class=\"tab__item \" :class=\"{'tab__item--active':activePanel=='info'}\" @click=\"activePanel='info'\">Info </li>\n<li class=\"tab__item \" :class=\"{'tab__item--active':activePanel=='column'}\" @click=\"activePanel='column'\">Column </li>\n<li class=\"tab__item \" :class=\"{'tab__item--active':activePanel=='index'}\" @click=\"activePanel='index'\">Index </li>\n</ul>\n<div class=\"mt-2\">\n- <InfoPanel v-if=\"activePanel=='info'\" />\n<ColumnPanel v-if=\"activePanel=='column'\" />\n<IndexPanel v-if=\"activePanel=='index'\" />\n</div>\nimport { inject } from \"../mixin/vscodeInject\";\nimport IndexPanel from \"./IndexPanel\";\nimport ColumnPanel from \"./ColumnPanel\";\n-import InfoPanel from \"./InfoPanel\";\nexport default {\nmixins: [inject],\n- components: { IndexPanel, ColumnPanel, InfoPanel },\n+ components: { IndexPanel, ColumnPanel },\ndata() {\nreturn {\ntable: null,\n- activePanel: \"info\",\n+ activePanel: \"column\",\n};\n},\nmounted() {\n@@ -62,4 +59,5 @@ export default {\ncolor: var(--vscode-panelTitle-activeForeground);\nborder-bottom-color: var(--vscode-panelTitle-activeForeground);\n}\n+\n</style>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update design.
|
141,908
|
29.01.2021 16:24:20
| -28,800
|
576acd28b9f08551939f9649e78c6c8ba9c5a4b6
|
Pass ssh.algorithms option.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/common/sshTunnelService.ts",
"new_path": "src/service/common/sshTunnelService.ts",
"diff": "@@ -34,6 +34,7 @@ export class SSHTunnelService {\ndstPort: connectionNode.port,\nlocalHost: '127.0.0.1',\nlocalPort: port,\n+ algorithms:ssh.algorithms,\npassphrase: ssh.passphrase,\nprivateKey: (() => {\nif (ssh.privateKeyPath && existsSync(ssh.privateKeyPath)) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Pass ssh.algorithms option.
|
141,908
|
29.01.2021 16:53:45
| -28,800
|
452657221a305e24a189ad0760bbcdbdf39e281f
|
Fix dump fail.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"default\": false,\n\"description\": \"Disable Sql Code lens.\"\n},\n- \"database-client.showDiagram\": { \"type\": \"boolean\", \"default\": true },\n- \"database-client.showQuery\": { \"type\": \"boolean\", \"default\": true },\n- \"database-client.showProcedure\": { \"type\": \"boolean\", \"default\": true },\n- \"database-client.showFunction\": { \"type\": \"boolean\", \"default\": true },\n- \"database-client.showTrigger\": { \"type\": \"boolean\", \"default\": true }\n+ \"database-client.showDiagram\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show diagram on tree view.\"\n+ },\n+ \"database-client.showQuery\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show query on tree view.\"\n+ },\n+ \"database-client.showProcedure\": {\n+ \"type\": \"boolean\",\n+ \"default\": true,\n+ \"description\": \"Show procedure on tree view.\"\n+ },\n+ \"database-client.showFunction\": {\n+ \"type\": \"boolean\",\n+ \"default\": true,\n+ \"description\": \"Show function on tree view.\"\n+ },\n+ \"database-client.showTrigger\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show trigger on tree view.\"\n+ }\n}\n}\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -69,7 +69,7 @@ export enum ModelType {\n*/\nCONNECTION = \"connection\", DATABASE = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\nTABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\n- VIEW = \"view\", VIEW_GROUP = \"viewGroup\", SYSTEM_VIEW_GROUP = \"systemViewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\n+ VIEW = \"view\", VIEW_GROUP = \"viewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\nPROCEDURE_GROUP = \"procedureGroup\", PROCEDURE = \"procedure\", FUNCTION_GROUP = \"functionGroup\", FUNCTION = \"function\",\nQUERY_GROUP = \"queryGroup\", QUERY = \"query\",\nDIAGRAM_GROUP = \"diagramGroup\", DIAGRAM = \"diagram\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -218,16 +218,8 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic getPort(): number { return this.usingSSH ? this.ssh.port : this.port }\npublic getUser(): string { return this.usingSSH ? this.ssh.username : this.user }\n- public async execute<T>(sql: string): Promise<T> {\n- return (await QueryUnit.queryPromise<T>(await ConnectionManager.getConnection(this), sql)).rows\n- }\n-\n- public async multiExecute(sql: string, sessionId: string): Promise<any> {\n- const result = (await QueryUnit.queryPromise<any>(await ConnectionManager.getConnection(this, { sessionId }), sql)).rows;\n- if (result.length == 1) {\n- return [result]\n- }\n- return result\n+ public async execute<T>(sql: string,sessionId?:string): Promise<T> {\n+ return (await QueryUnit.queryPromise<T>(await ConnectionManager.getConnection(this,{sessionId}), sql)).rows\n}\npublic async getConnection() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -117,7 +117,7 @@ export class ConnectionManager {\n}\n}\nconst newConnection = this.create(connectOption);\n- this.alivedConnection[key] = { connection: newConnection, ssh, schema: connectionNode.schema };\n+ this.alivedConnection[key] = { connection: newConnection, ssh };\nnewConnection.connect(async (err: Error) => {\nif (err) {\nthis.end(key, this.alivedConnection[key])\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/dumpService.ts",
"new_path": "src/service/dump/dumpService.ts",
"diff": "@@ -8,9 +8,10 @@ import format = require('date-format');\nimport { FunctionGroup } from \"@/model/main/functionGroup\";\nimport { ProcedureGroup } from \"@/model/main/procedureGroup\";\nimport { TriggerGroup } from \"@/model/main/triggerGroup\";\n-import { ModelType } from \"@/common/constants\";\n+import { ConfigKey, ModelType } from \"@/common/constants\";\nimport { Util } from \"@/common/util\";\nimport mysqldump, { Options } from './mysql/main';\n+import { Global } from \"@/common/global\";\nexport class DumpService {\n@@ -22,12 +23,18 @@ export class DumpService {\n} else {\nconst tableList = await new TableGroup(node).getChildren();\nconst viewList = await new ViewGroup(node).getChildren();\n- const procedureList = await new ProcedureGroup(node).getChildren();\n- const functionList = await new FunctionGroup(node).getChildren();\n- const triggerList = await new TriggerGroup(node).getChildren();\n- const childrenList = [...tableList, ...viewList, ...procedureList, ...functionList, ...triggerList]\n- .filter(item => item.contextValue != ModelType.INFO && item.contextValue != ModelType.SYSTEM_VIEW_GROUP)\n- const pickItems = childrenList.map(node => { return { label: node.label, description: node.contextValue, picked: true }; });\n+ let childrenList = [...tableList, ...viewList]\n+ if(Global.getConfig(\"showProcedure\")){\n+ childrenList.push(...(await new ProcedureGroup(node).getChildren()))\n+ }\n+ if(Global.getConfig(\"showFunction\")){\n+ childrenList.push(...(await new FunctionGroup(node).getChildren()))\n+ }\n+ if(Global.getConfig(\"showTrigger\")){\n+ childrenList.push(...(await new TriggerGroup(node).getChildren()))\n+ }\n+ const pickItems = childrenList.filter(item => item.contextValue != ModelType.INFO)\n+ .map(node => { return { label: node.label, description: node.contextValue, picked: true }; });\nnodes = await vscode.window.showQuickPick(pickItems, { canPickMany: true, matchOnDescription: true, ignoreFocusOut: true })\nif (!nodes) {\nreturn;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getDataDump.ts",
"new_path": "src/service/dump/mysql/getDataDump.ts",
"diff": "@@ -130,10 +130,9 @@ async function getDataDump(node: Node, sessionId: string, options: Required<Data\nresolve(null);\n});\n- query.on(\n- 'error',\n- /* istanbul ignore next */ err => reject(err),\n- );\n+ query.on('error', err => {\n+ reject(err)\n+ });\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getFunctionDump.ts",
"new_path": "src/service/dump/mysql/getFunctionDump.ts",
"diff": "@@ -22,11 +22,9 @@ async function getFunctionDump(node: Node, sessionId: string, options: Required<\nif (functions.length == 0) {\nreturn \"\";\n}\n- const getSchemaMultiQuery = functions.map(fun => {\n- return node.dialect.showFunctionSource(node.schema, fun)\n- }).join(\"\")\n- const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateFunction[][];\n- const output = result.map(r => {\n+ const output = functions.map(async fun => {\n+ try {\n+ const r = await node.execute(node.dialect.showFunctionSource(node.schema, fun), sessionId)\nconst res = r[0]\nlet sql = `${res['Create Function']}`;\nif (!options || !options.definer) {\n@@ -36,9 +34,12 @@ async function getFunctionDump(node: Node, sessionId: string, options: Required<\nsql = `DROP Function IF EXISTS ${res.Function};\\n${sql}`;\n}\nreturn `${sql};`;\n+ } catch (error) {\n+ return false\n+ }\n});\n- return output.join(\"\\n\\n\");\n+ return (await Promise.all(output)).filter(s => s).join(\"\\n\\n\");\n}\nexport { ShowFunctions, ShowCreateFunction, getFunctionDump };\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getProcedureDump.ts",
"new_path": "src/service/dump/mysql/getProcedureDump.ts",
"diff": "@@ -22,11 +22,9 @@ async function getProcedureDump(node: Node, sessionId: string, options: Required\nif (procedures.length == 0) {\nreturn \"\";\n}\n- const getSchemaMultiQuery = procedures.map(proc => {\n- return node.dialect.showProcedureSource(node.schema, proc)\n- }).join(\"\")\n- const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateProcedure[][];\n- const output = result.map(r => {\n+ const output = procedures.map(async procedure => {\n+ try {\n+ const r = await node.execute(node.dialect.showProcedureSource(node.schema, procedure), sessionId)\nconst res = r[0]\nlet sql = `${res['Create Procedure']}`;\nif (!options || !options.definer) {\n@@ -36,9 +34,12 @@ async function getProcedureDump(node: Node, sessionId: string, options: Required\nsql = `DROP PROCEDURE IF EXISTS ${res.Procedure};\\n${sql}`;\n}\nreturn `${sql};`;\n+ } catch (error) {\n+ return false;\n+ }\n});\n- return output.join(\"\\n\\n\");\n+ return (await Promise.all(output)).filter(s => s).join(\"\\n\\n\");\n}\nexport { ShowProcedures, ShowCreateProcedure, getProcedureDump };\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getTriggerDump.ts",
"new_path": "src/service/dump/mysql/getTriggerDump.ts",
"diff": "@@ -27,21 +27,14 @@ async function getTriggerDump(node: Node, sessionId: string, options: Required<T\nif (triggers.length === 0) {\nreturn \"\";\n}\n-\n- // we create a multi query here so we can query all at once rather than in individual connections\n- const getSchemaMultiQuery = triggers.map(trigger => {\n- return node.dialect.showTriggerSource(node.schema, trigger)\n- }).join(\"\")\n-\n- const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateTrigger[][];\n- const output=result.map(r => {\n+ const output = triggers.map(async trigger => {\n+ try {\n+ const r = await node.execute(node.dialect.showTriggerSource(node.schema, trigger), sessionId)\nconst res = r[0]\n- // clean up the generated SQL\nlet sql = `${res['SQL Original Statement']}`;\nif (!options.definer) {\nsql = sql.replace(/CREATE DEFINER=.+?@.+? /, 'CREATE ');\n}\n- // drop trigger statement should go outside the delimiter mods\nif (options.dropIfExist) {\nif (node.dbType == DatabaseType.PG) {\nsql = `DROP TRIGGER IF EXISTS ${res.Trigger} ${sql.match(/ON \\S+/)[0]};\\n${sql}`;\n@@ -50,9 +43,12 @@ async function getTriggerDump(node: Node, sessionId: string, options: Required<T\n}\n}\nreturn `${sql};`;\n+ } catch (error) {\n+ return false;\n+ }\n});\n- return output.join(\"\\n\\n\");\n+ return (await Promise.all(output)).filter(s => s).join(\"\\n\\n\");\n}\nexport { ShowTriggers, ShowCreateTrigger, getTriggerDump };\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getViewDump.ts",
"new_path": "src/service/dump/mysql/getViewDump.ts",
"diff": "@@ -14,11 +14,9 @@ export async function getViewDump(node: Node, sessionId: string, options: Requir\nif (views.length == 0) {\nreturn \"\";\n}\n- const getSchemaMultiQuery = views.map(view => {\n- return node.dialect.showViewSource(node.schema, view)\n- }).join(\"\")\n- const result = await node.multiExecute(getSchemaMultiQuery, sessionId) as ShowCreateView[][];\n- const createStatements = result.map((r, i) => {\n+ const output = views.map(async (view) => {\n+ try {\n+ const r = await node.execute(node.dialect.showViewSource(node.schema, view), sessionId)\nconst res = r[0]\nlet schema = res['Create View']\nif (!options.engine) {\n@@ -46,7 +44,10 @@ export async function getViewDump(node: Node, sessionId: string, options: Requir\n);\n}\nreturn `${schema};`;\n+ } catch (error) {\n+ return false;\n+ }\n});\n- return createStatements.join(\"\\n\\n\");\n+ return (await Promise.all(output)).filter(s => s).join(\"\\n\\n\");\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix dump fail.
|
141,908
|
29.01.2021 16:55:13
| -28,800
|
8f3360f27c09555f71bc23811260dfb325c4b8ab
|
Support hide user.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"default\": false,\n\"description\": \"Disable Sql Code lens.\"\n},\n+ \"database-client.showUser\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show user on tree view.\"\n+ },\n\"database-client.showDiagram\": {\n\"type\": \"boolean\",\n\"default\": false,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "+import { Global } from \"@/common/global\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\nimport { Constants, DatabaseType, ModelType } from \"../../common/constants\";\n@@ -72,7 +73,9 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn new SchemaNode(database.schema || database.Database, this);\n});\n+ if(Global.getConfig(\"showUser\")){\ndatabaseNodes.unshift(new UserGroup(\"USER\", this));\n+ }\nDatabaseCache.setDataBaseListOfConnection(this.uid, databaseNodes);\nreturn databaseNodes;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support hide user.
|
141,908
|
29.01.2021 17:24:34
| -28,800
|
11a313ba81a17f41a40555ed90bdaf97a1df673b
|
Split result only when run from editor.
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -248,7 +248,7 @@ export function activate(context: vscode.ExtensionContext) {\ntableNode.openTable();\n},\n\"mysql.codeLens.run\": (sql: string) => {\n- QueryUnit.runQuery(sql,ConnectionManager.getLastConnectionOption())\n+ QueryUnit.runQuery(sql,ConnectionManager.getLastConnectionOption(),{split:true})\n},\n\"mysql.table.design\": (tableNode: TableNode) => {\ntableNode.designTable();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -37,10 +37,11 @@ export class QueryUnit {\nprivate static importPattern = /^\\s*\\bsource\\b\\s+(.+)/i;\nprotected static delimiterHodler = new DelimiterHolder()\n- public static async runQuery(sql: string, connectionNode: Node, queryOption?: QueryOption): Promise<null> {\n+ public static async runQuery(sql: string, connectionNode: Node, queryOption: QueryOption = {}): Promise<null> {\nTrans.begin()\nconnectionNode = NodeUtil.of(connectionNode)\n+ if (!queryOption.split) queryOption.split = sql == null;\nlet fromEditor = false;\nif (!sql) {\n@@ -203,4 +204,5 @@ export interface QueryResult<T> {\nexport interface QueryOption {\nviewId?: any;\n+ split?: boolean;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/result/query.ts",
"new_path": "src/service/result/query.ts",
"diff": "@@ -36,7 +36,7 @@ export class QueryPage {\nViewManager.createWebviewPanel({\nsinglePage: true,\n- splitView: this.isActiveSql(),\n+ splitView: this.isActiveSql(queryParam.queryOption),\npath: 'result', title: 'Query', type,\niconPath: Global.getExtPath(\"resources\", \"icon\", \"query.svg\"),\neventHandler: async (handler) => {\n@@ -136,9 +136,9 @@ export class QueryPage {\n}\n}\n- private static isActiveSql(): boolean {\n+ private static isActiveSql(option: QueryOption): boolean {\n- if (!window.activeTextEditor || !window.activeTextEditor.document) { return false; }\n+ if (!window.activeTextEditor || !window.activeTextEditor.document || option.split === false) { return false; }\nconst extName = extname(window.activeTextEditor.document.fileName)?.toLowerCase()\nconst fileName = basename(window.activeTextEditor.document.fileName)?.toLowerCase()\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Split result only when run from editor.
|
141,908
|
01.02.2021 09:53:32
| -28,800
|
9f5ebb482d35f0e868197557bbc46cf381f0e58b
|
Adapter scroll bar.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -92,6 +92,7 @@ export default {\n},\ndata() {\nreturn {\n+ remainHeight:0,\nconnection: {},\nresult: {\ndata: [],\n@@ -137,6 +138,10 @@ export default {\n};\n},\nmounted() {\n+ this.remainHeight=window.innerHeight-120;\n+ window.addEventListener(\"resize\",()=>{\n+ this.remainHeight=window.innerHeight-120;\n+ })\nconst handlerData = (data, sameTable) => {\nthis.result = data;\nthis.toolbar.sql = data.sql;\n@@ -539,10 +544,7 @@ export default {\nif (this.result.data == undefined || this.result.data[0] == undefined)\nreturn 0;\nreturn Object.keys(this.result.data[0]).length;\n- },\n- remainHeight() {\n- return window.outerHeight - 230;\n- },\n+ }\n},\n};\n</script>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adapter scroll bar.
|
141,908
|
01.02.2021 14:01:15
| -28,800
|
c45a40e4b7d625e19e5ccbd8b730c9e9e866c0c7
|
Change full button position.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-input type=\"textarea\" :autosize=\"{ minRows:2, maxRows:5}\" v-model=\"toolbar.sql\" class=\"sql-pannel\" />\n</div>\n<div class=\"toolbar\">\n+ <el-button v-if=\"showFullBtn\" @click=\"full\" type=\"primary\" title=\"Full Result View\" icon=\"el-icon-rank\" size=\"mini\" circle>\n+ </el-button>\n<el-button type=\"primary\" size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n<el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" :clearable=\"true\" />\n- <el-button @click=\"full\" type=\"primary\" title=\"Full Result View\" icon=\"el-icon-rank\" size=\"mini\" circle>\n- </el-button>\n<el-button @click=\"$refs.editor.openInsert()\" :disabled=\"result.tableCount!=1\" type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle>\n</el-button>\n<el-button @click=\"$refs.editor.openEdit(update.current)\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!toolbar.show\">\n@@ -92,6 +92,7 @@ export default {\n},\ndata() {\nreturn {\n+ showFullBtn: false,\nremainHeight: 0,\nconnection: {},\nresult: {\n@@ -139,9 +140,11 @@ export default {\n},\nmounted() {\nthis.remainHeight = window.innerHeight - 120;\n+ this.showFullBtn = window.outerWidth / window.innerWidth >= 2;\nwindow.addEventListener(\"resize\", () => {\nthis.remainHeight = window.innerHeight - 120;\n- })\n+ this.showFullBtn = window.outerWidth / window.innerWidth >= 2;\n+ });\nconst handlerData = (data, sameTable) => {\nthis.result = data;\nthis.toolbar.sql = data.sql;\n@@ -224,7 +227,7 @@ export default {\n},\nmethods: {\nfull() {\n- vscodeEvent.emit(\"full\")\n+ vscodeEvent.emit(\"full\");\n},\nopenCoffee() {\nvscodeEvent.emit(\"openCoffee\");\n@@ -247,7 +250,7 @@ export default {\n{\nlabel: `Copy`,\nonClick: () => {\n- vscodeEvent.emit(\"copy\",value)\n+ vscodeEvent.emit(\"copy\", value);\n},\n},\n{\n@@ -544,7 +547,7 @@ export default {\nif (this.result.data == undefined || this.result.data[0] == undefined)\nreturn 0;\nreturn Object.keys(this.result.data[0]).length;\n- }\n+ },\n},\n};\n</script>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Change full button position.
|
141,908
|
02.02.2021 09:07:13
| -28,800
|
fe7af9e0476f01f9597c6984d0d25e2f06a1b122
|
Support show error.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/es/esUtil.ts",
"new_path": "src/model/es/esUtil.ts",
"diff": "@@ -14,7 +14,7 @@ export class EsUtil {\nreturn;\n}\nif (parse) {\n- QueryUnit.runQuery(`${em.Method.Text} ${em.Path.Text}\\n${em.Body.Text}`,node)\n+ QueryUnit.runQuery(`${em.Method.Text} ${em.Path.Text}\\n${em.Body.Text}`, node, { split: true })\nreturn;\n}\n(await node.getConnection()).query(`${em.Method.Text} ${em.Path.Text}\\n${em.Body.Text}`, 'dontParse', async (err, data) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/esConnection.ts",
"new_path": "src/service/connect/esConnection.ts",
"diff": "@@ -48,6 +48,11 @@ export class EsConnection extends IConnection {\ncallback(null, data)\n}\n}).catch(err => {\n+ const reason = err?.response?.data?.error?.reason;\n+ if (reason) {\n+ callback(new Error(reason))\n+ return;\n+ }\nconsole.log(err)\ncallback(err)\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -41,7 +41,7 @@ export class QueryUnit {\nTrans.begin()\nconnectionNode = NodeUtil.of(connectionNode)\n- if (!queryOption.split) queryOption.split = sql == null;\n+ if (queryOption.split==null) queryOption.split = sql == null;\nlet fromEditor = false;\nif (!sql) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show error.
|
141,908
|
02.02.2021 15:21:50
| -28,800
|
0faaea1383eb182da20bd02fafb046a3d618d76c
|
Support hide view node.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# 3.4.5\n-- Result view update: adapt scroll bar when height change, move full button position.\n+- Adapt result view scroll bar when height change..\n+- Move result view full button position.\n- Split result only when run from editor.\n-- Support hide user node from tree ui.\n+- Support hide userNode, viewNode from tree ui.\n+- Fix elasticSearch query error not showed.\n# 3.4.4 2020-1-29\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"default\": false,\n\"description\": \"Show diagram on tree view.\"\n},\n+ \"database-client.showView\": {\n+ \"type\": \"boolean\",\n+ \"default\": false,\n+ \"description\": \"Show view on tree view.\"\n+ },\n\"database-client.showQuery\": {\n\"type\": \"boolean\",\n\"default\": false,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -37,7 +37,11 @@ export class SchemaNode extends Node implements CopyAble {\npublic getChildren(): Promise<Node[]> | Node[] {\n- let childs: Node[] = [new TableGroup(this), new ViewGroup(this)];\n+ let childs: Node[] = [new TableGroup(this)];\n+\n+ if (Global.getConfig('showView')) {\n+ childs.push(new ViewGroup(this))\n+ }\nif (Global.getConfig('showQuery')) {\nchilds.push(new QueryGroup(this))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/dumpService.ts",
"new_path": "src/service/dump/dumpService.ts",
"diff": "@@ -22,8 +22,10 @@ export class DumpService {\nnodes = [{ label: node.table, description: node.contextValue }]\n} else {\nconst tableList = await new TableGroup(node).getChildren();\n- const viewList = await new ViewGroup(node).getChildren();\n- let childrenList = [...tableList, ...viewList]\n+ let childrenList = [...tableList]\n+ if(Global.getConfig(\"showView\")){\n+ childrenList.push(...(await new ViewGroup(node).getChildren()))\n+ }\nif(Global.getConfig(\"showProcedure\")){\nchildrenList.push(...(await new ProcedureGroup(node).getChildren()))\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support hide view node.
|
141,908
|
02.02.2021 16:36:23
| -28,800
|
e6fa289d9d7b2b971fb8461c4ba71bd90cdf4907
|
Support show rows with mysql, mssql.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -67,7 +67,7 @@ export enum ModelType {\n/**\n* database\n*/\n- CONNECTION = \"connection\", DATABASE = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\n+ CONNECTION = \"connection\", SCHEMA = \"schema\", USER_GROUP = \"userGroup\", USER = \"user\",\nTABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\nVIEW = \"view\", VIEW_GROUP = \"viewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\nPROCEDURE_GROUP = \"procedureGroup\", PROCEDURE = \"procedure\", FUNCTION_GROUP = \"functionGroup\", FUNCTION = \"function\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -22,7 +22,7 @@ import { QueryGroup } from \"../query/queryGroup\";\nexport class SchemaNode extends Node implements CopyAble {\n- public contextValue: string = ModelType.DATABASE;\n+ public contextValue: string = ModelType.SCHEMA;\npublic iconPath: string = path.join(Constants.RES_PATH, \"icon/database.svg\");\nconstructor(public schema: string, readonly parent: Node) {\nsuper(schema)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -123,7 +123,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nif (this.uid) return;\nif (this.contextValue == ModelType.CONNECTION) {\nthis.uid = this.getConnectId();\n- } else if (this.contextValue == ModelType.DATABASE) {\n+ } else if (this.contextValue == ModelType.SCHEMA) {\nthis.uid = `${this.getConnectId({ withDbForce: true })}`;\n} else {\nthis.uid = `${this.getConnectId({ withDbForce: true })}#${this.label}`;\n@@ -167,7 +167,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic cacheSelf() {\nif (this.contextValue == ModelType.CONNECTION || this.contextValue == ModelType.ES_CONNECTION) {\nNode.nodeCache[`${this.getConnectId()}`] = this;\n- } else if (this.contextValue == ModelType.DATABASE) {\n+ } else if (this.contextValue == ModelType.SCHEMA) {\nNode.nodeCache[`${this.getConnectId({ withDbForce: true })}`] = this;\n} else {\nNode.nodeCache[`${this.uid}`] = this;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -24,7 +24,7 @@ export class TableNode extends Node implements CopyAble {\nconstructor(meta: TableMeta, readonly parent: Node) {\nsuper(`${meta.name}`)\nthis.table = meta.name\n- this.description = `${meta.comment} ${meta.rows}`\n+ this.description = `${meta.comment||''} ${(meta.rows && meta.rows!='0')?`Rows ${meta.rows}`:''}`\nthis.init(parent)\nthis.cacheSelf()\nthis.command = {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -119,7 +119,15 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\nreturn `SELECT count(*) count FROM ${database}.${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT TABLE_NAME 'name' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA='${database}'`\n+ return `SELECT\n+ TABLE_NAME 'name',ds.row_count rows\n+ FROM\n+ INFORMATION_SCHEMA.TABLES t\n+ join sys.dm_db_partition_stats ds on ds.object_id = object_id(concat(t.TABLE_SCHEMA, '.', t.TABLE_NAME))\n+ and ds.index_id IN (0, 1)\n+ WHERE\n+ TABLE_TYPE = 'BASE TABLE'\n+ AND TABLE_SCHEMA = '${database}'`\n}\nshowSchemas(): string {\nreturn \"SELECT SCHEMA_NAME [schema] FROM INFORMATION_SCHEMA.SCHEMATA\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -89,7 +89,7 @@ export class MockRunner {\nconst success = await QueryUnit.runBatch(connection, sqlList)\nvscode.commands.executeCommand(\"mysql.table.find\", tableNode, true)\n- QueryPage.send({ connection: tableNode, type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n+ QueryPage.send({ queryOption: { split: true }, connection: tableNode, type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n}\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show rows with mysql, mssql.
|
141,908
|
02.02.2021 17:18:34
| -28,800
|
d8f464eec6f00193c3c13d7da4f9f278cbb1b74f
|
Integrate rows as node tooltip.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "- Move result view full button position.\n- Split result only when run from editor.\n- Support hide userNode, viewNode from tree ui.\n-- Fix elasticSearch query error not showed.\n+- Fix elasticSearch query error message not showed.\n+- Integrate overview as table node tooltip.\n# 3.4.4 2020-1-29\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"category\": \"MySQL\"\n},\n- {\n- \"command\": \"mysql.db.overview\",\n- \"title\": \"%command.db.overview%\",\n- \"category\": \"MySQL\"\n- },\n{\n\"command\": \"mysql.db.drop\",\n\"title\": \"%command.db.drop%\",\n\"title\": \"%command.view.source%\",\n\"category\": \"MySQL\"\n},\n- {\n- \"command\": \"mysql.count.sql\",\n- \"title\": \"%command.count.sql%\",\n- \"category\": \"MySQL\"\n- },\n{\n\"command\": \"mysql.table.show\",\n\"title\": \"%command.table.show%\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == database\",\n\"group\": \"3_mysql@0\"\n},\n- {\n- \"command\": \"mysql.db.overview\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == database\",\n- \"group\": \"3_mysql@2\"\n- },\n{\n\"command\": \"mysql.db.truncate\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == database\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(table|view)$/\",\n\"group\": \"1_inline@2\"\n},\n- {\n- \"command\": \"mysql.count.sql\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(table|view|esIndex)$/\",\n- \"group\": \"1_inline@4\"\n- },\n{\n\"command\": \"mysql.column.add\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == table\",\n"
},
{
"change_type": "MODIFY",
"old_path": "package.nls.json",
"new_path": "package.nls.json",
"diff": "\"command.server.info\": \"Server Status\",\n\"command.connection.delete\": \"Delete Connection\",\n\"command.database.add\": \"New Database\",\n- \"command.db.overview\": \"Overview\",\n\"command.db.drop\": \"Drop Database\",\n\"command.runQuery\": \"Run MySQL Query\",\n\"command.query.switch\": \"Open Query\",\n\"command.column.down\": \"Move Column Down\",\n\"command.table.source\": \"Show Table Source\",\n\"command.view.source\": \"Show View Source\",\n- \"command.count.sql\": \"Show Count\",\n\"command.table.show\": \"Open In New Panel\",\n\"command.column.update\": \"Modify Column\",\n\"command.column.drop\": \"Drop column\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -67,7 +67,7 @@ export enum ModelType {\n/**\n* database\n*/\n- CONNECTION = \"connection\", SCHEMA = \"schema\", USER_GROUP = \"userGroup\", USER = \"user\",\n+ CONNECTION = \"connection\", SCHEMA = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\nTABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\nVIEW = \"view\", VIEW_GROUP = \"viewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\nPROCEDURE_GROUP = \"procedureGroup\", PROCEDURE = \"procedure\", FUNCTION_GROUP = \"functionGroup\", FUNCTION = \"function\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/typeDef.ts",
"new_path": "src/common/typeDef.ts",
"diff": "@@ -100,4 +100,17 @@ export interface TableMeta{\nname:string;\ncomment:string;\nrows:string;\n+ /**\n+ * below mysql only\n+ */\n+ auto_increment?:string;\n+ row_format?:string;\n+ /**\n+ * clustered bytes * pagesize\n+ */\n+ data_length?:string;\n+ /**\n+ * clustered bytes * pagesize\n+ */\n+ index_length?:string;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -133,10 +133,7 @@ export function activate(context: vscode.ExtensionContext) {\n},\n\"mysql.db.drop\": (databaseNode: SchemaNode) => {\ndatabaseNode.dropDatatabase();\n- },\n- \"mysql.db.overview\": (databaseNode: SchemaNode) => {\n- databaseNode.openOverview();\n- },\n+ }\n},\n// mock\n...{\n@@ -194,10 +191,7 @@ export function activate(context: vscode.ExtensionContext) {\n},\n\"mysql.query.rename\": (queryNode: QueryNode) => {\nqueryNode.rename()\n- },\n- \"mysql.count.sql\": (tableNode: TableNode) => {\n- tableNode.countSql()\n- },\n+ }\n},\n// redis\n...{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -62,10 +62,6 @@ export class SchemaNode extends Node implements CopyAble {\nreturn childs;\n}\n- public openOverview() {\n- ServiceManager.instance.overviewService.openOverview(this)\n- }\n-\npublic dropDatatabase() {\nvscode.window.showInputBox({ prompt: `Are you want to drop database ${this.schema} ? `, placeHolder: 'Input database name to confirm.' }).then(async (inputContent) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/es/model/esIndexNode.ts",
"new_path": "src/model/es/model/esIndexNode.ts",
"diff": "@@ -21,7 +21,7 @@ export class ESIndexNode extends EsBaseNode {\nconst [health, status, index, uuid, pri, rep, docsCount, docsDeleted, storeSize, priStoreSize] = info.split(/\\s+/)\nthis.label = index\nthis.cacheSelf()\n- this.description = storeSize\n+ this.description = `${storeSize} Docs ${docsCount}`\nthis.command = {\ncommand: \"mysql.show.esIndex\",\ntitle: \"Show ES Index Data\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -14,6 +14,7 @@ import { Node } from \"../interface/node\";\nimport { ColumnMeta, TableMeta } from \"@/common/typeDef\";\nimport { ColumnNode } from \"../other/columnNode\";\nimport { InfoNode } from \"../other/infoNode\";\n+const prettyBytes = require(\"pretty-bytes\")\nexport class TableNode extends Node implements CopyAble {\n@@ -26,6 +27,7 @@ export class TableNode extends Node implements CopyAble {\nthis.table = meta.name\nthis.description = `${meta.comment || ''} ${(meta.rows && meta.rows != '0') ? `Rows ${meta.rows}` : ''}`\nthis.init(parent)\n+ this.tooltip = this.getToolTipe(meta)\nthis.cacheSelf()\nthis.command = {\ncommand: \"mysql.table.find\",\n@@ -125,7 +127,7 @@ export class TableNode extends Node implements CopyAble {\nViewManager.createWebviewPanel({\npath: \"app\", title: \"Design Table(Preview)\",\n- splitView: false, iconPath: Global.getExtPath(\"resources\", \"icon\", \"add.svg\"),\n+ splitView: false, iconPath: Global.getExtPath(\"resources\", \"icon\", \"overview.svg\"),\neventHandler: (handler => {\nhandler.on(\"init\", () => {\nhandler.emit('route', 'design')\n@@ -174,10 +176,6 @@ export class TableNode extends Node implements CopyAble {\nConnectionManager.changeActive(this)\n}\n- public async countSql() {\n- QueryUnit.runQuery(this.dialect.countSql(this.wrap(this.schema), this.wrap(this.table)), this);\n- }\n-\npublic async openTable() {\nconst pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\nconst sql = this.dialect.buildPageSql(this.wrap(this.schema), this.wrap(this.table), pageSize);\n@@ -185,6 +183,18 @@ export class TableNode extends Node implements CopyAble {\nConnectionManager.changeActive(this)\n}\n+ public getToolTipe(meta: TableMeta): string {\n+ if (this.dbType == DatabaseType.MYSQL && meta.data_length) {\n+ return `AUTO_INCREMENT : ${meta.auto_increment}\n+DATA_LENGTH : ${prettyBytes(parseInt(meta.data_length))}\n+INDEX_LENGTH : ${prettyBytes(parseInt(meta.index_length))}\n+ROW_FORMAT : ${meta.row_format}\n+`\n+ }\n+\n+ return ''\n+ }\n+\npublic insertSqlTemplate(show: boolean = true): Promise<string> {\nreturn new Promise((resolve) => {\nthis\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -106,7 +106,7 @@ export class MysqlDialect extends SqlDialect {\nreturn `SELECT count(*) FROM ${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT table_comment comment,TABLE_NAME as name,TABLE_ROWS rows FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name;`\n+ return `SELECT table_comment comment,TABLE_NAME as name,TABLE_ROWS rows,auto_increment,row_format,data_length,index_length FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name;`\n}\nshowSchemas(): string {\nreturn \"show databases\"\n"
},
{
"change_type": "DELETE",
"old_path": "src/service/overview/overviewService.ts",
"new_path": null,
"diff": "-import { NodeUtil } from \"@/model/nodeUtil\";\n-import { Global } from \"../../common/global\";\n-import { Node } from \"../../model/interface/node\";\n-import { ViewManager } from \"../../common/viewManager\";\n-\n-export class OverviewService {\n-\n- public openOverview(node: Node) {\n- const trimNode=NodeUtil.removeParent(node);\n- ViewManager.createWebviewPanel({\n- path: \"app\", splitView: false, title: \"overview\", singlePage: true,\n- iconPath: Global.getExtPath(\"resources\", \"icon\", \"overview.svg\"),\n- eventHandler: async (handler) => {\n- handler.on(\"init\", () => {\n- handler.emit(\"route\", 'overview')\n- }).on(\"route-overview\", async () => {\n- handler.emit(\"overview-data\", {\n- ...trimNode,\n- infos: await node.execute(`select table_name, table_comment, auto_increment, create_time, update_time, engine, table_rows, data_length, index_length, table_collation, row_format from information_schema.TABLES where TABLE_SCHEMA = '${node.schema}' and table_type = 'BASE TABLE'`)\n- })\n- })\n- }\n- })\n- }\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "@@ -9,7 +9,6 @@ import { SqlFormattingProvider } from \"../provider/sqlFormattingProvider\";\nimport { TableInfoHoverProvider } from \"../provider/tableInfoHoverProvider\";\nimport { DbTreeDataProvider as DbTreeDataProvider } from \"../provider/treeDataProvider\";\nimport { ConnectService } from \"./connect/connectService\";\n-import { OverviewService } from \"./overview/overviewService\";\nimport { MysqlStatusService } from \"./status/mysqlStatusService\";\nimport { StatusService } from \"./status/statusService\";\nimport { ViewManager } from \"../common/viewManager\";\n@@ -42,7 +41,6 @@ export class ServiceManager {\npublic provider: DbTreeDataProvider;\npublic nosqlProvider: DbTreeDataProvider;\npublic settingService: SettingService;\n- public overviewService: OverviewService;\npublic statusService: StatusService;\npublic dumpService: DumpService;\nprivate isInit = false;\n@@ -104,7 +102,6 @@ export class ServiceManager {\nprivate initMysqlService() {\nthis.settingService = new MysqlSettingService();\n- this.overviewService = new OverviewService();\nthis.dumpService = new DumpService();\nthis.statusService = new MysqlStatusService()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/main.js",
"new_path": "src/vue/main.js",
"diff": "@@ -20,7 +20,6 @@ import Gojs from \"./diagram/Gojs\";\nimport Selector from \"./diagram/Selector\";\nimport connect from \"./connect\";\nimport status from \"./status\";\n-import overview from \"./overview\";\nimport design from \"./design\";\nimport structDiff from \"./structDiff\";\nimport keyView from \"./redis/keyView\";\n@@ -34,7 +33,6 @@ const router = new VueRouter({\n{ path: '/status', component: status, name: 'status' },\n{ path: '/diagram', component: Gojs, name: 'diagram' },\n{ path: '/selector', component: Selector, name: 'selector' },\n- { path: '/overview', component: overview, name: 'overview' },\n{ path: '/design', component: design, name: 'design' },\n{ path: '/structDiff', component: structDiff, name: 'structDiff' },\n// redis\n"
},
{
"change_type": "DELETE",
"old_path": "src/vue/overview/index.vue",
"new_path": null,
"diff": "-<template>\n- <div>\n- <el-button type=\"primary\" @click=\"refresh\">refresh</el-button>\n- <el-table :data=\"tableData\" stripe style=\"width: 100%\" :height=\"remainHeight\">\n- <el-table-column align=\"center\" prop=\"table_name\" label=\"table_name\" ></el-table-column>\n- <el-table-column align=\"center\" prop=\"table_comment\" label=\"table_comment\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"auto_increment\" label=\"auto_increment\" ></el-table-column>\n- <el-table-column align=\"center\" prop=\"create_time\" label=\"create_time\" width=\"180\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"update_time\" label=\"update_time\" width=\"180\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"engine\" label=\"engine\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"table_rows\" label=\"table_rows\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"data_length\" label=\"data_length\">\n- <template slot-scope=\"scope\">\n- <span>{{prettyBytes(Number(scope.row.data_length))}}</span>\n- </template>\n- </el-table-column>\n- <el-table-column align=\"center\" prop=\"index_length\" label=\"index_length\">\n- <template slot-scope=\"scope\">\n- <span>{{prettyBytes(Number(scope.row.index_length))}}</span>\n- </template>\n- </el-table-column>\n- <el-table-column align=\"center\" prop=\"table_collation\" label=\"table_collation\" width=\"200\"></el-table-column>\n- <el-table-column align=\"center\" prop=\"row_format\" label=\"row_format\"></el-table-column>\n- </el-table>\n- </div>\n-</template>\n-\n-<script>\n-import { getVscodeEvent } from \"../util/vscode\";\n-const prettyBytes = require(\"pretty-bytes\");\n-const vscodeEvent = getVscodeEvent();\n-\n-export default {\n- data() {\n- return {\n- tableData: []\n- };\n- },\n- destroyed() {\n- vscodeEvent.destroy();\n- },\n- mounted() {\n- vscodeEvent.on(\"overview-data\", data => {\n- console.log(data.infos);\n- this.tableData = data.infos;\n- });\n- vscodeEvent.emit(\"route-\" + this.$route.name);\n- },\n- methods: {\n- prettyBytes,\n- refresh() {\n- vscodeEvent.emit(\"route-\" + this.$route.name);\n- }\n- },\n- computed: {\n- remainHeight() {\n- return window.outerHeight -130;\n- }\n- }\n-};\n-</script>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Integrate rows as node tooltip.
|
141,908
|
02.02.2021 18:37:51
| -28,800
|
4c1cf20380cd79c8e4c0e399f2c0014eb83a84c8
|
Init postgresql import service.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/import/postgresqlImortService.ts",
"new_path": "src/service/import/postgresqlImortService.ts",
"diff": "+import { Console } from \"@/common/Console\";\n+import { Node } from \"@/model/interface/node\";\n+import { NodeUtil } from \"@/model/nodeUtil\";\n+import { exec } from \"child_process\";\nimport { ImportService } from \"./importService\";\n+var commandExistsSync = require('command-exists').sync;\nexport class PostgresqlImortService extends ImportService {\n+ public importSql(importPath: string, node: Node): void {\n+ if (commandExistsSync('pg_restore')) {\n+ NodeUtil.of(node)\n+ const host = node.usingSSH ? \"127.0.0.1\" : node.host\n+ const port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\n+ const command = `SET \"PGPASSWORD=${node.password}\" && pg_restore -h ${host} -p ${port} -U ${node.user} -d ${node.database} ${importPath}`\n+ Console.log(` Executing: \\`${command}`);\n+ exec(command, err => {\n+ if (err) {\n+ Console.log(err);\n+ } else {\n+ Console.log(`Import Success!`);\n+ }\n+ })\n+ } else {\n+ super.importSql(importPath, node)\n+ }\n+\n+ }\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init postgresql import service.
|
141,908
|
02.02.2021 22:56:32
| -28,800
|
f555c63a0c71ae55fcc52c0e1a802436be52dc58
|
Support import sql using psql.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/import/mysqlImportService.ts",
"new_path": "src/service/import/mysqlImportService.ts",
"diff": "@@ -14,10 +14,12 @@ export class MysqlImportService extends ImportService {\nconst host = node.usingSSH ? \"127.0.0.1\" : node.host\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\nconst command = `mysql -h ${host} -P ${port} -u ${node.user} ${node.password ? `-p${node.password}` : \"\"} ${node.schema || \"\"} < ${importPath}`\n- Console.log(` Executing: \\`${command.replace(/-p.+? /, \"-p****** \")}\\``);\n- exec(command, err => {\n+ Console.log(`Executing: ${command.replace(/-p.+? /, \"-p****** \")}`);\n+ exec(command, (err,stdout,stderr) => {\nif (err) {\nConsole.log(err);\n+ }else if(stderr){\n+ Console.log(stderr);\n} else {\nConsole.log(`Import Success!`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/import/postgresqlImortService.ts",
"new_path": "src/service/import/postgresqlImortService.ts",
"diff": "@@ -8,15 +8,17 @@ var commandExistsSync = require('command-exists').sync;\nexport class PostgresqlImortService extends ImportService {\npublic importSql(importPath: string, node: Node): void {\n- if (commandExistsSync('pg_restore')) {\n+ if (commandExistsSync('psql')) {\nNodeUtil.of(node)\nconst host = node.usingSSH ? \"127.0.0.1\" : node.host\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\n- const command = `SET \"PGPASSWORD=${node.password}\" && pg_restore -h ${host} -p ${port} -U ${node.user} -d ${node.database} ${importPath}`\n- Console.log(` Executing: \\`${command}`);\n- exec(command, err => {\n+ const command = `psql -h ${host} -p ${port} -U ${node.user} -d ${node.database} < ${importPath}`\n+ Console.log(`Executing: ${command}`);\n+ exec(`SET \"PGPASSWORD=${node.password}\" && ${command}`, (err,stdout,stderr) => {\nif (err) {\nConsole.log(err);\n+ }else if(stderr){\n+ Console.log(stderr);\n} else {\nConsole.log(`Import Success!`);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support import sql using psql.
|
141,908
|
02.02.2021 23:08:57
| -28,800
|
87776610bfe30c6a2b68d7a7d6ef75792d3d3fd9
|
Show pg status.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -18,10 +18,67 @@ export class PostgreSqlDialect extends SqlDialect {\nreturn 'SHOW ALL'\n}\nstatusList(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `SELECT\n+ 'db_numbackends' AS db,\n+ pg_stat_get_db_numbackends(datid) AS status\n+ FROM\n+ pg_stat_database\n+ WHERE\n+ datname = current_database()\n+ UNION ALL\n+ SELECT\n+ 'db_xact_commit',\n+ pg_stat_get_db_xact_commit(datid)\n+ FROM\n+ pg_stat_database\n+ WHERE\n+ datname = current_database()\n+ UNION ALL\n+ SELECT\n+ 'db_xact_rollback',\n+ pg_stat_get_db_xact_rollback(datid)\n+ FROM\n+ pg_stat_database\n+ WHERE\n+ datname = current_database()\n+ UNION ALL\n+ SELECT\n+ 'db_blocks_fetched',\n+ pg_stat_get_db_blocks_fetched(datid)\n+ FROM\n+ pg_stat_database\n+ WHERE\n+ datname = current_database()\n+ UNION ALL\n+ SELECT\n+ 'db_blocks_hit',\n+ pg_stat_get_db_blocks_hit(datid)\n+ FROM\n+ pg_stat_database\n+ WHERE\n+ datname = current_database()`\n}\nprocessList(): string {\n- return 'SELECT * from pg_stat_activity'\n+ return `SELECT\n+ a.pid AS \"Id\",\n+ a.usename AS \"User\",\n+ a.client_addr AS \"Host\",\n+ a.client_port AS \"Port\",\n+ datname AS \"db\",\n+ query AS \"Command\",\n+ l.mode AS \"State\",\n+ query_start AS \"Time\",\n+ CASE\n+ WHEN c.relname IS NOT NULL THEN 'Locked Object: ' || c.relname\n+ ELSE 'Locked Transaction: ' || l.virtualtransaction\n+ END AS \"Info\"\n+ FROM\n+ pg_stat_activity a\n+ LEFT JOIN pg_locks l ON a.pid = l.pid\n+ LEFT JOIN pg_class c ON l.relation = c.oid\n+ ORDER BY\n+ a.pid ASC,\n+ c.relname ASC`\n}\naddColumn(table: string): string {\nreturn `ALTER TABLE\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/status/abstractStatusService.ts",
"new_path": "src/service/status/abstractStatusService.ts",
"diff": "@@ -31,7 +31,7 @@ export abstract class AbstractStatusService implements StatusService {\nhandler.emit(\"variableList\", { fields, rows })\n})\n}).on(\"statusList\", async () => {\n- if (node.dbType != DatabaseType.MYSQL) return;\n+ if (node.dbType == DatabaseType.MSSQL) return;\nQueryUnit.queryPromise<any>(await ConnectionManager.getConnection(node), node.dialect.statusList()).then(({ rows, fields }) => {\nhandler.emit(\"statusList\", { fields, rows })\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/status/index.vue",
"new_path": "src/vue/status/index.vue",
"diff": "<ux-table-column :field=\"field.name\" :title=\"field.name\" v-for=\"(field,index) in variableList.fields\" :key=\"index\" align=\"center\" show-overflow-tooltip=\"true\" />\n</ux-grid>\n</el-tab-pane>\n- <el-tab-pane label=\"statusList\" name=\"statusList\" v-if=\"info.dbType=='MySQL'\">\n+ <el-tab-pane label=\"statusList\" name=\"statusList\" v-if=\"info.dbType!='SqlServer'\">\n<ux-grid :data=\"statusList.rows\" size='small' :cell-style=\"{height: '35px'}\" style=\"width: 100%\" :height=\"remainHeight()\">\n<ux-table-column :field=\"field.name\" :title=\"field.name\" v-for=\"(field,index) in statusList.fields\" :key=\"index\" align=\"center\" show-overflow-tooltip=\"true\" />\n</ux-grid>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Show pg status.
|
141,908
|
02.02.2021 23:58:30
| -28,800
|
fe8150044d08a68d81f8a91422cbca5586f9249f
|
Init database support.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -67,7 +67,7 @@ export enum ModelType {\n/**\n* database\n*/\n- CONNECTION = \"connection\", SCHEMA = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\n+ CONNECTION = \"connection\",CATALOG = \"catalog\", SCHEMA = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\nTABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\nVIEW = \"view\", VIEW_GROUP = \"viewGroup\", TRIGGER_GROUP = \"triggerGroup\", TRIGGER = \"trigger\",\nPROCEDURE_GROUP = \"procedureGroup\", PROCEDURE = \"procedure\", FUNCTION_GROUP = \"functionGroup\", FUNCTION = \"function\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "import * as vscode from \"vscode\";\nimport { CommandKey } from \"./common/constants\";\nimport { ConnectionNode } from \"./model/database/connectionNode\";\n-import { SchemaNode } from \"./model/database/databaseNode\";\n+import { SchemaNode } from \"./model/database/schemaNode\";\nimport { UserGroup } from \"./model/database/userGroup\";\nimport { CopyAble } from \"./model/interface/copyAble\";\nimport { FunctionNode } from \"./model/main/function\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/database/catalogNode.ts",
"diff": "+import * as path from \"path\";\n+import { Constants, ModelType } from \"../../common/constants\";\n+import { FileManager } from '../../common/filesManager';\n+import { Util } from '../../common/util';\n+import { ConnectionManager } from \"../../service/connectionManager\";\n+import { CopyAble } from \"../interface/copyAble\";\n+import { Node } from \"../interface/node\";\n+\n+export class CatalogNode extends Node implements CopyAble {\n+\n+\n+ public contextValue: string = ModelType.CATALOG;\n+ public iconPath: string = path.join(Constants.RES_PATH, \"icon/database.svg\");\n+ constructor(public database: string, readonly parent: Node) {\n+ super(database)\n+ this.init(this.parent)\n+ this.cacheSelf()\n+ const lcp = ConnectionManager.getLastConnectionOption(false);\n+ if (lcp && lcp.getConnectId() == this.getConnectId() && (lcp.database == this.database)) {\n+ this.iconPath = path.join(Constants.RES_PATH, \"icon/database-active.svg\");\n+ this.description = `Active`\n+ }\n+ }\n+\n+ public getChildren(): Promise<Node[]> | Node[] {\n+ return this.parent.getChildren.apply(this)\n+ }\n+\n+ public async newQuery() {\n+\n+ FileManager.show(`${this.uid}.sql`)\n+\n+ }\n+\n+ public copyName() {\n+ Util.copyToBoard(this.schema)\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -10,7 +10,8 @@ import { ConnectionManager } from \"../../service/connectionManager\";\nimport { CopyAble } from \"../interface/copyAble\";\nimport { CommandKey, Node } from \"../interface/node\";\nimport { InfoNode } from \"../other/infoNode\";\n-import { SchemaNode } from \"./databaseNode\";\n+import { CatalogNode } from \"./catalogNode\";\n+import { SchemaNode } from \"./schemaNode\";\nimport { UserGroup } from \"./userGroup\";\n/**\n@@ -55,12 +56,16 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn dbNodes.map(dbNode => {\nif (dbNode.contextValue == ModelType.USER_GROUP) {\nreturn new UserGroup(dbNode.label, this)\n+ }else if(dbNode.contextValue==ModelType.CATALOG){\n+ return new CatalogNode(dbNode.label,this)\n}\nreturn new SchemaNode(dbNode.label, this)\n});\n}\n- return this.execute<any[]>(this.dialect.showSchemas())\n+ const hasCatalog = this.dbType != DatabaseType.MYSQL && this.contextValue == ModelType.CONNECTION;\n+ const sql = hasCatalog ? this.dialect.showDatabases() : this.dialect.showSchemas();\n+ return this.execute<any[]>(sql)\n.then((databases) => {\nconst includeDatabaseArray = this.includeDatabases?.toLowerCase()?.split(\",\")\nconst usingInclude = this.includeDatabases && includeDatabaseArray && includeDatabaseArray.length >= 1;\n@@ -69,11 +74,13 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn includeDatabaseArray.indexOf((db.schema || db.Database).toLocaleLowerCase()) != -1;\n}\nreturn true;\n- }).map<SchemaNode>((database) => {\n- return new SchemaNode(database.schema || database.Database, this);\n+ }).map<SchemaNode | CatalogNode>((database) => {\n+ return hasCatalog ?\n+ new CatalogNode(database.db, this)\n+ : new SchemaNode(database.schema || database.Database, this);\n});\n- if(Global.getConfig(\"showUser\")){\n+ if (Global.getConfig(\"showUser\") && !hasCatalog) {\ndatabaseNodes.unshift(new UserGroup(\"USER\", this));\n}\nDatabaseCache.setDataBaseListOfConnection(this.uid, databaseNodes);\n"
},
{
"change_type": "RENAME",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/schemaNode.ts",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -4,7 +4,7 @@ import { Constants, ModelType } from \"../../common/constants\";\nimport { QueryUnit } from \"../../service/queryUnit\";\nimport { Node } from \"../interface/node\";\nimport { InfoNode } from \"../other/infoNode\";\n-import { SchemaNode } from \"./databaseNode\";\n+import { SchemaNode } from \"./schemaNode\";\nimport { UserNode } from \"./userNode\";\nexport class UserGroup extends SchemaNode {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -3,7 +3,7 @@ import { CacheKey, ConfigKey, DatabaseType } from \"../common/constants\";\nimport { ConnectionManager } from \"../service/connectionManager\";\nimport { DatabaseCache } from \"../service/common/databaseCache\";\nimport { ConnectionNode } from \"../model/database/connectionNode\";\n-import { SchemaNode } from \"../model/database/databaseNode\";\n+import { SchemaNode } from \"../model/database/schemaNode\";\nimport { CommandKey, Node } from \"../model/interface/node\";\nimport { UserGroup } from \"../model/database/userGroup\";\nimport { Global } from \"../common/global\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "+import { CatalogNode } from \"@/model/database/catalogNode\";\nimport { ExtensionContext, TreeItemCollapsibleState } from \"vscode\";\nimport { CacheKey, ModelType } from \"../../common/constants\";\n-import { SchemaNode } from \"../../model/database/databaseNode\";\n+import { SchemaNode } from \"../../model/database/schemaNode\";\nimport { Node } from \"../../model/interface/node\";\nexport class DatabaseCache {\n@@ -120,7 +121,7 @@ export class DatabaseCache {\nreturn databaseNodeList;\n}\n- public static setDataBaseListOfConnection(connectionid: string, DatabaseNodeList: SchemaNode[]) {\n+ public static setDataBaseListOfConnection(connectionid: string, DatabaseNodeList: Node[]) {\nthis.cache.database[connectionid] = DatabaseNodeList;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -129,6 +129,9 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\nTABLE_TYPE = 'BASE TABLE'\nAND TABLE_SCHEMA = '${database}'`\n}\n+ showDatabases(){\n+ return \"SELECT name 'db' FROM master.sys.databases\"\n+ }\nshowSchemas(): string {\nreturn \"SELECT SCHEMA_NAME [schema] FROM INFORMATION_SCHEMA.SCHEMATA\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -185,6 +185,9 @@ ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\nWHERE t.table_type='BASE TABLE'\nAND t.table_schema='${database}';`\n}\n+ showDatabases(){\n+ return `SELECT datname \"db\" FROM pg_database WHERE datistemplate = false;`\n+ }\nshowSchemas(): string {\nreturn `select catalog_name \"Database\",schema_name \"schema\" from information_schema.schemata;`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/diff/diffService.ts",
"new_path": "src/service/diff/diffService.ts",
"diff": "@@ -9,7 +9,7 @@ import { ViewManager } from \"@/common/viewManager\";\nimport { DatabaseCache } from \"../common/databaseCache\";\nimport { ConnectionManager } from \"../connectionManager\";\nimport { QueryUnit } from \"../queryUnit\";\n-import { SchemaNode } from \"@/model/database/databaseNode\";\n+import { SchemaNode } from \"@/model/database/schemaNode\";\nimport { UserGroup } from \"@/model/database/userGroup\";\nimport { TableGroup } from \"@/model/main/tableGroup\";\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init database support.
|
141,908
|
03.02.2021 10:41:13
| -28,800
|
31841a47953918d57b9e4fb0d294d8c3885948d1
|
Update design view.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -126,7 +126,7 @@ export class TableNode extends Node implements CopyAble {\n}\nViewManager.createWebviewPanel({\n- path: \"app\", title: \"Design Table(Preview)\",\n+ path: \"app\", title: \"Design Table\",\nsplitView: false, iconPath: Global.getExtPath(\"resources\", \"icon\", \"overview.svg\"),\neventHandler: (handler => {\nhandler.on(\"init\", () => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/ColumnPanel.vue",
"new_path": "src/vue/design/ColumnPanel.vue",
"diff": "<div class=\"design-toolbar\">\n<el-button @click=\"column.visible=true\" type=\"primary\" title=\"Insert\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle> </el-button>\n</div>\n- <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '25px'}\">\n+ <ux-grid :data=\"designData.editColumnList\" stripe style=\"width: 100%\" :cell-style=\"{height: '25px'}\" :height=\"remainHeight()\">\n<ux-table-column title=\"Operation\" width=\"120\">\n<template v-slot=\"{ row }\">\n<el-button @click=\"openEdit(row)\" title=\"edit\" size=\"mini\" icon=\"el-icon-edit\" circle> </el-button>\n@@ -120,6 +120,9 @@ export default {\n.init();\n},\nmethods: {\n+ remainHeight() {\n+ return window.outerHeight - 280;\n+ },\nupdateColumn() {\nthis.emit(\"updateColumn\", {\nnewColumnName: this.editColumn.name,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/design/InfoPanel.vue",
"new_path": "src/vue/design/InfoPanel.vue",
"diff": "<label class=\"font-bold mr-5 inline-block w-32\"><span class=\"text-red-600 mr-1\">*</span>Comment</label>\n<input class=\"w-64 field__input\" v-model=\"table.comment\" />\n</div>\n+ <el-button @click=\"rename\" type=\"success\">Update</el-button>\n</div>\n- <el-button @click=\"rename\">Update</el-button>\n</div>\n</template>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update design view.
|
141,908
|
03.02.2021 11:47:55
| -28,800
|
d37d13e1e4452d4f8e87dc032bd3d75beb8af0d0
|
Support show schema complection.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -50,7 +50,7 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let dbNodes = DatabaseCache.getDatabaseListOfConnection(this.uid);\n+ let dbNodes = DatabaseCache.getSchemaListOfConnection(this.uid);\nif (dbNodes && !isRresh) {\n// update active state.\nreturn dbNodes.map(dbNode => {\n@@ -83,7 +83,7 @@ export class ConnectionNode extends Node implements CopyAble {\nif (Global.getConfig(\"showUser\") && !hasCatalog) {\ndatabaseNodes.unshift(new UserGroup(\"USER\", this));\n}\n- DatabaseCache.setDataBaseListOfConnection(this.uid, databaseNodes);\n+ DatabaseCache.setSchemaListOfConnection(this.uid, databaseNodes);\nreturn databaseNodes;\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/diagram/diagramGroup.ts",
"new_path": "src/model/diagram/diagramGroup.ts",
"diff": "@@ -22,7 +22,7 @@ export class DiagramGroup extends Node {\n}\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- const path = `${FileManager.storagePath}/diagram/${this.getConnectId({ withDbForce: true })}`;\n+ const path = `${FileManager.storagePath}/diagram/${this.getConnectId({ withSchema: true })}`;\nconst diagrams = this.readdir(path)?.map(fileName => new DiagramNode(fileName.replace(/\\.[^/.]+$/, \"\"), this));\nif (!diagrams || diagrams.length == 0) {\nreturn [new InfoNode(\"This schema has no created diagram.\")]\n@@ -48,7 +48,7 @@ export class DiagramGroup extends Node {\n}).on(\"route-selector\", async () => {\nhandler.emit(\"selector-load\", await this.getTableInfos())\n}).on(\"save\", ({ name, data }) => {\n- const diagramPath = `diagram/${this.getConnectId({ withDbForce: true })}/${name}.json`;\n+ const diagramPath = `diagram/${this.getConnectId({ withSchema: true })}/${name}.json`;\nFileManager.record(diagramPath, data, FileModel.WRITE)\nDbTreeDataProvider.refresh(this)\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/diagram/diagramNode.ts",
"new_path": "src/model/diagram/diagramNode.ts",
"diff": "@@ -36,7 +36,7 @@ export class DiagramNode extends Node {\n}).on(\"save\", ({ name, data }) => {\nunlinkSync(this.getFilePath())\nthis.name = name\n- const diagramPath = `diagram/${this.getConnectId({withDbForce:true})}/${name}.json`;\n+ const diagramPath = `diagram/${this.getConnectId({withSchema:true})}/${name}.json`;\nFileManager.record(diagramPath, data, FileModel.WRITE)\nDbTreeDataProvider.refresh(this.parent)\n})\n@@ -46,7 +46,7 @@ export class DiagramNode extends Node {\nprivate getFilePath(): string {\n- return `${FileManager.storagePath}/diagram/${this.getConnectId({withDbForce:true})}/${this.name}.json`;\n+ return `${FileManager.storagePath}/diagram/${this.getConnectId({withSchema:true})}/${this.name}.json`;\n}\npublic async getChildren(): Promise<Node[]> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -15,7 +15,7 @@ import { SSHConfig } from \"./sshConfig\";\nexport interface SwitchOpt {\nisGlobal?: boolean;\n- withDbForce?: boolean;\n+ withSchema?: boolean;\n}\nexport abstract class Node extends vscode.TreeItem implements CopyAble {\n@@ -156,23 +156,23 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nif (this.contextValue == ModelType.CONNECTION || this.contextValue == ModelType.ES_CONNECTION) {\nNode.nodeCache[`${this.getConnectId()}`] = this;\n} else if (this.contextValue == ModelType.SCHEMA) {\n- Node.nodeCache[`${this.getConnectId({ withDbForce: true })}`] = this;\n+ Node.nodeCache[`${this.getConnectId({ withSchema: true })}`] = this;\n} else {\nNode.nodeCache[`${this.uid}`] = this;\n}\n}\npublic getCache() {\nif (this.schema) {\n- return Node.nodeCache[`${this.getConnectId({ withDbForce: true })}`]\n+ return Node.nodeCache[`${this.getConnectId({ withSchema: true })}`]\n}\nreturn Node.nodeCache[`${this.getConnectId()}`]\n}\npublic getByRegion<T extends Node>(region?: string): T {\nif (!region) {\n- return Node.nodeCache[`${this.getConnectId({ withDbForce: true })}`]\n+ return Node.nodeCache[`${this.getConnectId({ withSchema: true })}`]\n}\n- return Node.nodeCache[`${this.getConnectId({ withDbForce: true })}#${region}`]\n+ return Node.nodeCache[`${this.getConnectId({ withSchema: true })}#${region}`]\n}\npublic getChildren(isRresh?: boolean): Node[] | Promise<Node[]> {\n@@ -181,12 +181,12 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic initUid() {\nif (this.uid) return;\n- if (this.contextValue == ModelType.CONNECTION) {\n+ if (this.contextValue == ModelType.CONNECTION || this.contextValue==ModelType.CATALOG) {\nthis.uid = this.getConnectId();\n} else if (this.contextValue == ModelType.SCHEMA) {\n- this.uid = `${this.getConnectId({ withDbForce: true })}`;\n+ this.uid = `${this.getConnectId({ withSchema: true })}`;\n} else {\n- this.uid = `${this.getConnectId({ withDbForce: true })}#${this.label}`;\n+ this.uid = `${this.getConnectId({ withSchema: true })}#${this.label}`;\n}\n}\n@@ -198,11 +198,11 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nlet uid = (this.usingSSH && this.ssh) ? `${prefix}@${this.ssh.host}@${this.ssh.port}@${this.ssh.username}`\n: `${prefix}@${this.host}@${this.port}@${this.user}`;\n- if (this.database) {\n+ if (this.database && this.contextValue!=ModelType.CONNECTION) {\nuid = `${uid}@${this.database}`;\n}\n- if (opt?.withDbForce && this.schema) {\n+ if (opt?.withSchema && this.schema) {\nreturn `${uid}@${this.schema}`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/query/queryGroup.ts",
"new_path": "src/model/query/queryGroup.ts",
"diff": "@@ -18,7 +18,7 @@ export class QueryGroup extends Node {\nconstructor(readonly parent: Node) {\nsuper(\"Query\")\nthis.init(parent)\n- this.storePath = `${FileManager.storagePath}/query/${this.getConnectId({ withDbForce: true })}`;\n+ this.storePath = `${FileManager.storagePath}/query/${this.getConnectId({ withSchema: true })}`;\n}\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/query/queryNode.ts",
"new_path": "src/model/query/queryNode.ts",
"diff": "@@ -37,7 +37,7 @@ export class QueryNode extends Node {\n}\nprivate getFilePath(newName?: string): string {\n- return `${FileManager.storagePath}/query/${this.getConnectId({ withDbForce: true })}/${newName || this.name}.sql`;\n+ return `${FileManager.storagePath}/query/${this.getConnectId({ withSchema: true })}/${newName || this.name}.sql`;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/provider/complete/chain/schemaChain.ts",
"diff": "+import * as vscode from \"vscode\";\n+import { DatabaseCache } from \"../../../service/common/databaseCache\";\n+import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\n+import { ConnectionManager } from \"../../../service/connectionManager\";\n+import { UserGroup } from \"../../../model/database/userGroup\";\n+\n+function wrap(origin: string): string {\n+ if (origin != null && origin.match(/\\b(-|\\.)\\b/ig)) {\n+ return `\\`${origin}\\``;\n+ }\n+ return origin;\n+}\n+\n+export class SchemaChain implements ComplectionChain {\n+\n+ public getComplection(complectionContext: ComplectionContext): vscode.CompletionItem[] {\n+ if (complectionContext.preWord && complectionContext.preWord.match(/into|from|update|table|join/ig)) {\n+ return this.generateDatabaseComplectionItem();\n+ }\n+ return null;\n+ }\n+\n+ public stop(): boolean {\n+ return false;\n+ }\n+\n+ private generateDatabaseComplectionItem(): vscode.CompletionItem[] {\n+\n+ const lcp = ConnectionManager.getLastConnectionOption()\n+ if (!lcp) { return []; }\n+ const connectcionid = `${lcp.getConnectId()}`;\n+\n+ const databaseNodes = DatabaseCache.getSchemaListOfConnection(connectcionid);\n+ if (databaseNodes == null) { return []; }\n+\n+ return databaseNodes.filter((databaseNode) => !(databaseNode instanceof UserGroup)).map<vscode.CompletionItem>((databaseNode) => {\n+ const label = databaseNode.label;\n+ const completionItem = new vscode.CompletionItem(label);\n+ completionItem.kind = vscode.CompletionItemKind.Folder;\n+ completionItem.insertText = wrap(label);\n+ return completionItem;\n+ });\n+ }\n+\n+}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/tableChain.ts",
"new_path": "src/provider/complete/chain/tableChain.ts",
"diff": "-import { UserGroup } from \"@/model/database/userGroup\";\n-import { DiagramGroup } from \"@/model/diagram/diagramGroup\";\n-import { ProcedureGroup } from \"@/model/main/procedureGroup\";\nimport { TableGroup } from \"@/model/main/tableGroup\";\n-import { TriggerGroup } from \"@/model/main/triggerGroup\";\nimport { ViewGroup } from \"@/model/main/viewGroup\";\n-import { QueryGroup } from \"@/model/query/queryGroup\";\n+import { DatabaseCache } from \"@/service/common/databaseCache\";\nimport * as vscode from \"vscode\";\nimport { DatabaseType, ModelType } from \"../../../common/constants\";\nimport { TableNode } from \"../../../model/main/tableNode\";\n@@ -15,8 +11,16 @@ export class TableChain implements ComplectionChain {\npublic async getComplection(complectionContext: ComplectionContext): Promise<vscode.CompletionItem[]> {\n- await this.getNodeList();\n- if (complectionContext.preWord?.match(/\\b(into|from|update|table|join)\\b/ig)) {\n+ if (complectionContext.preChart == \".\") {\n+ const temp = await this.generateTableComplectionItem(complectionContext.preWord);\n+ if (temp.length == 0) {\n+ return null;\n+ } else {\n+ return await this.generateTableComplectionItem(complectionContext.preWord);\n+ }\n+\n+ }\n+ if (complectionContext.preWord && complectionContext.preWord.match(/\\b(into|from|update|table|join)\\b/ig)) {\nreturn await this.generateTableComplectionItem();\n}\nreturn null;\n@@ -26,14 +30,14 @@ export class TableChain implements ComplectionChain {\nreturn true;\n}\n- private async generateTableComplectionItem(): Promise<vscode.CompletionItem[]> {\n- const nodeList = await this.getNodeList();\n+ private async generateTableComplectionItem(inputWord?: string): Promise<vscode.CompletionItem[]> {\n+ const nodeList = await this.getNodeList(inputWord);\nreturn nodeList.map<vscode.CompletionItem>((tableNode: TableNode) => {\nconst completionItem = new vscode.CompletionItem(tableNode.table);\nif (tableNode.description) {\ncompletionItem.detail = tableNode.description\n}\n- if (tableNode.dbType == DatabaseType.MSSQL) {\n+ if (tableNode.dbType == DatabaseType.MSSQL && tableNode.schema != inputWord) {\ncompletionItem.insertText = `${tableNode.wrap(tableNode.schema)}.${tableNode.wrap(tableNode.table)}`;\n} else {\ncompletionItem.insertText = tableNode.wrap(tableNode.table);\n@@ -60,9 +64,24 @@ export class TableChain implements ComplectionChain {\n});\n}\n- private async getNodeList() {\n+ private async getNodeList(inputWord: string) {\nlet nodeList = []\n- const lcp = ConnectionManager.getLastConnectionOption();\n+ let lcp = ConnectionManager.getLastConnectionOption();\n+ if (!lcp) return [];\n+\n+ if (inputWord) {\n+ let match = false;\n+ const connectcionid = lcp.getConnectId();\n+ for (const databaseNode of DatabaseCache.getSchemaListOfConnection(connectcionid)) {\n+ if (databaseNode.schema === inputWord) {\n+ lcp = databaseNode;\n+ match = true;\n+ break;\n+ }\n+ }\n+ if (!match) return []\n+ }\n+\nconst groupNodes = await lcp?.getByRegion()?.getChildren();\nif (!groupNodes) {\nreturn nodeList\n@@ -74,4 +93,5 @@ export class TableChain implements ComplectionChain {\n}\nreturn nodeList;\n}\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/completionProvider.ts",
"new_path": "src/provider/complete/completionProvider.ts",
"diff": "@@ -8,6 +8,7 @@ import { ComplectionChain, ComplectionContext } from \"./complectionContext\";\nimport { TableDetecherChain } from \"./chain/tableDetecherChain\";\nimport { FunctionChain } from \"./chain/functionChain\";\nimport { Console } from \"../../common/Console\";\n+import { SchemaChain } from \"./chain/schemaChain\";\nexport class CompletionProvider implements vscode.CompletionItemProvider {\nconstructor() {\n@@ -21,6 +22,7 @@ export class CompletionProvider implements vscode.CompletionItemProvider {\nthis.fullChain = [\nnew TableCreateChain(),\nnew TypeKeywordChain(),\n+ new SchemaChain(),\nnew TableChain(),\nnew ColumnChain(),\nnew FunctionChain(),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "@@ -121,11 +121,11 @@ export class DatabaseCache {\nreturn databaseNodeList;\n}\n- public static setDataBaseListOfConnection(connectionid: string, DatabaseNodeList: Node[]) {\n+ public static setSchemaListOfConnection(connectionid: string, DatabaseNodeList: Node[]) {\nthis.cache.database[connectionid] = DatabaseNodeList;\n}\n- public static getDatabaseListOfConnection(connectcionid: string): SchemaNode[] {\n+ public static getSchemaListOfConnection(connectcionid: string): SchemaNode[] {\nif (this.cache.database[connectcionid]) {\nreturn this.cache.database[connectcionid];\n} else {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show schema complection.
|
141,908
|
03.02.2021 16:17:52
| -28,800
|
a86d693e4dfe602f9525faf0dcb687b62393a449
|
Support sql intellisense cross schema.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "- Add some node info as tooltip.\n- Reduce connection name.\n- Support remember workspace connection status.\n+- Support sql intellisense cross schema.\n- Update server status view.\n- Support show postgresql, sqlserver schemas.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -16,6 +16,7 @@ import { SSHConfig } from \"./sshConfig\";\nexport interface SwitchOpt {\nisGlobal?: boolean;\nwithSchema?: boolean;\n+ schema?: string;\n}\nexport abstract class Node extends vscode.TreeItem implements CopyAble {\n@@ -204,15 +205,16 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic getConnectId(opt?: SwitchOpt): string {\n- let uid = (this.usingSSH && this.ssh) ? `${this.ssh.host}@${this.ssh.port}`\n- : `${this.host}@${this.port}`;\n+ let uid = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\n- if (this.database && this.contextValue != ModelType.CONNECTION) {\n- uid = `${uid}@${this.database}`;\n+ const database = this.database;\n+ if (database && this.contextValue != ModelType.CONNECTION) {\n+ uid = `${uid}@${database}`;\n}\n- if (opt?.withSchema && this.schema) {\n- return `${uid}@${this.schema}`\n+ const schema = opt?.schema || this.schema;\n+ if (opt?.withSchema && schema) {\n+ return `${uid}@${schema}`\n}\nreturn uid;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/columnChain.ts",
"new_path": "src/provider/complete/chain/columnChain.ts",
"diff": "@@ -56,7 +56,15 @@ export class ColumnChain implements ComplectionChain {\nreturn [];\n}\n- const lcp = ConnectionManager.tryGetConnection()\n+ let lcp = ConnectionManager.tryGetConnection()\n+\n+ const tableSplit = tableName.split(\".\")\n+ if (tableSplit.length == 2) {\n+ const connectcionid = lcp.getConnectId({ schema: tableSplit[0],withSchema:true });\n+ lcp = ColumnNode.nodeCache[connectcionid]\n+ tableName = tableSplit[1]\n+ }\n+\nlet columnNodes = (await lcp?.getByRegion(tableName)?.getChildren()) as ColumnNode[];\nif (!columnNodes) {\nreturn []\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/keywordChain.ts",
"new_path": "src/provider/complete/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\", \"IS\",\"NULL\",\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"IS\",\"NULL\",\"DATABASE\",\n\"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"BETWEEN\",\"RLIKE\",\n\"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"ROLLBACK\", \"COMMENT\", \"COMMIT\", \"BEGIN\", \"DELIMITER\", \"CALL\", \"REPLACE\",\"TEMPORARY\",\n\"REFERENCES\", \"USING\", \"END\", \"BEFORE\", \"AFTER\", \"GRANT\", \"RETURNS\", \"SOME\", \"ANY\", \"ASC\", \"DESC\", \"UNIQUE\", \"UNION\", \"ALL\", \"ON\",\"REGEXP\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/schemaChain.ts",
"new_path": "src/provider/complete/chain/schemaChain.ts",
"diff": "+import { CatalogNode } from \"@/model/database/catalogNode\";\n+import { SchemaNode } from \"@/model/database/schemaNode\";\nimport * as vscode from \"vscode\";\n-import { DatabaseCache } from \"../../../service/common/databaseCache\";\n-import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\n-import { ConnectionManager } from \"../../../service/connectionManager\";\nimport { UserGroup } from \"../../../model/database/userGroup\";\n-\n-function wrap(origin: string): string {\n- if (origin != null && origin.match(/\\b(-|\\.)\\b/ig)) {\n- return `\\`${origin}\\``;\n- }\n- return origin;\n-}\n+import { ConnectionManager } from \"../../../service/connectionManager\";\n+import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class SchemaChain implements ComplectionChain {\n- public getComplection(complectionContext: ComplectionContext): vscode.CompletionItem[] {\n+ public getComplection(complectionContext: ComplectionContext) {\nif (complectionContext.preWord && complectionContext.preWord.match(/into|from|update|table|join/ig)) {\nreturn this.generateDatabaseComplectionItem();\n}\n@@ -24,20 +18,17 @@ export class SchemaChain implements ComplectionChain {\nreturn false;\n}\n- private generateDatabaseComplectionItem(): vscode.CompletionItem[] {\n+ private async generateDatabaseComplectionItem() {\n- const lcp = ConnectionManager.tryGetConnection()\n+ const lcp = ConnectionManager.tryGetConnection() as (SchemaNode | CatalogNode)\nif (!lcp) { return []; }\n- const connectcionid = `${lcp.getConnectId()}`;\n-\n- const databaseNodes = DatabaseCache.getSchemaListOfConnection(connectcionid);\n- if (databaseNodes == null) { return []; }\n+ const databaseNodes = await lcp.parent.getChildren()\nreturn databaseNodes.filter((databaseNode) => !(databaseNode instanceof UserGroup)).map<vscode.CompletionItem>((databaseNode) => {\nconst label = databaseNode.label;\nconst completionItem = new vscode.CompletionItem(label);\ncompletionItem.kind = vscode.CompletionItemKind.Folder;\n- completionItem.insertText = wrap(label);\n+ completionItem.insertText = lcp.wrap(label);\nreturn completionItem;\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/complete/chain/tableChain.ts",
"new_path": "src/provider/complete/chain/tableChain.ts",
"diff": "+import { Node } from \"@/model/interface/node\";\nimport { TableGroup } from \"@/model/main/tableGroup\";\nimport { ViewGroup } from \"@/model/main/viewGroup\";\nimport { DatabaseCache } from \"@/service/common/databaseCache\";\n@@ -65,28 +66,20 @@ export class TableChain implements ComplectionChain {\n}\nprivate async getNodeList(inputWord: string) {\n- let nodeList = []\n+\nlet lcp = ConnectionManager.tryGetConnection();\nif (!lcp) return [];\n+ // If has input, try find schema of current catalog.\nif (inputWord) {\n- let match = false;\n- const connectcionid = lcp.getConnectId();\n- const nodes = DatabaseCache.getSchemaListOfConnection(connectcionid)||[];\n- for (const databaseNode of nodes) {\n- if (databaseNode.schema === inputWord) {\n- lcp = databaseNode;\n- match = true;\n- break;\n- }\n- }\n- if (!match) return []\n+ const connectcionid = lcp.getConnectId({ schema: inputWord,withSchema:true });\n+ lcp = Node.nodeCache[connectcionid]\n+ if (!lcp) return []\n}\n- const groupNodes = await lcp?.getByRegion()?.getChildren();\n- if (!groupNodes) {\n- return nodeList\n- }\n+ // Get current schema view and table childrens.\n+ const groupNodes = await lcp.getChildren();\n+ let nodeList = []\nfor (const groupNode of groupNodes) {\nif (groupNode instanceof TableGroup || groupNode instanceof ViewGroup) {\nnodeList.push(...await groupNode.getChildren());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -118,6 +118,12 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic async activeDb() {\n+ const node=ConnectionManager.getByActiveFile()\n+ if(node){\n+ vscode.window.showErrorMessage(\"Query file can not change active database.\")\n+ return;\n+ }\n+\nconst dbIdList: string[] = [];\nconst dbIdMap = new Map<string, SchemaNode>();\nconst numbers = (await this.getConnectionNodes()).length > 1\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support sql intellisense cross schema.
|
141,908
|
03.02.2021 21:35:45
| -28,800
|
d68bc8f05c095862a858432d9bd77871c030948a
|
Add backtits.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.5.0\",\n+ \"version\": \"3.5.1\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -106,7 +106,7 @@ export class MysqlDialect extends SqlDialect {\nreturn `SELECT count(*) FROM ${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT table_comment comment,TABLE_NAME as name,TABLE_ROWS rows,auto_increment,row_format,data_length,index_length FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name;`\n+ return `SELECT table_comment \\`comment\\`,TABLE_NAME as \\`name\\`,TABLE_ROWS \\`rows\\`,auto_increment,\\`row_format\\`,data_length,index_length FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name;`\n}\nshowSchemas(): string {\nreturn \"show databases\"\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add backtits.
|
141,908
|
04.02.2021 10:43:59
| -28,800
|
7e25a86ea7e6e754b2156b30ae862d9fc0c31b1d
|
Limit max width.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -452,7 +452,7 @@ export default {\nvalue = this.result.data[index][key];\n}\nvar dynamic = value ? (value + \"\").length * 10 : (key + \"\").length * 10;\n- if (dynamic > 600) dynamic = 600;\n+ if (dynamic > 150) dynamic = 150;\nif (dynamic < 70) dynamic = 70;\nvar nextDynamic = this.computeWidth(key, index + 1, keyIndex);\nif (dynamic < nextDynamic) dynamic = nextDynamic;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Limit max width.
|
141,908
|
04.02.2021 11:10:24
| -28,800
|
44f8d410b540bf8af51bfbb934e1486db0cb6920
|
Index column add color.
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/umyui.css",
"new_path": "public/theme/umyui.css",
"diff": "-\n-\n.el-input.is-disabled input {\nborder: none !important;\nuser-select: all;\nfont-weight: 400;\n}\n+.col--index{\n+ color: var(--vscode-charts-green);\n+}\n+\n.plx-cell .el-input input {\npadding: 10px;\n}\n}\n-\n.plx-body--column.col--edit,\n.plx-body--column.col--index,\n.plx-body--column.col--checkbox,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Index column add color.
|
141,908
|
04.02.2021 11:25:10
| -28,800
|
7d03b17eb7caa6159dc2a55db51d86c58f0127e6
|
Height filter checkbox.
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/umyui.css",
"new_path": "public/theme/umyui.css",
"diff": "+/**\n+https://www.umyui.com/\n+*/\n.el-input.is-disabled input {\nborder: none !important;\nuser-select: all;\nfont-weight: 400;\n}\n+.plx-cell--checkbox.is--disabled{\n+ display: none;\n+}\n+\n.col--index{\ncolor: var(--vscode-charts-green);\n}\ndisplay: none;\n}\n+.plx-cell--title{\n+ width: 100%;\n+}\n+\n.title-info,\n.plx-cell--title {\nuser-select: all;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</div>\n</div>\n<!-- trigger when click -->\n- <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '35px'}\" @sort-change=\"sort\" :height=\"remainHeight\" width=\"100vh\" stripe @selection-change=\"selectionChange\" :edit-config=\"{trigger: 'click', mode: 'row',autoClear:false}\" :checkboxConfig=\"{ highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-click=\"updateEdit\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n+ <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '35px'}\" @sort-change=\"sort\" :height=\"remainHeight\" width=\"100vh\" stripe @selection-change=\"selectionChange\" :edit-config=\"{trigger: 'click', mode: 'row',autoClear:false}\" :checkboxConfig=\"{ checkMethod: ({row})=>!row.isFilter,highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-click=\"updateEdit\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n<ux-table-column type=\"checkbox\" width=\"40\" fixed=\"left\"> </ux-table-column>\n<ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\">\n<template slot=\"header\" slot-scope=\"scope\">\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Height filter checkbox.
|
141,908
|
04.02.2021 11:35:42
| -28,800
|
33cba538acf13ac798a41c1977f10af46e873719
|
Fix count not valid.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -157,9 +157,12 @@ export default {\n// only es have.\nif (data.total != null) {\nthis.page.total = parseInt(data.total);\n- } else if (this.result.tableCount == 1) {\n+ } else if (this.result.tableCount == 1 && this.page.pageSize<this.result.data.length+1) {\nthis.count();\n+ }else{\n+ this.page.total=this.result.data.length-1\n}\n+ console.log(3)\n};\nconst handlerCommon = (res) => {\nif (this.$refs.editor) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix count not valid.
|
141,908
|
04.02.2021 23:26:29
| -28,800
|
50b2ab85b8231f51c029e6f92a09c2a22aa650ee
|
Fix treeview not update with operation.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -55,6 +55,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic key: string;\npublic provider?: DbTreeDataProvider;\npublic context?: Memento;\n+ public parent?: Node;\n/**\n* mysql only\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -25,12 +25,16 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nreturn element;\n}\n- public getChildren(element?: Node): Thenable<Node[]> | Node[] {\n+ public async getChildren(element?: Node): Promise<Node[]> {\nif (!element) {\nreturn this.getConnectionNodes();\n}\ntry {\n- return element.getChildren();\n+ const children = await element.getChildren();\n+ for (const child of children) {\n+ child.parent = element;\n+ }\n+ return children;\n} catch (error) {\nreturn [new InfoNode(error)]\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix treeview not update with operation.
|
141,908
|
05.02.2021 00:56:54
| -28,800
|
52b1619d5be61057db1c9d72c80a865e784790c6
|
Support multi update.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/result/query.ts",
"new_path": "src/service/result/query.ts",
"diff": "@@ -88,6 +88,15 @@ export class QueryPage {\nGlobal.updateConfig(ConfigKey.DEFAULT_LIMIT, pageSize)\n}).on('openCoffee', () => {\nenv.openExternal(Uri.parse('https://www.buymeacoffee.com/cweijan'));\n+ }).on('dataModify', () => {\n+ if (handler.panel.title.indexOf(\"*\") == -1) handler.panel.title = `${handler.panel.title}*`\n+ }).on(\"saveModify\", (sql) => {\n+ dbOption.execute(sql).then(() => {\n+ handler.emit('updateSuccess')\n+ handler.panel.title = handler.panel.title.replace(\"*\", \"\")\n+ }).catch(err => {\n+ handler.emit(\"updateFail\", err)\n+ })\n})\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" :clearable=\"true\" />\n<el-button @click=\"$refs.editor.openInsert()\" :disabled=\"result.tableCount!=1\" type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle>\n</el-button>\n- <el-button @click=\"$refs.editor.openEdit(update.current)\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!toolbar.show\">\n- </el-button>\n<el-button @click.stop=\"$refs.editor.openCopy(update.current)\" type=\"info\" size=\"mini\" title=\"copy\" icon=\"el-icon-document-copy\" circle :disabled=\"!toolbar.show\">\n</el-button>\n<el-button @click=\"deleteConfirm\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle :disabled=\"!toolbar.show\">\n<el-button @click=\"exportOption.visible = true\" type=\"primary\" size=\"mini\" icon=\"el-icon-bottom\" circle title=\"Export\"></el-button>\n<el-button type=\"success\" size=\"mini\" icon=\"el-icon-caret-right\" :disabled=\"!toolbar.sql\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n<div style=\"display:inline-block\">\n- <el-pagination @size-change=\"changePageSize\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"page.pageSize\" :page-sizes=\"[100,200,300,400,500,1000]\" :layout=\"page.total!=null?'sizes,prev,pager, next, total, jumper':'sizes,prev, next, jumper'\" :total=\"page.total\">\n+ <el-pagination @size-change=\"changePageSize\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"page.pageSize\" :page-sizes=\"[100,30,50,300,500]\" :layout=\"page.total!=null?'sizes,prev,pager, next, total':'sizes,prev, next'\" :total=\"page.total\">\n</el-pagination>\n</div>\n</div>\n</div>\n</div>\n<!-- trigger when click -->\n- <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '35px'}\" @sort-change=\"sort\" :height=\"remainHeight\" width=\"100vh\" stripe @selection-change=\"selectionChange\" :edit-config=\"{trigger: 'click', mode: 'row',autoClear:false}\" :checkboxConfig=\"{ checkMethod: ({row})=>!row.isFilter,highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-click=\"updateEdit\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n+ <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '35px'}\" @sort-change=\"sort\" :height=\"remainHeight\" width=\"100vh\" stripe @selection-change=\"selectionChange\" :checkboxConfig=\"{ checkMethod: ({row})=>!row.isFilter,highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-click=\"updateEdit\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n<ux-table-column type=\"checkbox\" width=\"40\" fixed=\"left\"> </ux-table-column>\n<ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\">\n<template slot=\"header\" slot-scope=\"scope\">\n</el-tooltip>\n</template>\n<template slot-scope=\"scope\">\n- <el-input class='edit-filter' v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[scope.column.title]\" :clearable='true' placeholder=\"Filter\" @clear=\"filter(null,scope.column.title)\" @keyup.enter.native=\"filter($event,scope.column.title)\">\n+ <template v-if=\"scope.row.isFilter\">\n+ <el-input class='edit-filter' v-model=\"toolbar.filter[scope.column.title]\" :clearable='true' placeholder=\"Filter\" @clear=\"filter(null,scope.column.title)\" @keyup.enter.native=\"filter($event,scope.column.title)\">\n</el-input>\n- <div v-if=\"!scope.row.isFilter\" @contextmenu.prevent=\"onContextmenu($event,scope.column)\" v-html='dataformat(scope.row[scope.column.title])'></div>\n</template>\n- <template slot=\"edit\" slot-scope=\"scope\">\n- <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[scope.column.title]\" placeholder=\"Filter\" v-on:keyup.enter.native=\"filter($event,scope.column.title)\">\n- </el-input>\n- <el-input v-if=\"!scope.row.isFilter\" v-model=\"scope.row[scope.column.title]\" @keypress.enter.native=\"$refs.editor.confirmUpdate(scope.row,update.current)\" :disabled=\"result.tableCount!=1\"></el-input>\n+ <template v-if=\"!scope.row.isFilter\">\n+ <div :contenteditable=\"result.tableCount==1\" @input=\"editListen($event,scope)\" @contextmenu.prevent=\"onContextmenu($event,scope)\" v-html='dataformat(scope.row[scope.column.title])'></div>\n+ </template>\n</template>\n</ux-table-column>\n</ux-grid>\n@@ -133,6 +130,8 @@ export default {\nneedRefresh: true,\n},\nupdate: {\n+ editList: {},\n+ lock: false,\ncurrent: null,\nprimary: null,\n},\n@@ -157,12 +156,16 @@ export default {\n// only es have.\nif (data.total != null) {\nthis.page.total = parseInt(data.total);\n- } else if (this.result.tableCount == 1 && this.page.pageSize<this.result.data.length+1) {\n+ } else if (\n+ this.result.tableCount == 1 &&\n+ this.page.pageSize < this.result.data.length + 1\n+ ) {\nthis.count();\n} else {\n- this.page.total=this.result.data.length-1\n+ this.page.total = this.result.data.length - 1;\n}\n- console.log(3)\n+ this.update.editList = [];\n+ this.update.lock = false;\n};\nconst handlerCommon = (res) => {\nif (this.$refs.editor) {\n@@ -172,6 +175,21 @@ export default {\nthis.info.message = res.message;\n};\nvscodeEvent = getVscodeEvent();\n+\n+ vscodeEvent.on(\"updateSuccess\", () => {\n+ for (const index in this.update.editList) {\n+ const element = this.update.editList[index];\n+ this.result.data[index] = element;\n+ }\n+ this.update.editList = [];\n+ this.update.lock = false;\n+ this.$message.success(\"Update Success\");\n+ });\n+ window.onkeypress = (e) => {\n+ if (e.ctrlKey && e.code == \"KeyS\") {\n+ this.save();\n+ }\n+ };\nwindow.addEventListener(\"message\", ({ data }) => {\nif (!data) return;\nconst response = data.content;\n@@ -217,8 +235,6 @@ export default {\n}\nthis.refresh();\nbreak;\n- default:\n- this.$message(JSON.stringify(data));\n}\n});\nvscodeEvent.emit(\"init\");\n@@ -229,6 +245,32 @@ export default {\n});\n},\nmethods: {\n+ editListen(event, scope) {\n+ const { row, column, rowIndex } = scope;\n+ const editList = this.update.editList;\n+ if (!editList[rowIndex]) {\n+ editList[rowIndex] = { ...row };\n+ delete editList[rowIndex]._XID;\n+ console.log(editList[rowIndex]);\n+ }\n+ editList[rowIndex][column.title] = event.target.textContent;\n+ vscodeEvent.emit(\"dataModify\");\n+ },\n+ save() {\n+ if (Object.keys(this.update.editList).length == 0 && this.update.lock) {\n+ return;\n+ }\n+ this.update.lock = true;\n+ let sql = \"\";\n+ for (const index in this.update.editList) {\n+ const element = this.update.editList[index];\n+ sql += this.$refs.editor.buildUpdateSql(\n+ element,\n+ this.result.data[index]\n+ );\n+ }\n+ vscodeEvent.emit(\"saveModify\", sql);\n+ },\nfull() {\nvscodeEvent.emit(\"full\");\n},\n@@ -244,7 +286,8 @@ export default {\n},\n});\n},\n- onContextmenu(event, column) {\n+ onContextmenu(event, scope) {\n+ const { row, column } = scope;\nconst name = column.title;\nconst value = event.target.textContent;\nevent.target.value = value;\n@@ -256,6 +299,12 @@ export default {\nvscodeEvent.emit(\"copy\", value);\n},\n},\n+ {\n+ label: `Open Edit Dialog`,\n+ onClick: () => {\n+ this.$refs.editor.openEdit(row)\n+ },\n+ },\n{\nlabel: `Filter by ${name} = '${value}'`,\nonClick: () => {\n@@ -475,7 +524,7 @@ export default {\nexecute(sql) {\nif (!sql) return;\nvscodeEvent.emit(\"execute\", {\n- sql: sql.replace(/ +/gi, \" \"),\n+ sql,\n});\nthis.table.loading = true;\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/component/EditDialog.vue",
"new_path": "src/vue/result/component/EditDialog.vue",
"diff": "<template>\n- <el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"visible\" width=\"90%\" top=\"3vh\" size=\"mini\">\n+ <el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"visible\" width=\"60%\" top=\"3vh\" size=\"mini\">\n<el-form ref=\"infoForm\" :model=\"editModel\" :inline=\"true\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in columnList\" size=\"mini\">\n<template>\n</template>\n<script>\n-import CellEditor from \"./CellEditor.vue\"\n-import { util } from \"../mixin/util\"\n-import { wrapByDb } from \"@/common/wrapper\"\n+import CellEditor from \"./CellEditor.vue\";\n+import { util } from \"../mixin/util\";\n+import { wrapByDb } from \"@/common/wrapper\";\nexport default {\nmixins: [util],\n@@ -39,131 +39,159 @@ export default {\neditModel: {},\nvisible: false,\nloading: false,\n- }\n+ };\n},\nmethods: {\nopenEdit(originModel) {\nif (!originModel) {\n- this.$message.error(\"Edit row cannot be null!\")\n- return\n- }\n- this.originModel = originModel\n- this.editModel = { ...originModel }\n- this.model = \"update\"\n- this.loading = false\n- this.visible = true\n+ this.$message.error(\"Edit row cannot be null!\");\n+ return;\n+ }\n+ this.originModel = originModel;\n+ this.editModel = { ...originModel };\n+ this.model = \"update\";\n+ this.loading = false;\n+ this.visible = true;\n},\nopenCopy(originModel) {\nif (!originModel) {\n- this.$message.error(\"Edit row cannot be null!\")\n- return\n- }\n- this.originModel = originModel\n- this.editModel = { ...originModel }\n- this.editModel[this.primaryKey] = null\n- this.model = \"copy\"\n- this.loading = false\n- this.visible = true\n+ this.$message.error(\"Edit row cannot be null!\");\n+ return;\n+ }\n+ this.originModel = originModel;\n+ this.editModel = { ...originModel };\n+ this.editModel[this.primaryKey] = null;\n+ this.model = \"copy\";\n+ this.loading = false;\n+ this.visible = true;\n},\nopenInsert() {\n- this.model = \"insert\"\n- this.editModel = {}\n- this.loading = false\n- this.visible = true\n+ this.model = \"insert\";\n+ this.editModel = {};\n+ this.loading = false;\n+ this.visible = true;\n},\nclose() {\n- this.visible = false\n+ this.visible = false;\n},\ngetTypeByColumn(key) {\n- if (!this.columnList) return\n+ if (!this.columnList) return;\nfor (const column of this.columnList) {\nif (column.name === key) {\n- return column.simpleType || column.type\n+ return column.simpleType || column.type;\n}\n}\n},\nconfirmInsert() {\nif (this.dbType == \"ElasticSearch\") {\n- this.confirmInsertEs()\n- return\n+ this.confirmInsertEs();\n+ return;\n}\n- let columns = \"\"\n- let values = \"\"\n+ let columns = \"\";\n+ let values = \"\";\nfor (const key in this.editModel) {\n- if (this.getTypeByColumn(key) == null) continue\n- const newEle = this.editModel[key]\n+ if (this.getTypeByColumn(key) == null) continue;\n+ const newEle = this.editModel[key];\nif (newEle != null) {\n- columns += `${wrapByDb(key, this.dbType)},`\n- values += `${this.wrapQuote(this.getTypeByColumn(key), newEle)},`\n+ columns += `${wrapByDb(key, this.dbType)},`;\n+ values += `${this.wrapQuote(this.getTypeByColumn(key), newEle)},`;\n}\n}\nif (values) {\n- const insertSql = `INSERT INTO ${this.table}(${columns.replace(/,$/, \"\")}) VALUES(${values.replace(/,$/, \"\")})`\n- this.loading = true\n- this.$emit(\"execute\", insertSql)\n+ const insertSql = `INSERT INTO ${this.table}(${columns.replace(\n+ /,$/,\n+ \"\"\n+ )}) VALUES(${values.replace(/,$/, \"\")})`;\n+ this.loading = true;\n+ this.$emit(\"execute\", insertSql);\n} else {\n- this.$message(\"Not any input, insert fail!\")\n+ this.$message(\"Not any input, insert fail!\");\n}\n},\n- confirmUpdate(row, oldRow) {\n- if (oldRow) {\n- this.originModel = oldRow\n- }\n- const currentNew = row ? row : this.editModel\n+ buildUpdateSql(currentNew, oldRow) {\nif (this.dbType == \"ElasticSearch\") {\n- this.confirmUpdateEs(currentNew)\n- return\n+ return this.confirmUpdateEs(currentNew);\n}\nif (!this.primaryKey) {\n- this.$message.error(\"This table has not primary key, update fail!\")\n- return\n+ this.$message.error(\"This table has not primary key, cannot update!\");\n+ throw new Error(\"This table has not primary key, cannot update!\")\n}\n- const primary = this.originModel[this.primaryKey]\n- let change = \"\"\n+ const primary = oldRow[this.primaryKey];\n+ let change = \"\";\nfor (const key in currentNew) {\n- if (this.getTypeByColumn(key) == null) continue\n- const oldEle = this.originModel[key]\n- const newEle = currentNew[key]\n+ if (this.getTypeByColumn(key) == null) continue;\n+ const oldEle = oldRow[key];\n+ const newEle = currentNew[key];\nif (oldEle !== newEle) {\n- change += `${wrapByDb(key, this.dbType)}=${this.wrapQuote(this.getTypeByColumn(key), newEle)},`\n+ change += `${wrapByDb(key, this.dbType)}=${this.wrapQuote(\n+ this.getTypeByColumn(key),\n+ newEle\n+ )},`;\n}\n}\n- if (change) {\n- const updateSql = `UPDATE ${this.table} SET ${change.replace(/,$/, \"\")} WHERE ${\n+ if (!change) {\n+ return \"\";\n+ }\n+ return `UPDATE ${this.table} SET ${change.replace(/,$/, \"\")} WHERE ${\nthis.primaryKey\n- }=${this.wrapQuote(this.getTypeByColumn(this.primaryKey), primary)}`\n- this.$emit(\"execute\", updateSql)\n- this.loading = true\n+ }=${this.wrapQuote(this.getTypeByColumn(this.primaryKey), primary)};`;\n+ },\n+ confirmUpdate(row, oldRow) {\n+ if (!oldRow) {\n+ oldRow = this.originModel;\n+ }\n+ const currentNew = row ? row : this.editModel;\n+\n+ const sql = this.buildUpdateSql(currentNew, oldRow);\n+ if (sql) {\n+ this.$emit(\"execute\", updateSql);\n+ this.loading = true;\n} else {\n- this.$message(\"Not any change, update fail!\")\n+ this.$message(\"Not any change, update fail!\");\n}\n},\nconfirmInsertEs() {\n- this.$emit(\"execute\", `POST /${this.table}/_doc\\n` + JSON.stringify(this.editModel))\n+ this.$emit(\n+ \"execute\",\n+ `POST /${this.table}/_doc\\n` + JSON.stringify(this.editModel)\n+ );\n},\nconfirmUpdateEs(row) {\n- let value = {}\n+ let value = {};\nfor (const key in row) {\n- if (key == \"_XID\" || key == \"_index\" || key == \"_type\" || key == \"_score\" || key == \"_id\") {\n- continue\n- }\n- value[key] = row[key]\n- }\n- this.$emit(\"execute\", `POST /${this.table}/_doc/${row._id}\\n` + JSON.stringify(value))\n+ if (\n+ key == \"_XID\" ||\n+ key == \"_index\" ||\n+ key == \"_type\" ||\n+ key == \"_score\" ||\n+ key == \"_id\"\n+ ) {\n+ continue;\n+ }\n+ value[key] = row[key];\n+ }\n+ return `POST /${this.table}/_doc/${row._id}\\n` + JSON.stringify(value);\n},\n},\ncomputed: {\neditorTilte() {\nif (this.model == \"insert\") {\n- return \"Insert To \" + this.table\n+ return \"Insert To \" + this.table;\n} else if (this.model == \"update\") {\n- return \"Edit For \" + this.table + \" : \" + this.primaryKey + \"=\" + this.originModel[this.primaryKey]\n+ return (\n+ \"Edit For \" +\n+ this.table +\n+ \" : \" +\n+ this.primaryKey +\n+ \"=\" +\n+ this.originModel[this.primaryKey]\n+ );\n} else {\n- return \"Copy To \" + this.table\n+ return \"Copy To \" + this.table;\n}\n},\n},\n-}\n+};\n</script>\n<style>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support multi update.
|
141,908
|
05.02.2021 01:34:37
| -28,800
|
5a65206b9631731792b140b949c9fc0e6fbeafa8
|
Move copy button to context menu.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" :clearable=\"true\" />\n<el-button @click=\"$refs.editor.openInsert()\" :disabled=\"result.tableCount!=1\" type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle>\n</el-button>\n- <el-button @click.stop=\"$refs.editor.openCopy(update.current)\" type=\"info\" size=\"mini\" title=\"copy\" icon=\"el-icon-document-copy\" circle :disabled=\"!toolbar.show\">\n- </el-button>\n<el-button @click=\"deleteConfirm\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle :disabled=\"!toolbar.show\">\n</el-button>\n<el-button @click=\"exportOption.visible = true\" type=\"primary\" size=\"mini\" icon=\"el-icon-bottom\" circle title=\"Export\"></el-button>\n</el-input>\n</template>\n<template v-if=\"!scope.row.isFilter\">\n- <div :contenteditable=\"result.tableCount==1\" @input=\"editListen($event,scope)\" @contextmenu.prevent=\"onContextmenu($event,scope)\" v-html='dataformat(scope.row[scope.column.title])'></div>\n+ <div :contenteditable=\"result.tableCount==1&&result.primaryKey\" @input=\"editListen($event,scope)\" @contextmenu.prevent=\"onContextmenu($event,scope)\" v-html='dataformat(scope.row[scope.column.title])'></div>\n</template>\n</template>\n</ux-table-column>\n@@ -298,12 +296,20 @@ export default {\nonClick: () => {\nvscodeEvent.emit(\"copy\", value);\n},\n+ divided:true\n},\n{\nlabel: `Open Edit Dialog`,\nonClick: () => {\nthis.$refs.editor.openEdit(row)\n},\n+ },\n+ {\n+ label: `Open Copy Dialog`,\n+ onClick: () => {\n+ this.$refs.editor.openCopy(row)\n+ },\n+ divided:true\n},\n{\nlabel: `Filter by ${name} = '${value}'`,\n@@ -325,7 +331,7 @@ export default {\nlabel: `Filter by ${name} >= '${value}'`,\nonClick: () => {\nthis.filter(event, name, \">=\");\n- },\n+ }, divided:true\n},\n{\nlabel: `Filter by ${name} < '${value}'`,\n@@ -337,7 +343,7 @@ export default {\nlabel: `Filter by ${name} <= '${value}'`,\nonClick: () => {\nthis.filter(event, name, \"<=\");\n- },\n+ }, divided:true\n},\n{\nlabel: `Filter by ${name} LIKE '%${value}%'`,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Move copy button to context menu.
|
141,908
|
05.02.2021 02:50:00
| -28,800
|
42ac58407fde57a3416fc2fac95691cfa734ba95
|
Add enter as save.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -129,7 +129,7 @@ export default {\n},\nupdate: {\neditList: {},\n- lock: false\n+ lock: false,\n},\n};\n},\n@@ -182,7 +182,11 @@ export default {\nthis.$message.success(\"Update Success\");\n});\nwindow.onkeypress = (e) => {\n- if (e.ctrlKey && e.code == \"KeyS\") {\n+ if (e.code == \"Enter\") {\n+ this.save();\n+ e.stopPropagation()\n+ e.preventDefault();\n+ } else if (e.ctrlKey && e.code == \"KeyS\") {\nthis.save();\n}\n};\n@@ -294,20 +298,20 @@ export default {\nonClick: () => {\nvscodeEvent.emit(\"copy\", value);\n},\n- divided:true\n+ divided: true,\n},\n{\nlabel: `Open Edit Dialog`,\nonClick: () => {\n- this.$refs.editor.openEdit(row)\n+ this.$refs.editor.openEdit(row);\n},\n},\n{\nlabel: `Open Copy Dialog`,\nonClick: () => {\n- this.$refs.editor.openCopy(row)\n+ this.$refs.editor.openCopy(row);\n},\n- divided:true\n+ divided: true,\n},\n{\nlabel: `Filter by ${name} = '${value}'`,\n@@ -329,7 +333,8 @@ export default {\nlabel: `Filter by ${name} >= '${value}'`,\nonClick: () => {\nthis.filter(event, name, \">=\");\n- }, divided:true\n+ },\n+ divided: true,\n},\n{\nlabel: `Filter by ${name} < '${value}'`,\n@@ -341,7 +346,8 @@ export default {\nlabel: `Filter by ${name} <= '${value}'`,\nonClick: () => {\nthis.filter(event, name, \"<=\");\n- }, divided:true\n+ },\n+ divided: true,\n},\n{\nlabel: `Filter by ${name} LIKE '%${value}%'`,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add enter as save.
|
141,908
|
05.02.2021 10:45:17
| -28,800
|
6144d32a1adb1ae7fb8652c061ed7a4d85e18b2c
|
Reduce mock config.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockModel.ts",
"new_path": "src/service/mock/mockModel.ts",
"diff": "export interface MockModel {\n- mode: string;\n- host: string;\n- port: number;\n- user: string;\n- database: string;\nschema: string;\n- examples: string;\n+ mockValueReference: string;\ntable: string;\nmockStartIndex: number|string;\nmockCount: number;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -23,11 +23,9 @@ export class MockRunner {\npublic async create(tableNode: TableNode) {\nconst columnList = (await tableNode.getChildren()) as ColumnNode[]\nconst mockModel: MockModel = {\n- mode: tableNode.global === false ? 'workspace' : 'global',\n- host: tableNode.getHost(), port: tableNode.getPort(), user: tableNode.getUser(), database: tableNode.database, table: tableNode.table,\n- schema: tableNode.schema,\n+ schema: tableNode.schema,table: tableNode.table,\nmockStartIndex: MockRunner.primaryKeyMap[tableNode.uid] ? 'auto' : 1\n- , mockCount: 10, examples: \"http://mockjs.com/examples.html#DPD\", mock: {}\n+ , mockCount: 10, mockValueReference: \"http://mockjs.com/examples.html#DPD\", mock: {}\n}\nfor (const columnNode of columnList) {\nmockModel.mock[columnNode.column.name] = {\n@@ -45,11 +43,13 @@ export class MockRunner {\nconst mockModel = JSON.parse(content) as MockModel;\n- const tableList = await new TableGroup(ConnectionManager.getByActiveFile()).getChildren() as TableNode[]\n- if (!tableList) {\n- vscode.window.showErrorMessage(`Database ${mockModel.database} not found!`)\n+ const node = ConnectionManager.getByActiveFile();\n+ if (!node) {\n+ vscode.window.showErrorMessage(`This mock target not valid!`)\nreturn;\n}\n+\n+ const tableList = await new TableGroup(node).getChildren() as TableNode[]\nlet tableNode: TableNode;\nfor (const table of tableList) {\nif (table.table == mockModel.table) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Reduce mock config.
|
141,908
|
05.02.2021 10:45:33
| -28,800
|
185499f39ef602a2398a15adb3524ed9ddb82df8
|
Update some text.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -138,8 +138,8 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\ntableTemplate(): string {\nreturn `CREATE TABLE [name](\nid int NOT NULL primary key,\n- created_time DATETIME,\n- updated_time DATETIME,\n+ create_time DATETIME,\n+ update_time DATETIME,\n[column] varchar(255)\n);\nEXECUTE sp_addextendedproperty N'MS_Description', '[table_comment]', N'user', N'dbo', N'table', N'[table_name]', NULL, NULL;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -114,8 +114,8 @@ export class MysqlDialect extends SqlDialect {\ntableTemplate(): string {\nreturn `CREATE TABLE [name](\nid int NOT NULL primary key AUTO_INCREMENT comment 'primary key',\n- created_time DATETIME COMMENT 'created time',\n- updated_time DATETIME COMMENT 'updated time',\n+ create_time DATETIME COMMENT 'create time',\n+ update_time DATETIME COMMENT 'update time',\n[column] varchar(255) comment ''\n) default charset utf8 comment '';`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -194,8 +194,8 @@ ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\ntableTemplate(): string {\nreturn `CREATE TABLE [name](\nid SERIAL NOT NULL primary key,\n- created_time DATE,\n- updated_time DATE,\n+ create_time DATE,\n+ update_time DATE,\n[column] varchar(255)\n);\nCOMMENT ON TABLE [table] IS '[comment'];\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -179,12 +179,17 @@ export default {\n}\nthis.update.editList = [];\nthis.update.lock = false;\n- this.$message.success(\"Update Success\");\n+ this.$message({\n+ showClose: true,\n+ duration: 500,\n+ message: \"Update Success\",\n+ type: \"success\",\n+ });\n});\nwindow.onkeypress = (e) => {\nif (e.code == \"Enter\") {\nthis.save();\n- e.stopPropagation()\n+ e.stopPropagation();\ne.preventDefault();\n} else if (e.ctrlKey && e.code == \"KeyS\") {\nthis.save();\n@@ -227,11 +232,12 @@ export default {\nbreak;\ncase \"MESSAGE\":\nif (response.message) {\n- if (response.success) {\n- this.$message.success(response.message);\n- } else {\n- this.$message.error(response.message);\n- }\n+ this.$message({\n+ showClose: true,\n+ duration: 1000,\n+ message: response.message,\n+ type: response.success ? \"success\" : \"error\",\n+ });\n}\nthis.refresh();\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/component/ExportDialog.vue",
"new_path": "src/vue/result/component/ExportDialog.vue",
"diff": "<el-form-item label=\"Export File Type\">\n<el-select v-model=\"exportOption.type\">\n<el-option :label=\"'Xlsx'\" value=\"xlsx\"></el-option>\n- <el-option :label=\"'Insert Sql'\" value=\"sql\"></el-option>\n+ <el-option :label=\"'Sql'\" value=\"sql\"></el-option>\n<el-option :label=\"'Json'\" value=\"json\"></el-option>\n<el-option :label=\"'Csv'\" value=\"csv\"> </el-option>\n</el-select>\n"
},
{
"change_type": "DELETE",
"old_path": "src/vue/result/umyui.css",
"new_path": null,
"diff": "-\n-\n-.el-input.is-disabled input{\n- border: none !important;\n- user-select: all;\n- }\n-\n- .plx-header--column.col--ellipsis>.plx-cell .plx-cell--title{\n- font-weight: 400;\n- }\n-\n- .plx-cell .el-input input{\n- padding: 10px;\n- }\n-\n- .plx-edit-icon{\n- display: none;\n- }\n-\n- .title-info,\n- .plx-cell--title {\n- user-select: all;\n- }\n-\n- .plx-cell,\n- .plx-cell--title {\n- text-overflow: unset !important;\n- }\n-\n- .cell {\n- overflow: hidden !important;\n- text-overflow: unset !important;\n- white-space: nowrap !important;\n- user-select: text !important;\n- padding: 1px !important;\n- }\n-\n-\n- .plx-cell {\n- padding: 0px !important;\n- text-align: center !important;\n- }\n-\n- .plx-table--body .el-input__inner {\n- line-height: 35px !important;\n- height: 35px !important;\n- }\n-\n- .plx-cell span {\n- margin: auto !important;\n- }\n-\n- .plx-table.size--small .plx-cell--checkbox .plx-checkbox--icon,\n- .plx-table .plx-cell--checkbox .plx-checkbox--icon:before {\n- height: 1.3em !important;\n- width: 1.3em !important;\n- }\n-\n-\n-\n-.plx-body--column.col--edit,\n-.plx-body--column.col--index,\n-.plx-body--column.col--checkbox,\n-/* header */\n-.plx-table .plx-table--header-wrapper .plx-table--header-border-line{\n- border: 1px solid var(--vscode-textBlockQuote-background) !important;\n-}\n-\n-.plx-table .plx-table--fixed-left-wrapper,\n-.plx-body--column, .plx-header--column {\n- background: none !important;\n- border: 1px solid var(--vscode-textBlockQuote-background) !important;\n-}\n-\n-/* result outline */\n-.plx-table .plx-table--border-line,\n-/* filter */\n-.plx-body--column .edit-filter input{\n- border: none !important;\n-}\n-\n-.null-column{\n- color: #666;\n- font-weight: 400;\n-}\n-\n-/* table edit input */\n-.plx-body--column.col--actived input{\n- border-color: var(--vscode-editor-foreground) !important;\n-}\n-\n-.col--gutter,\n-.plx-table.border--full .plx-table--header-wrapper,\n-.plx-table--body-wrapper {\n- background: var(--vscode-editor-background) !important;\n-}\n-\n-.plx-table .plx-body--row {\n- background: var(--vscode-editor-background) !important;\n- color: var(--primary-color) !important;\n-}\n-\n-.plx-table .plx-body--row.row--stripe, .plx-table .plx-header--row {\n- background: var(--vscode-editorSuggestWidget-background) !important;\n- color: var(--primary-color) !important;\n-}\n-\n-.plx-table .plx-body--row.row--hover,\n-.plx-table .plx-body--row.row--cheched,\n-.plx-table .plx-body--row.row--current {\n- background: var(--vscode-tab-hoverBackground) !important;\n- color: var(--primary-color) !important;\n-}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update some text.
|
141,908
|
24.02.2021 12:52:18
| -28,800
|
c20e96f12dd095447d577d80ceb166a3568b837e
|
Fix change SET to set.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/import/postgresqlImortService.ts",
"new_path": "src/service/import/postgresqlImortService.ts",
"diff": "@@ -14,7 +14,7 @@ export class PostgresqlImortService extends ImportService {\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\nconst command = `psql -h ${host} -p ${port} -U ${node.user} -d ${node.database} < ${importPath}`\nConsole.log(`Executing: ${command}`);\n- exec(`SET \"PGPASSWORD=${node.password}\" && ${command}`, (err,stdout,stderr) => {\n+ exec(`set \"PGPASSWORD=${node.password}\" && ${command}`, (err,stdout,stderr) => {\nif (err) {\nConsole.log(err);\n}else if(stderr){\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix #120, change SET to set.
|
141,908
|
24.02.2021 12:52:43
| -28,800
|
6ace2c2b65f4172650b1bb840aa3db0b20a058ed
|
Fix ,Fix sql server cannot change port.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -16,6 +16,7 @@ export class MSSqlConnnection extends ConnectionPool<Connection>{\nthis.config = {\nserver: node.host,\noptions: {\n+ port:node.port,\ndatabase: node.database || undefined,\nconnectTimeout: node.connectTimeout? parseInt(node.connectTimeout as any): 5000,\nrequestTimeout: node.requestTimeout? parseInt(node.requestTimeout as any): 10000,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix #126, ,Fix sql server cannot change port.
|
141,908
|
24.02.2021 12:52:57
| -28,800
|
a7df9ffa2db744054c38be2610f1da9cea54b720
|
Resolve sort sqlserver table name.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -127,7 +127,7 @@ ALTER TABLE ${table} ALTER COLUMN ${column} ${type} ${defaultDefinition};\nand ds.index_id IN (0, 1)\nWHERE\nTABLE_TYPE = 'BASE TABLE'\n- AND TABLE_SCHEMA = '${database}'`\n+ AND TABLE_SCHEMA = '${database}' order by TABLE_NAME`\n}\nshowDatabases(){\nreturn \"SELECT name 'db' FROM sys.databases\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -183,7 +183,7 @@ ALTER TABLE ${table} ALTER COLUMN ${columnName} ${defaultDefinition};`;\nINNER JOIN pg_catalog.pg_class pgc\nON t.table_name = pgc.relname\nWHERE t.table_type='BASE TABLE'\n- AND t.table_schema='${database}';`\n+ AND t.table_schema='${database}' order by t.table_name;`\n}\nshowDatabases(){\nreturn `SELECT datname \"db\" FROM pg_database WHERE datistemplate = false;`\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Resolve #127, sort sqlserver table name.
|
141,908
|
24.02.2021 13:53:35
| -28,800
|
e4e08463364b51dbb7887bc67d98477178911843
|
Fix query fail when connection end.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -121,6 +121,10 @@ export class ConnectionManager {\n}\n}\n} else {\n+ const sql = connectionNode?.dialect?.pingDataBase(connectionNode.schema);\n+ if(connectionNode.schema && sql){\n+ await QueryUnit.queryPromise(connection.connection, sql, false)\n+ }\nresolve(newConnection);\n}\n});\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix query fail when connection end.
|
141,908
|
28.02.2021 02:51:07
| -28,800
|
eb4c39007209b6071aedfbde3e66c8dcfc29f671
|
Version 3.5.4, fix possible bug.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.5.3\",\n+ \"version\": \"3.5.4\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -121,10 +121,15 @@ export class ConnectionManager {\n}\n}\n} else {\n+ try {\nconst sql = connectionNode?.dialect?.pingDataBase(connectionNode.schema);\nif(connectionNode.schema && sql){\n- await QueryUnit.queryPromise(connection.connection, sql, false)\n+ await QueryUnit.queryPromise(newConnection, sql, false)\n}\n+ } catch (error) {\n+ console.log(err)\n+ }\n+\nresolve(newConnection);\n}\n});\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.5.4, fix possible bug.
|
141,908
|
05.03.2021 15:01:50
| -28,800
|
5f3e4c0d6119bd6d864cf325a4f35d30f860c643
|
Fix redis name not show.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -197,7 +197,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nif (this.uid) return;\nif (this.contextValue == ModelType.CONNECTION || this.contextValue == ModelType.CATALOG) {\nthis.uid = this.getConnectId();\n- } else if (this.contextValue == ModelType.SCHEMA) {\n+ } else if (this.contextValue == ModelType.SCHEMA || this.contextValue==ModelType.REDIS_CONNECTION) {\nthis.uid = `${this.getConnectId({ withSchema: true })}`;\n} else {\nthis.uid = `${this.getConnectId({ withSchema: true })}#${this.label}`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/redisConnectionNode.ts",
"new_path": "src/model/redis/redisConnectionNode.ts",
"diff": "@@ -19,6 +19,10 @@ export class RedisConnectionNode extends RedisBaseNode {\nconstructor(readonly key: string, readonly parent: Node) {\nsuper(key)\nthis.init(parent)\n+ if (parent.name) {\n+ this.description=parent.name\n+ this.name = parent.name\n+ }\nthis.label = this.uid\nif (this.disable) {\nthis.collapsibleState = vscode.TreeItemCollapsibleState.None;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix redis name not show.
|
141,908
|
05.03.2021 15:54:44
| -28,800
|
f4abe4740afb72f6a50d2211641605330050b72c
|
Support show redis command.
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/auto.css",
"new_path": "public/theme/auto.css",
"diff": "@@ -1712,7 +1712,8 @@ body {\nmargin: 0;\nline-height: 34px;\ncursor: pointer;\n- color: var(--input-color);\n+ /* color: var(--input-color); */\n+ color: var(--editor-color);\nfont-size: 14px;\nlist-style: none;\nwhite-space: nowrap;\n@@ -1721,7 +1722,7 @@ body {\n}\n.el-autocomplete-suggestion li.highlighted, .el-autocomplete-suggestion li:hover {\n- background-color: #F5F7FA\n+ background-color: var(--second-bg-color);\n}\n.el-autocomplete-suggestion li.divider {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/redis/terminal.vue",
"new_path": "src/vue/redis/terminal.vue",
"diff": "<!-- content textarea -->\n<el-input ref=\"cliContent\" type=\"textarea\" v-model=\"content\" rows='22' :disabled=\"true\" style=\"border-bottom: 1px solid #E5E5E5;\" id='cli-content'>\n</el-input>\n-\n<!-- input params -->\n- <el-autocomplete class=\"input-suggestion\" autocomplete=\"off\" v-model=\"params\" :fetch-suggestions=\"inputSuggestion\" :placeholder=\"'Press Enter To Exec Commands, Up and Down To Switch History'\" :select-when-unmatched=\"true\" :trigger-on-focus=\"false\" popper-class=\"cli-console-suggestion\" @keyup.enter.native=\"consoleExec\" ref=\"cliParams\" @keyup.up.native=\"searchUp\" @keyup.down.native=\"searchDown\">\n+ <el-autocomplete class=\"input-suggestion\" autocomplete=\"off\" v-model=\"params\" :debounce=\"0\" :fetch-suggestions=\"inputSuggestion\" :placeholder=\"'Press Enter To Exec Commands, Up and Down To Switch History'\" :select-when-unmatched=\"false\" :trigger-on-focus=\"false\" popper-class=\"cli-console-suggestion\" @keypress.enter.native=\"consoleExec\" ref=\"cliParams\" @keyup.up.native=\"searchUp\" @keyup.down.native=\"searchDown\">\n</el-autocomplete>\n</el-form-item>\n</el-form>\n</template>\n<script>\n-import { getVscodeEvent } from \"../util/vscode\"\n-let vscodeEvent\n+import { getVscodeEvent } from \"../util/vscode\";\n+let vscodeEvent;\nexport default {\ndata() {\nreturn {\n@@ -24,165 +23,201 @@ export default {\ncontent: \"\",\nhistoryIndex: 0,\nmultiClient: null,\n- inputSuggestionItems: [],\n- }\n+ histories:[],\n+ inputSuggestionItems: [\n+ \"DEL \",\n+ \"KEYS \",\n+ \"TTL \",\n+ \"PING \",\n+ \"EXISTS \",\n+ // stirng\n+ \"SET \",\n+ \"SETNX \",\n+ \"GET \",\n+ \"STRLEN \",\n+ \"INCR \",\n+ \"DECR \",\n+ // hash\n+ \"HKEYS \",\n+ \"HDEL \",\n+ \"HMSET \",\n+ \"HGETALL \",\n+ // list\n+ \"LPUSH \",\n+ \"LINDEX \",\n+ \"LLEN \",\n+ \"LREM \",\n+ \"RPOP \",\n+ \"LPOP \",\n+ \"LSET \",\n+ // set\n+ \"SADD \",\n+ \"SDIFF \",\n+ \"SMEMBERS \",\n+ \"SPOP \",\n+ // sorted set\n+ \"ZADD \",\n+ // trans\n+ \"MULTI \",\n+ \"EXEC \",\n+ ],\n+ };\n},\nmounted() {\n- vscodeEvent = getVscodeEvent()\n+ vscodeEvent = getVscodeEvent();\nvscodeEvent\n.on(\"config\", (config) => {\n- this.initCliContent(config)\n+ this.initCliContent(config);\n})\n.on(\"result\", (reply) => {\n- this.content += this.resolveResult(reply)\n- })\n- vscodeEvent.emit(\"route-\" + this.$route.name)\n+ this.content += this.resolveResult(reply);\n+ });\n+ vscodeEvent.emit(\"route-\" + this.$route.name);\n},\ndestroyed() {\n- vscodeEvent.destroy()\n+ vscodeEvent.destroy();\n},\nmethods: {\ninitCliContent(redisConfig) {\n- this.$refs.cliParams.focus()\n- console.log(redisConfig)\n- this.content += `> ${redisConfig.host}@${redisConfig.port} connected!\\n`\n- this.scrollToBottom()\n+ this.$refs.cliParams.focus();\n+ this.content += `> ${redisConfig.host}@${redisConfig.port} connected!\\n`;\n+ this.scrollToBottom();\n},\ninputSuggestion(input, cb) {\nif (!this.params) {\n- cb([])\n- return\n+ cb([]);\n+ return;\n}\n- const items = this.inputSuggestionItems.filter(function (item) {\n- return item.indexOf(input) !== -1\n- })\n+ const items = this.inputSuggestionItems.filter((item) => {\n+ return item.toLowerCase().indexOf(input.toLowerCase()) !== -1;\n+ });\n- const suggestions = [...new Set(items)].map(function (item) {\n- return { value: item }\n- })\n+ const suggestions = [...new Set(items)].map((item) => {\n+ return { value: item };\n+ });\n- cb(suggestions)\n+ cb(suggestions);\n},\nconsoleExec() {\n- const params = this.params.replace(/^\\s+|\\s+$/g, \"\")\n+ const params = this.params.replace(/^\\s+|\\s+$/g, \"\");\n// const paramsArr = splitargs(params);\n- const paramsArr = null\n+ const paramsArr = null;\n- this.params = \"\"\n- this.content += `> ${params}\\n`\n+ this.params = \"\";\n+ this.content += `> ${params}\\n`;\n// append to history command\n- this.appendToHistory(params)\n+ this.appendToHistory(params);\nif (params == \"exit\" || params == \"quit\") {\n- vscodeEvent.emit(\"ext\")\n- this.$bus.$emit(\"removePreTab\")\n- return\n+ vscodeEvent.emit(\"ext\");\n+ this.$bus.$emit(\"removePreTab\");\n+ return;\n}\nif (params == \"clear\") {\n- this.content = \"\"\n- return\n+ this.content = \"\";\n+ return;\n}\n- vscodeEvent.emit(\"exec\", params)\n+ vscodeEvent.emit(\"exec\", params);\n},\nexecFinished(params) {\n- const operate = params[0]\n+ const operate = params[0];\nif (operate === \"select\" && !isNaN(params[1])) {\n- this.$bus.$emit(\"changeDb\", this.client, params[1])\n+ this.$bus.$emit(\"changeDb\", this.client, params[1]);\n}\n},\nscrollToBottom() {\nthis.$nextTick(() => {\n- const textarea = this.$refs.cliContent.$el.firstChild\n- textarea.scrollTop = textarea.scrollHeight\n- })\n+ const textarea = this.$refs.cliContent.$el.firstChild;\n+ textarea.scrollTop = textarea.scrollHeight;\n+ });\n},\nappendToHistory(params) {\nif (!params || !params.length) {\n- return\n+ return;\n}\n- const items = this.inputSuggestionItems\n+ const items = this.histories;\nif (items[items.length - 1] !== params) {\n- items.push(params)\n+ items.push(params);\n}\n- this.inputSuggestionItems = items\n- this.historyIndex = items.length\n+ this.histories = items;\n+ this.historyIndex = items.length;\n},\nresolveResult(result) {\n- let append = \"\"\n+ let append = \"\";\nif (result === null) {\n- append = `${null}\\n`\n+ append = `${null}\\n`;\n} else if (typeof result === \"object\") {\n- const isArray = !isNaN(result.length)\n+ const isArray = !isNaN(result.length);\nfor (const i in result) {\nif (typeof result[i] === \"object\") {\n// fix ioredis pipline result such as [[null, \"v1\"], [null, \"v2\"]]\n// null is the result, and v1 is the value\nif (result[i][0] === null) {\n- append += this.resolveResult(result[i][1])\n+ append += this.resolveResult(result[i][1]);\n} else {\n- append += this.resolveResult(result[i])\n+ append += this.resolveResult(result[i]);\n}\n} else {\n- append += `${(isArray ? \"\" : `${i}\\n`) + result[i]}\\n`\n+ append += `${(isArray ? \"\" : `${i}\\n`) + result[i]}\\n`;\n}\n}\n} else {\n- append = `${result}\\n`\n+ append = `${result}\\n`;\n}\n- return append\n+ return append;\n},\nsearchUp() {\nif (this.suggesttionShowing()) {\n- return\n+ return;\n}\n- --this.historyIndex < 0 && (this.historyIndex = 0)\n+ --this.historyIndex < 0 && (this.historyIndex = 0);\n- if (!this.inputSuggestionItems[this.historyIndex]) {\n- this.params = \"\"\n- return\n+ if (!this.histories[this.historyIndex]) {\n+ this.params = \"\";\n+ return;\n}\n- this.params = this.inputSuggestionItems[this.historyIndex]\n+ this.params = this.histories[this.historyIndex];\n},\nsearchDown() {\nif (this.suggesttionShowing()) {\n- return\n+ return;\n}\n- if (++this.historyIndex > this.inputSuggestionItems.length) {\n- this.historyIndex = this.inputSuggestionItems.length\n+ if (++this.historyIndex > this.histories.length) {\n+ this.historyIndex = this.histories.length;\n}\n- if (!this.inputSuggestionItems[this.historyIndex]) {\n- this.params = \"\"\n- return\n+ if (!this.histories[this.historyIndex]) {\n+ this.params = \"\";\n+ return;\n}\n- this.params = this.inputSuggestionItems[this.historyIndex]\n+ this.params = this.histories[this.historyIndex];\n},\nsuggesttionShowing() {\n- const ele = document.querySelector(\".cli-console-suggestion\")\n+ const ele = document.querySelector(\".cli-console-suggestion\");\nif (ele && ele.style.display != \"none\") {\n- return true\n+ return true;\n}\n- return false\n+ return false;\n},\n},\n-}\n+};\n</script>\n<style scoped>\n@@ -190,7 +225,8 @@ export default {\npadding: 0;\nmargin-left: 1px;\nbackground-color: #303845;\n- font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei\", Arial, sans-serif;\n+ font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\",\n+ \"Microsoft YaHei\", Arial, sans-serif;\n}\n.cli-dailog .el-dialog__body {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show redis command.
|
141,908
|
06.03.2021 21:49:26
| -28,800
|
600d4f8e40492d190ce7c7e533c049dae52831a3
|
Compatible old version.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -88,9 +88,6 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn databaseNodes;\n})\n- .catch((err) => {\n- return [new InfoNode(err)];\n- });\n}\npublic copyName() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/infoNode.ts",
"new_path": "src/model/other/infoNode.ts",
"diff": "@@ -6,6 +6,9 @@ export class InfoNode extends Node {\npublic contextValue: string = ModelType.INFO;\nconstructor(readonly label: string) {\nsuper(label)\n+ if((label as any) instanceof Error){\n+ this.label=(label as any).message\n+ }\n}\npublic async getChildren(): Promise<Node[]> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -139,6 +139,7 @@ export class ConnectionManager {\n}\nprivate static create(opt: Node) {\n+ if (!opt.dbType) opt.dbType = DatabaseType.MYSQL\nswitch (opt.dbType) {\ncase DatabaseType.MSSQL:\nreturn new MSSqlConnnection(opt)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "@@ -107,6 +107,7 @@ export class ServiceManager {\n}\npublic static getImportService(dbType: DatabaseType) {\n+ if (!dbType) dbType = DatabaseType.MYSQL\nswitch (dbType) {\ncase DatabaseType.MSSQL:\nreturn new SqlServerImportService()\n@@ -117,6 +118,7 @@ export class ServiceManager {\n}\npublic static getDialect(dbType: DatabaseType): SqlDialect {\n+ if (!dbType) dbType = DatabaseType.MYSQL\nswitch (dbType) {\ncase DatabaseType.MSSQL:\nreturn new MssqlDIalect()\n@@ -129,7 +131,7 @@ export class ServiceManager {\n}\npublic static getPageService(databaseType: DatabaseType): PageService {\n-\n+ if (!databaseType) databaseType = DatabaseType.MYSQL\nswitch (databaseType) {\ncase DatabaseType.MSSQL:\nreturn new MssqlPageService();\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Compatible old version.
|
141,908
|
07.03.2021 11:34:11
| -28,800
|
2a59376b81ed9ba4cb2b537f9295a9e7366521e8
|
Migrate redis to ioredis.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"css-loader\": \"^3.5.3\",\n\"file-loader\": \"^6.0.0\",\n\"html-webpack-plugin\": \"^4.3.0\",\n- \"@types/redis\": \"^2.8.18\",\n+ \"@types/ioredis\": \"^4.22.0\",\n\"postcss\": \"^8.2.1\",\n\"postcss-loader\": \"^4.1.0\",\n\"style-loader\": \"^1.2.1\",\n\"date-format\": \"^3.0.0\",\n\"deepmerge\": \"^3.2.0\",\n\"element-ui\": \"^2.13.2\",\n+ \"ioredis\": \"^4.23.0\",\n\"json-format-highlight\": \"^1.0.4\",\n\"lodash\": \"^4.17.20\",\n\"mysql2\": \"^2.2.5\",\n\"pg\": \"^8.5.1\",\n\"portfinder\": \"^1.0.26\",\n\"pretty-bytes\": \"^5.3.0\",\n- \"redis\": \"^3.0.2\",\n\"routington\": \"^1.0.3\",\n\"sqlstring\": \"^2.3.2\",\n\"umy-table\": \"1.0.8\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/keyNode.ts",
"new_path": "src/model/redis/keyNode.ts",
"diff": "-import { CommandKey, Constants, ModelType, RedisType } from \"@/common/constants\";\n-import { Global } from \"@/common/global\";\n-import { Node } from \"@/model/interface/node\";\n+import { Constants, ModelType, RedisType } from \"@/common/constants\";\nimport { ViewManager } from \"@/common/viewManager\";\n+import { Node } from \"@/model/interface/node\";\nimport * as path from \"path\";\n-import { promisify } from \"util\";\n-import * as vscode from \"vscode\";\nimport { TreeItemCollapsibleState } from \"vscode\";\nimport RedisBaseNode from \"./redisBaseNode\";\n@@ -33,7 +30,7 @@ export default class KeyNode extends RedisBaseNode {\npublic async delete() {\nconst client = await this.getClient();\n- await promisify(client.del).bind(client)(this.label)\n+ await client.del(this.label)\nthis.provider.reload()\n}\n@@ -41,28 +38,26 @@ export default class KeyNode extends RedisBaseNode {\npublic async detail() {\nconst client = await this.getClient();\n- const type = await promisify(client.type).bind(client)(this.label)\n+ const type = await client.type(this.label)\nlet content: any;\nswitch (type) {\ncase RedisType.string:\n- content = await promisify(client.get).bind(client)(this.label)\n+ content = await client.get(this.label)\nbreak;\ncase RedisType.hash:\n- const hall = await promisify(client.hgetall).bind(client)(this.label)\n+ const hall = await client.hgetall(this.label)\ncontent = Object.keys(hall).map(key => {\nreturn { key, value: hall[key] }\n})\nbreak;\ncase RedisType.list:\n- content = await promisify(client.lrange).bind(client)\n- (this.label, 0, await promisify(client.llen).bind(client)(this.label))\n+ content = await client.lrange(this.label, 0, await client.llen(this.label))\nbreak;\ncase RedisType.set:\n- content = await promisify(client.smembers).bind(client)(this.label)\n+ content = await client.smembers(this.label)\nbreak;\ncase RedisType.zset:\n- content = await promisify(client.zrange).bind(client)\n- (this.label, 0, await promisify(client.zcard).bind(client)(this.label))\n+ content = await client.zrange(this.label, 0, await client.zcard(this.label))\nbreak;\n}\nconst title = `${type}:${this.label}`;\n@@ -78,7 +73,7 @@ export default class KeyNode extends RedisBaseNode {\nhandler.emit(\"detail\", {\nres: {\ncontent, type, name: this.label,\n- ttl: await promisify(client.ttl).bind(client)(this.label)\n+ ttl: await client.ttl(this.label)\n}\n})\n}).on(\"refresh\", () => {\n@@ -86,17 +81,17 @@ export default class KeyNode extends RedisBaseNode {\n}).on(\"update\", async (content) => {\nswitch (content.key.type) {\ncase 'string':\n- await promisify(client.set).bind(client)(content.key.name, content.key.content)\n+ await client.set(content.key.name, content.key.content)\nhandler.emit(\"msg\", `Update key ${content.key.name} to new value success!`)\nbreak;\n}\n}).on(\"rename\", async (content) => {\n- await promisify(client.rename).bind(client)(content.key.name, content.key.newName)\n+ await client.rename(content.key.name, content.key.newName)\nthis.detail()\n}).on(\"del\", async (content) => {\n- await promisify(client.del).bind(client)(content.key.name)\n+ await client.del(content.key.name)\n}).on(\"ttl\", async (content) => {\n- await promisify(client.expire).bind(client)(content.key.name, content.key.ttl)\n+ await client.expire(content.key.name, content.key.ttl)\nhandler.emit(\"msg\", `Change TTL for key:${content.key.name} success!`)\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/redisBaseNode.ts",
"new_path": "src/model/redis/redisBaseNode.ts",
"diff": "import { Node } from \"@/model/interface/node\";\nimport { RedisConnection } from \"@/service/connect/redisConnection\";\nimport { ConnectionManager } from \"@/service/connectionManager\";\n-import { RedisClient } from \"redis\";\n+import {Redis} from \"ioredis\";\n+\nexport default abstract class RedisBaseNode extends Node {\npattern = \"*\";\n@@ -9,7 +10,8 @@ export default abstract class RedisBaseNode extends Node {\nabstract getChildren(): Promise<Node[]>;\n- public async getClient(): Promise<RedisClient> {\n+ public async getClient(): Promise<Redis> {\n+\nconst redis = (await ConnectionManager.getConnection(this)) as RedisConnection\nreturn new Promise(res => { redis.run(res) })\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/redisConnectionNode.ts",
"new_path": "src/model/redis/redisConnectionNode.ts",
"diff": "import { Constants, ModelType } from \"@/common/constants\";\nimport { Util } from \"@/common/util\";\n+import { ViewManager } from \"@/common/viewManager\";\nimport { CommandKey, Node } from \"@/model/interface/node\";\nimport { NodeUtil } from \"@/model/nodeUtil\";\n-import { ViewManager } from \"@/common/viewManager\";\nimport * as path from \"path\";\n-import { promisify } from \"util\";\nimport * as vscode from \"vscode\";\nimport { FolderNode } from \"./folderNode\";\nimport RedisBaseNode from \"./redisBaseNode\";\n@@ -33,7 +32,7 @@ export class RedisConnectionNode extends RedisBaseNode {\nasync getChildren(): Promise<RedisBaseNode[]> {\nconst client = await this.getClient()\n- let keys: string[] = await promisify(client.keys).bind(client)(this.pattern);\n+ let keys: string[] = await client.keys(this.pattern)\nreturn FolderNode.buildChilds(this, keys)\n}\nasync openTerminal(): Promise<any> {\n@@ -46,16 +45,14 @@ export class RedisConnectionNode extends RedisBaseNode {\nhandler.emit(\"route\", 'terminal')\n}).on(\"route-terminal\", async () => {\nhandler.emit(\"config\", NodeUtil.removeParent(this))\n- }).on(\"exec\", (content) => {\n+ }).on(\"exec\", async (content) => {\nif (!content) {\nreturn;\n}\nconst splitCommand: string[] = content.replace(/ +/g, \" \").split(' ')\nconst command = splitCommand.shift()\n- client.send_command(command, splitCommand, (err, response) => {\n- const reply = err ? err.message : response\n+ const reply=await client.send_command(command, splitCommand)\nhandler.emit(\"result\", reply)\n- })\n}).on(\"exit\", () => {\nhandler.panel.dispose()\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/redisConnection.ts",
"new_path": "src/service/connect/redisConnection.ts",
"diff": "import { Node } from \"@/model/interface/node\";\n-import { RedisClient, createClient } from \"redis\";\nimport { IConnection, queryCallback } from \"./connection\";\n+import * as IoRedis from \"ioredis\";\n+\nexport class RedisConnection extends IConnection {\nprivate conneted: boolean;\n- private client: RedisClient;\n+ private client: IoRedis.Redis;\nconstructor(opt: Node) {\nsuper()\n- this.client = createClient({\n- host: opt.host,\n+ this.client = new IoRedis({\nport: opt.port,\n- db: opt.database,\n- auth_pass: opt.password,\n- connect_timeout: opt.connectTimeout || 5000\n- })\n+ host: opt.host,\n+ password: opt.password,\n+ connectTimeout: opt.connectTimeout || 5000,\n+ db: opt.database as any as number,\n+ family: 4, // 4 (IPv4) or 6 (IPv6)\n+ });\n+\n}\nquery(sql: string, callback?: queryCallback): void;\n@@ -23,7 +26,7 @@ export class RedisConnection extends IConnection {\nconst command = param.shift()\nthis.client.send_command(command, param, callback)\n}\n- run(callback: (client: RedisClient) => void) {\n+ run(callback: (client: IoRedis.Redis) => void) {\ncallback(this.client)\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Migrate redis to ioredis.
|
141,908
|
07.03.2021 12:30:14
| -28,800
|
02eba841a3b0ef4b506d31c0310ecff4d382abcd
|
Support add and delete operation for redis.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/redis/keyNode.ts",
"new_path": "src/model/redis/keyNode.ts",
"diff": "@@ -93,6 +93,38 @@ export default class KeyNode extends RedisBaseNode {\n}).on(\"ttl\", async (content) => {\nawait client.expire(content.key.name, content.key.ttl)\nhandler.emit(\"msg\", `Change TTL for key:${content.key.name} success!`)\n+ }).on(\"add\", async content => {\n+ switch (type) {\n+ case RedisType.hash:\n+ client.hset(this.label,content.key,content.value)\n+ break;\n+ case RedisType.list:\n+ client.lpush(this.label,0,content.value)\n+ break;\n+ case RedisType.set:\n+ client.sadd(this.label,content.value)\n+ break;\n+ case RedisType.zset:\n+ client.zadd(this.label,0,content.value)\n+ break;\n+ }\n+ handler.emit(\"refresh\")\n+ }).on(\"deleteLine\",async content=>{\n+ switch (type) {\n+ case RedisType.hash:\n+ client.hdel(this.label,content.key)\n+ break;\n+ case RedisType.list:\n+ client.lrem(this.label,0,content)\n+ break;\n+ case RedisType.set:\n+ client.srem(this.label,content)\n+ break;\n+ case RedisType.zset:\n+ client.zrem(this.label,content)\n+ break;\n+ }\n+ handler.emit(\"refresh\")\n})\n}\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/redis/keyView.vue",
"new_path": "src/vue/redis/keyView.vue",
"diff": "<!-- add button -->\n<el-form :inline=\"true\" size=\"small\">\n<el-form-item>\n- <!-- <el-button size=\"small\" type=\"primary\" @click='editDialogVisiable=true'>\n+ <el-button size=\"small\" type=\"primary\" @click='editDialogVisiable=true'>\nAdd New\n- </el-button> -->\n+ </el-button>\n</el-form-item>\n</el-form>\n<!-- edit & add dialog -->\n<el-dialog :title=\"dialogTitle\" :visible.sync=\"editDialogVisiable\">\n<el-form>\n+ <el-form-item label=\"key\" v-if=\"key.type=='hash'\">\n+ <el-input v-model=\"addKey\"></el-input>\n+ </el-form-item>\n<el-form-item label=\"Value\">\n- <!-- <span v-if='editLineItem.binary' class='content-binary'>Hex</span> -->\n- <!-- <FormatViewer :content.sync='editLineItem.value'></FormatViewer> -->\n+ <el-input v-model=\"addData\"></el-input>\n</el-form-item>\n</el-form>\n<div slot=\"footer\" class=\"dialog-footer\">\n<el-button @click=\"editDialogVisiable = false\">Cancel</el-button>\n- <el-button type=\"primary\" @click=\"editLine\">Confirm</el-button>\n+ <el-button type=\"primary\" @click=\"confirmAdd\">Confirm</el-button>\n</div>\n</el-dialog>\n</div>\n{{key.type=='hash'?scope.row.value:scope.row}}\n</template>\n</el-table-column>\n- <!-- <el-table-column label=\"Operation\" width=\"150\" align=\"center\">\n- <template slot=\"header\" slot-scope=\"scope\">\n- <input class=\"el-input__inner key-detail-filter-value\" v-model=\"filterValue\"\n- :placeholder=\"'Keyword Search'\" />\n- </template>\n+ <el-table-column label=\"Operation\" width=\"150\" align=\"center\">\n<template slot-scope=\"scope\">\n- <el-button type=\"text\" @click=\"showEditDialog(scope.row)\" icon=\"el-icon-edit\" circle>\n+ <el-button type=\"text\" @click=\"showEditDialog(scope.row)\" icon=\"el-icon-edit\" circle v-if=\"key.type=='hash'\">\n</el-button>\n<el-button type=\"text\" @click=\"deleteLine(scope.row)\" icon=\"el-icon-delete\" circle>\n</el-button>\n</template>\n- </el-table-column> -->\n+ </el-table-column>\n</el-table>\n<!-- <el-pagination class=\"pagenation-table-page-container\" v-if=\"dataAfterFilter.length > pageSize\"\n:total=\"dataAfterFilter.length\" :page-size=\"pageSize\" :current-page.sync=\"pageIndex\"\n</template>\n<script>\n-import formatHighlight from 'json-format-highlight'\n+import formatHighlight from \"json-format-highlight\";\n-import { getVscodeEvent } from \"../util/vscode\"\n-const prettyBytes = require(\"pretty-bytes\")\n-let vscodeEvent\n+import { getVscodeEvent } from \"../util/vscode\";\n+const prettyBytes = require(\"pretty-bytes\");\n+let vscodeEvent;\nexport default {\n- data() {\n- return {\n- tableData: [],\n- }\n- },\ndestroyed() {\n- vscodeEvent.destroy()\n+ vscodeEvent.destroy();\n},\nmounted() {\n- vscodeEvent = getVscodeEvent()\n- vscodeEvent.on(\"detail\", (data) => {\n- this.key = data.res\n- this.edit = this.deepClone(data.res)\n- this.editTemp = this.jsonContent()\n- const temp = this.edit.content + \"\".trim()\n- this.selectedView = temp.startsWith(\"[\") || temp.startsWith(\"{\") ? \"ViewerJson\" : \"ViewerText\"\n- }).on(\"msg\",(content)=>{\n- this.$message.success(content)\n+ vscodeEvent = getVscodeEvent();\n+ vscodeEvent\n+ .on(\"detail\", (data) => {\n+ this.key = data.res;\n+ this.edit = this.deepClone(data.res);\n+ this.editTemp = this.jsonContent();\n+ const temp = this.edit.content + \"\".trim();\n+ this.selectedView =\n+ temp.startsWith(\"[\") || temp.startsWith(\"{\")\n+ ? \"ViewerJson\"\n+ : \"ViewerText\";\n+ })\n+ .on(\"msg\", (content) => {\n+ this.$message.success(content);\n})\n- vscodeEvent.emit(\"route-\" + this.$route.name)\n+ .on(\"refresh\", () => {\n+ this.editDialogVisiable = false;\n+ this.editModel=false;\n+ this.addData = null;\n+ this.addKey = null;\n+ this.refresh();\n+ });\n+ vscodeEvent.emit(\"route-\" + this.$route.name);\n},\ndata() {\nreturn {\n+ addKey: \"\",\n+ addData: \"\",\n+ editModel: false,\nkey: { name: \"\", ttl: -1, content: null },\n// copy from key\nedit: { name: \"\", ttl: -1, content: null },\n@@ -165,27 +173,30 @@ export default {\n{ value: \"ViewerJson\", text: \"Json\" },\n],\ntextrows: 6,\n- }\n+ };\n},\ncomputed: {\n- dialogTitle(edit) {\n+ dialogTitle() {\n+ const edit = this.editModel;\nswitch (this.key.type) {\n+ case \"hash\":\n+ return edit ? \"Edit Hash\" : \"Add to hash\";\ncase \"set\":\n- return edit ? \"Edit Set\" : \"Add to set\"\n+ return edit ? \"Edit Set\" : \"Add to set\";\ncase \"zset\":\n- return edit ? \"Edit ZSet\" : \"Add to zset\"\n+ return edit ? \"Edit ZSet\" : \"Add to zset\";\ncase \"list\":\n- return edit ? \"Edit List\" : \"Add to list\"\n+ return edit ? \"Edit List\" : \"Add to list\";\n}\n- return \"\"\n+ return \"\";\n},\ndynamicHeight() {\n- return window.innerHeight - 100 + \"px\"\n+ return window.innerHeight - 100 + \"px\";\n},\n},\nmethods: {\nchangeByJson(event) {\n- this.edit.content = event.target.innerText\n+ this.edit.content = event.target.innerText;\n},\njsonContent() {\ntry {\n@@ -196,14 +207,30 @@ export default {\ntrueColor: \"#569cD6\",\nfalseColor: \"#569cD6\",\nnullColor: \"#569cD6\",\n- })\n+ });\n} catch (error) {\n- console.log(error)\n- return this.edit.content\n+ console.log(error);\n+ return this.edit.content;\n}\n},\nrefresh() {\n- vscodeEvent.emit(\"refresh\", { key: this.key })\n+ vscodeEvent.emit(\"refresh\", { key: this.key });\n+ },\n+ confirmAdd() {\n+ vscodeEvent.emit(\"add\", {\n+ key: this.addKey,\n+ value: this.addData,\n+ editModel: this.editModel,\n+ });\n+ },\n+ showEditDialog(row) {\n+ this.addKey=row.key\n+ this.addData=row.value\n+ this.editModel=true;\n+ this.editDialogVisiable=true\n+ },\n+ deleteLine(row) {\n+ vscodeEvent.emit(\"deleteLine\", row);\n},\ndeleteKey() {\nthis.$confirm(\"Are you sure you want to delete this key?\", \"Warning\", {\n@@ -211,50 +238,62 @@ export default {\ncancelButtonText: \"Cancel\",\ntype: \"warning\",\n}).then(() => {\n- vscodeEvent.emit(\"del\", { key: { name: this.key.name } })\n- this.key = {}\n- this.edit = {}\n- })\n+ vscodeEvent.emit(\"del\", { key: { name: this.key.name } });\n+ this.key = {};\n+ this.edit = {};\n+ });\n},\nrename() {\n- console.log(this.key.name)\n- vscodeEvent.emit(\"rename\", { key: { name: this.key.name, newName: this.edit.name } })\n+ console.log(this.key.name);\n+ vscodeEvent.emit(\"rename\", {\n+ key: { name: this.key.name, newName: this.edit.name },\n+ });\n},\nttlKey() {\n- vscodeEvent.emit(\"ttl\", { key: { name: this.key.name, ttl: this.edit.ttl } })\n+ vscodeEvent.emit(\"ttl\", {\n+ key: { name: this.key.name, ttl: this.edit.ttl },\n+ });\n},\nupdate() {\n- vscodeEvent.emit(\"update\", { key: { name: this.key.name, type: this.key.type, content: this.edit.content } })\n+ vscodeEvent.emit(\"update\", {\n+ key: {\n+ name: this.key.name,\n+ type: this.key.type,\n+ content: this.edit.content,\n+ },\n+ });\n},\ndeepClone(obj) {\n- let objClone = Array.isArray(obj) ? [] : {}\n+ let objClone = Array.isArray(obj) ? [] : {};\nif (obj && typeof obj === \"object\") {\nfor (let key in obj) {\nif (obj.hasOwnProperty(key)) {\nif (obj[key] && typeof obj[key] === \"object\") {\n- objClone[key] = this.deepClone(obj[key])\n+ objClone[key] = this.deepClone(obj[key]);\n} else {\n- objClone[key] = obj[key]\n+ objClone[key] = obj[key];\n}\n}\n}\n}\n- return objClone\n+ return objClone;\n},\n},\n-}\n+};\n</script>\n<style scoped>\n.json-panel {\nline-height: 1.3;\nbackground: #292a2b;\nfont-size: 20px;\n- font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, Courier, monospace, 'Avenir', Helvetica, Arial, sans-serif;\n+ font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, Courier,\n+ monospace, \"Avenir\", Helvetica, Arial, sans-serif;\n}\nbody {\n- background-color: #FFFFFF;\n- font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei\", Arial, sans-serif;\n+ background-color: #ffffff;\n+ font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\",\n+ \"Microsoft YaHei\", Arial, sans-serif;\n}\n.value-panel {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support add and delete operation for redis.
|
141,908
|
08.03.2021 10:05:23
| -28,800
|
859e09c5043f0a098d728f20fb67829bdb1d57e6
|
Version 3.5.6.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.5.5\",\n+ \"version\": \"3.5.6\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.5.6.
|
141,908
|
10.03.2021 10:44:52
| -28,800
|
f538a80ba6b1536801b18b1e52b1b5750a2a84c3
|
Attach user to connect uid.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -206,7 +206,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic getConnectId(opt?: SwitchOpt): string {\n- let uid = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\n+ let uid = (this.usingSSH) ? `${this.ssh.username}@${this.ssh.host}@${this.ssh.port}` : `${this.user}@${this.host}@${this.port}`;\nconst database = this.database;\nif (database && this.contextValue != ModelType.CONNECTION) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -167,9 +167,9 @@ export class ConnectionManager {\nconst fileName = vscode.window.activeTextEditor.document.fileName;\nif (fileName.includes('cweijan')) {\nconst queryName = path.basename(path.resolve(fileName, '..'))\n- const [host, port, database, schema] = queryName.replace(/#.+$/, '').split('@')\n+ const [user, host, port, database, schema] = queryName.replace(/#.+$/, '').split('@')\nif (host != null && port != null) {\n- const node = NodeUtil.of({ host, port: parseInt(port), database, schema });\n+ const node = NodeUtil.of({ user, host, port: parseInt(port), database, schema });\nif (node.getCache()) {\nreturn node.getCache();\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Attach user to connect uid.
|
141,908
|
10.03.2021 11:10:30
| -28,800
|
08ed2a0ada543696c5fb700f3ad4a36444de87d6
|
Support drop schema.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.query.switch\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|database|esConnection|esIndex)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|catalog|database|esConnection|esIndex)$/\",\n\"group\": \"inline@1\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/catalogNode.ts",
"new_path": "src/model/database/catalogNode.ts",
"diff": "+import { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\n+import { DatabaseCache } from \"@/service/common/databaseCache\";\nimport { QueryUnit } from \"@/service/queryUnit\";\nimport * as path from \"path\";\n+import * as vscode from \"vscode\";\nimport { Constants, ModelType } from \"../../common/constants\";\n-import { FileManager } from '../../common/filesManager';\nimport { Util } from '../../common/util';\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { CopyAble } from \"../interface/copyAble\";\n@@ -24,7 +26,7 @@ export class CatalogNode extends Node implements CopyAble {\n}\npublic getChildren(): Promise<Node[]> | Node[] {\n- return this.parent.getChildren.apply(this)\n+ return this.parent.getChildren.call(this,true)\n}\npublic async newQuery() {\n@@ -33,6 +35,22 @@ export class CatalogNode extends Node implements CopyAble {\n}\n+ public dropDatatabase() {\n+\n+ vscode.window.showInputBox({ prompt: `Are you want to drop database ${this.schema} ? `, placeHolder: 'Input database name to confirm.' }).then(async (inputContent) => {\n+ if (inputContent && inputContent.toLowerCase() == this.database.toLowerCase()) {\n+ this.execute(`DROP DATABASE ${this.wrap(this.database)}`).then(() => {\n+ DatabaseCache.clearDatabaseCache(`${this.getConnectId()}`)\n+ DbTreeDataProvider.refresh(this.parent);\n+ vscode.window.showInformationMessage(`Drop database ${this.schema} success!`)\n+ })\n+ } else {\n+ vscode.window.showInformationMessage(`Cancel drop database ${this.schema}!`)\n+ }\n+ })\n+\n+ }\n+\npublic copyName() {\nUtil.copyToBoard(this.schema)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/schemaNode.ts",
"new_path": "src/model/database/schemaNode.ts",
"diff": "import { Global } from \"@/common/global\";\nimport * as path from \"path\";\nimport * as vscode from \"vscode\";\n-import { Constants, ModelType } from \"../../common/constants\";\n-import { FileManager } from '../../common/filesManager';\n+import { Constants, DatabaseType, ModelType } from \"../../common/constants\";\nimport { Util } from '../../common/util';\nimport { DbTreeDataProvider } from '../../provider/treeDataProvider';\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { QueryUnit } from \"../../service/queryUnit\";\n-import { ServiceManager } from \"../../service/serviceManager\";\nimport { DiagramGroup } from \"../diagram/diagramGroup\";\nimport { CopyAble } from \"../interface/copyAble\";\nimport { Node } from \"../interface/node\";\n@@ -64,15 +62,16 @@ export class SchemaNode extends Node implements CopyAble {\npublic dropDatatabase() {\n- vscode.window.showInputBox({ prompt: `Are you want to drop database ${this.schema} ? `, placeHolder: 'Input database name to confirm.' }).then(async (inputContent) => {\n+ const target = this.dbType == DatabaseType.MSSQL || this.dbType == DatabaseType.PG ? 'schema' : 'database';\n+ vscode.window.showInputBox({ prompt: `Are you want to drop ${target} ${this.schema} ? `, placeHolder: `Input ${target} name to confirm.` }).then(async (inputContent) => {\nif (inputContent && inputContent.toLowerCase() == this.schema.toLowerCase()) {\n- this.execute(`DROP DATABASE ${this.wrap(this.schema)}`).then(() => {\n+ this.execute(`DROP ${target} ${this.wrap(this.schema)}`).then(() => {\nDatabaseCache.clearDatabaseCache(`${this.getConnectId()}`)\nDbTreeDataProvider.refresh(this.parent);\n- vscode.window.showInformationMessage(`Drop database ${this.schema} success!`)\n+ vscode.window.showInformationMessage(`Drop ${target} ${this.schema} success!`)\n})\n} else {\n- vscode.window.showInformationMessage(`Cancel drop database ${this.schema}!`)\n+ vscode.window.showInformationMessage(`Cancel drop ${target} ${this.schema}`)\n}\n})\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support drop schema.
|
141,908
|
10.03.2021 11:16:19
| -28,800
|
b98bcd533c43ca3e946b011d082b641827cc8737
|
Update sync view.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/structDiff/index.vue",
"new_path": "src/vue/structDiff/index.vue",
"diff": "</div>\n<div class=\"opt-panel\">\n<el-form>\n- <el-form-item label-width=\"80px\" label=\"Sync From\">\n+ <el-form-item label-width=\"90px\" label=\"Sync From\">\n<el-select v-model=\"option.to.connection\">\n<el-option :label=\"node.label\" :value=\"node.label\" :key=\"node.label\" v-for=\"node in initData.nodes\"></el-option>\n</el-select>\n</el-form-item>\n- <el-form-item label-width=\"80px\" label=\"database\">\n+ <el-form-item label-width=\"90px\" label=\"database\">\n<el-select v-model=\"option.to.database\">\n<el-option :label=\"db.label\" :value=\"db.label\" :key=\"db.label\" v-for=\"db in initData.databaseList[option.to.connection]\"></el-option>\n</el-select>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update sync view.
|
141,908
|
10.03.2021 16:54:00
| -28,800
|
5fba9f0d489b77417c1054656ea1b3e53130ebca
|
Remove notice.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-28\">Private Key Path</label>\n<input class=\"w-64 field__input\" placeholder=\"Private Key Path\" v-model=\"connectionOption.ssh.privateKeyPath\" />\n- (Only support private key in pem format.)\n</div>\n- <br>\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-28\">Passphrase</label>\n<input class=\"w-64 field__input\" placeholder=\"Passphrase\" type=\"passphrase\" v-model=\"connectionOption.ssh.passphrase\" />\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Remove notice.
|
141,908
|
11.03.2021 16:05:33
| -28,800
|
b1d3c198ef3767ecbebb63bf6127192f97457d0d
|
Support add connection by same host and port.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -9,7 +9,6 @@ import { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { ConnectionManager } from \"../../service/connectionManager\";\nimport { CopyAble } from \"../interface/copyAble\";\nimport { CommandKey, Node } from \"../interface/node\";\n-import { InfoNode } from \"../other/infoNode\";\nimport { CatalogNode } from \"./catalogNode\";\nimport { SchemaNode } from \"./schemaNode\";\nimport { UserGroup } from \"./userGroup\";\n@@ -24,7 +23,7 @@ export class ConnectionNode extends Node implements CopyAble {\nconstructor(readonly key: string, readonly parent: Node) {\nsuper(key)\nthis.init(parent)\n- this.label = this.uid\n+ this.label = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\nthis.cacheSelf()\nif (parent.name) {\nthis.description = parent.name\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/es/model/esConnectionNode.ts",
"new_path": "src/model/es/model/esConnectionNode.ts",
"diff": "@@ -22,7 +22,7 @@ export class EsConnectionNode extends Node {\nconstructor(readonly key: string, readonly parent: Node) {\nsuper(key)\nthis.init(parent)\n- this.label=this.uid;\n+ this.label = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\nthis.cacheSelf()\nconst lcp = ConnectionManager.activeNode;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -215,8 +215,11 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\npublic getConnectId(opt?: SwitchOpt): string {\n+\nlet uid = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\n+ uid = `${this.key}@@${uid}`\n+\nconst database = this.database;\nif (database && this.contextValue != ModelType.CONNECTION) {\nuid = `${uid}@${database}`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/redisConnectionNode.ts",
"new_path": "src/model/redis/redisConnectionNode.ts",
"diff": "@@ -22,7 +22,7 @@ export class RedisConnectionNode extends RedisBaseNode {\nthis.description=parent.name\nthis.name = parent.name\n}\n- this.label = this.uid\n+ this.label = (this.usingSSH) ? `${this.ssh.host}@${this.ssh.port}` : `${this.host}@${this.port}`;\nif (this.disable) {\nthis.collapsibleState = vscode.TreeItemCollapsibleState.None;\nthis.iconPath = path.join(Constants.RES_PATH, \"icon/close.svg\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/connectService.ts",
"new_path": "src/service/connect/connectService.ts",
"diff": "@@ -41,7 +41,7 @@ export class ConnectService {\ntry {\nawait this.connect(connectNode)\nawait provider.addConnection(connectNode)\n- handler.emit(\"success\", 'connect success!')\n+ handler.emit(\"success\", {message:'connect success!',key:connectNode.key})\n} catch (err) {\nif (err?.message) {\nhandler.emit(\"error\", err.message)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -167,9 +167,11 @@ export class ConnectionManager {\nconst fileName = vscode.window.activeTextEditor.document.fileName;\nif (fileName.includes('cweijan')) {\nconst queryName = path.basename(path.resolve(fileName, '..'))\n- const [host, port, database, schema] = queryName.replace(/#.+$/, '').split('@')\n+ const [host, port, database, schema] = queryName\n+ .replace(/^.*@@/, '') // new connection id\n+ .replace(/#.+$/, '').split('@')\nif (host != null && port != null) {\n- const node = NodeUtil.of({ host, port: parseInt(port), database, schema });\n+ const node = NodeUtil.of({ key: queryName.split('@@')[0], host, port: parseInt(port), database, schema });\nif (node.getCache()) {\nreturn node.getCache();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<blockquote class=\"p-3 mb-2 panel success\" v-if=\"connect.success\">\n<section class=\"panel__text\">\n- <div class=\"font-bold mr-5 inline-block w-36\">Connection success!</div>\n+ <div class=\"font-bold mr-5 inline-block w-36\">Success!</div>\n<span v-text=\"connect.successMessage\"></span>\n</section>\n</blockquote>\n@@ -195,6 +195,7 @@ export default {\ndbType: \"MySQL\",\nencrypt: true,\nglobal: true,\n+ key:null,\nscheme: \"http\",\ntimezone: \"+00:00\",\nssh: {\n@@ -240,11 +241,12 @@ export default {\nthis.connect.error = true;\nthis.connect.errorMessage = err;\n})\n- .on(\"success\", (message) => {\n+ .on(\"success\", (res) => {\nthis.connect.loading = false;\nthis.connect.error = false;\nthis.connect.success = true;\n- this.connect.successMessage = message;\n+ this.connect.successMessage = res.message;\n+ this.connectionOption.key=res.key;\n});\nvscodeEvent.emit(\"route-\" + this.$route.name);\nwindow.onkeydown = (e) => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support add connection by same host and port.
|
141,908
|
11.03.2021 18:28:45
| -28,800
|
2afe86070bee7a6f5104e68b9dfd24d429635df9
|
Support connect to ssh.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"%command.redis.key.detail%\"\n},\n{\n- \"command\": \"ssh.connection.terminal\",\n+ \"command\": \"mysql.ssh.connection.terminal\",\n\"title\": \"Open Terminal\",\n\"icon\": {\n\"light\": \"resources/ssh/light/terminal.png\",\n}\n},\n{\n- \"command\": \"ssh.terminal.hear\",\n+ \"command\": \"mysql.ssh.terminal.hear\",\n\"title\": \"Open Terminal in hear\"\n},\n{\n- \"command\": \"ssh.path.copy\",\n+ \"command\": \"mysql.ssh.path.copy\",\n\"title\": \"Copy Path\"\n},\n{\n- \"command\": \"ssh.file.new\",\n+ \"command\": \"mysql.ssh.file.new\",\n\"title\": \"New File\"\n},\n{\n- \"command\": \"ssh.folder.new\",\n+ \"command\": \"mysql.ssh.folder.new\",\n\"title\": \"New Folder\"\n},\n{\n- \"command\": \"ssh.host.copy\",\n+ \"command\": \"mysql.ssh.host.copy\",\n\"title\": \"Copy Host\"\n},\n{\n- \"command\": \"ssh.forward.port\",\n+ \"command\": \"mysql.ssh.forward.port\",\n\"title\": \"Forward Port\"\n},\n{\n- \"command\": \"ssh.socks.port\",\n+ \"command\": \"mysql.ssh.socks.port\",\n\"title\": \"Start Socks5 Proxy\"\n},\n{\n- \"command\": \"ssh.folder.open\",\n+ \"command\": \"mysql.ssh.folder.open\",\n\"title\": \"Open In Terminal\"\n},\n{\n- \"command\": \"ssh.file.delete\",\n+ \"command\": \"mysql.ssh.file.delete\",\n\"title\": \"Delete\"\n},\n{\n- \"command\": \"ssh.file.download\",\n+ \"command\": \"mysql.ssh.file.download\",\n\"title\": \"Download File\"\n},\n{\n- \"command\": \"ssh.file.upload\",\n+ \"command\": \"mysql.ssh.file.upload\",\n\"title\": \"Upload File\"\n}\n-\n],\n\"keybindings\": [\n{\n\"group\": \"inline\"\n},\n{\n- \"command\": \"ssh.connection.terminal\",\n+ \"command\": \"mysql.ssh.connection.terminal\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n\"group\": \"inline@1\"\n},\n{\n- \"command\": \"ssh.host.copy\",\n+ \"command\": \"mysql.ssh.host.copy\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n\"group\": \"0_connection@-2\"\n},\n{\n- \"command\": \"ssh.forward.port\",\n+ \"command\": \"mysql.ssh.forward.port\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n\"group\": \"1_connection@0\"\n},\n{\n- \"command\": \"ssh.socks.port\",\n+ \"command\": \"mysql.ssh.socks.port\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n\"group\": \"1_connection@1\"\n},\n{\n- \"command\": \"ssh.file.new\",\n+ \"command\": \"mysql.ssh.file.new\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n\"group\": \"2_connection@2\"\n},\n{\n- \"command\": \"ssh.folder.new\",\n+ \"command\": \"mysql.ssh.folder.new\",\n\"when\": \"view == github.cweijan.nosql && viewItem == connection \",\n\"group\": \"2_connection@4\"\n},\n{\n- \"command\": \"ssh.path.copy\",\n+ \"command\": \"mysql.ssh.path.copy\",\n\"when\": \"view == github.cweijan.nosql && viewItem != connection\",\n\"group\": \"a@1\"\n},\n{\n- \"command\": \"ssh.folder.open\",\n+ \"command\": \"mysql.ssh.folder.open\",\n\"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n\"group\": \"a@2\"\n},\n{\n- \"command\": \"ssh.file.new\",\n+ \"command\": \"mysql.ssh.file.new\",\n\"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n\"group\": \"folder@0\"\n},\n{\n- \"command\": \"ssh.folder.new\",\n+ \"command\": \"mysql.ssh.folder.new\",\n\"when\": \"view == github.cweijan.nosql && viewItem == folder \",\n\"group\": \"folder@1\"\n},\n{\n- \"command\": \"ssh.file.upload\",\n+ \"command\": \"mysql.ssh.file.upload\",\n\"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n\"group\": \"folder@2\"\n},\n{\n- \"command\": \"ssh.file.delete\",\n+ \"command\": \"mysql.ssh.file.delete\",\n\"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n\"group\": \"folder@4\"\n},\n{\n- \"command\": \"ssh.file.download\",\n+ \"command\": \"mysql.ssh.file.download\",\n\"when\": \"view == github.cweijan.nosql && viewItem == file\",\n\"group\": \"file@1\"\n},\n{\n- \"command\": \"ssh.file.delete\",\n+ \"command\": \"mysql.ssh.file.delete\",\n\"when\": \"view == github.cweijan.nosql && viewItem == file\",\n\"group\": \"file@2\"\n}\n\"umy-table\": \"1.0.8\",\n\"vue\": \"^2.6.11\",\n\"vue-router\": \"^3.4.1\",\n- \"debug\": \"2.6.9\",\n\"lodash.defaults\": \"^4.1.0\",\n\"progress-stream\": \"^2.0.0\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -124,18 +124,18 @@ export function activate(context: vscode.ExtensionContext) {\n},\n// ssh\n...{\n- 'ssh.connection.terminal': (parentNode: SSHConnectionNode) => parentNode.openTerminal(),\n- 'ssh.folder.new': (parentNode: SSHConnectionNode) => parentNode.newFolder(),\n- 'ssh.file.new': (parentNode: SSHConnectionNode) => parentNode.newFile(),\n- 'ssh.host.copy': (parentNode: SSHConnectionNode) => parentNode.copyIP(),\n- 'ssh.forward.port': (parentNode: SSHConnectionNode) => parentNode.fowardPort(),\n- 'ssh.file.upload': (parentNode: SSHConnectionNode) => parentNode.upload(),\n- 'ssh.folder.open': (parentNode: SSHConnectionNode) => parentNode.openInTeriminal(),\n- 'ssh.path.copy': (node: Node) => node.copyName(),\n- 'ssh.socks.port': (parentNode: SSHConnectionNode) => parentNode.startSocksProxy(),\n- 'ssh.file.delete': (fileNode: FileNode | SSHConnectionNode) => fileNode.delete(),\n- 'ssh.file.open': (fileNode: FileNode) => fileNode.open(),\n- 'ssh.file.download': (fileNode: FileNode) => fileNode.download(),\n+ 'mysql.ssh.connection.terminal': (parentNode: SSHConnectionNode) => parentNode.openTerminal(),\n+ 'mysql.ssh.folder.new': (parentNode: SSHConnectionNode) => parentNode.newFolder(),\n+ 'mysql.ssh.file.new': (parentNode: SSHConnectionNode) => parentNode.newFile(),\n+ 'mysql.ssh.host.copy': (parentNode: SSHConnectionNode) => parentNode.copyIP(),\n+ 'mysql.ssh.forward.port': (parentNode: SSHConnectionNode) => parentNode.fowardPort(),\n+ 'mysql.ssh.file.upload': (parentNode: SSHConnectionNode) => parentNode.upload(),\n+ 'mysql.ssh.folder.open': (parentNode: SSHConnectionNode) => parentNode.openInTeriminal(),\n+ 'mysql.ssh.path.copy': (node: Node) => node.copyName(),\n+ 'mysql.ssh.socks.port': (parentNode: SSHConnectionNode) => parentNode.startSocksProxy(),\n+ 'mysql.ssh.file.delete': (fileNode: FileNode | SSHConnectionNode) => fileNode.delete(),\n+ 'mysql.ssh.file.open': (fileNode: FileNode) => fileNode.open(),\n+ 'mysql.ssh.file.download': (fileNode: FileNode) => fileNode.download(),\n},\n// database\n...{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/connectionProvider.ts",
"new_path": "src/model/ssh/connectionProvider.ts",
"diff": "import { CommandKey } from '@/common/constants';\nimport { ClientManager } from '@/service/ssh/clientManager';\n-import { existsSync } from 'fs';\nimport * as path from 'path';\nimport * as vscode from 'vscode';\n-import { Event, EventEmitter, ExtensionContext } from \"vscode\";\n-import { Node } from '../interface/node';\nimport { SSHConfig } from '../interface/sshConfig';\n-import { InfoNode } from '../other/infoNode';\n-import { SSHConnectionNode } from './sshConnectionNode';\nexport default class ConnectionProvider {\n- _onDidChangeTreeData: EventEmitter<Node> = new EventEmitter<Node>();\n- readonly onDidChangeTreeData: Event<Node> = this._onDidChangeTreeData.event;\npublic static tempRemoteMap = new Map<string, { remote: string, sshConfig: SSHConfig }>()\n- constructor(private context: ExtensionContext) {\n+ constructor() {\nvscode.workspace.onDidSaveTextDocument(e => {\nconst tempPath = path.resolve(e.fileName);\nconst data = ConnectionProvider.tempRemoteMap.get(tempPath)\n@@ -24,27 +17,6 @@ export default class ConnectionProvider {\n}\n})\n}\n- // usage: https://www.npmjs.com/package/redis\n- async getChildren(element?: Node) {\n- try {\n- if (!element) {\n- const config = this.getConnections();\n- const nodes = Object.keys(config).map(key => {\n- const sshConfig = config[key];\n- if (sshConfig.private && existsSync(sshConfig.private)) {\n- sshConfig.privateKey = require('fs').readFileSync(sshConfig.private)\n- }\n- key=`${sshConfig.name ? sshConfig.name + \"_\" : \"\"}${key}`\n- return new SSHConnectionNode(sshConfig, key);\n- });\n- return nodes\n- } else {\n- return element.getChildren()\n- }\n- } catch (error) {\n- return [new InfoNode(error)]\n- }\n- }\nasync saveFile(tempPath: string, remotePath: string, sshConfig: SSHConfig) {\nconst { sftp } = await ClientManager.getSSH(sshConfig)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/fileNode.ts",
"new_path": "src/model/ssh/fileNode.ts",
"diff": "@@ -9,6 +9,7 @@ import * as vscode from 'vscode';\nimport { TreeItemCollapsibleState } from \"vscode\";\nimport { Node } from '../interface/node';\nimport { SSHConfig } from '../interface/sshConfig';\n+import ConnectionProvider from './connectionProvider';\nvar progressStream = require('progress-stream');\nconst prettyBytes = require('pretty-bytes');\n@@ -23,7 +24,7 @@ export class FileNode extends Node {\nthis.iconPath = this.getIcon(this.file.filename)\nthis.fullPath = this.parentName + this.file.filename;\nthis.command = {\n- command: \"ssh.file.open\",\n+ command: \"mysql.ssh.file.open\",\narguments: [this],\ntitle: \"Open File\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/sshConnectionNode.ts",
"new_path": "src/model/ssh/sshConnectionNode.ts",
"diff": "@@ -26,6 +26,9 @@ export class SSHConnectionNode extends Node {\nsuper(name);\nthis.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed\nthis.fullPath = this.parentName + this.name;\n+ if(!name){\n+ this.label=`${sshConfig.username}@${sshConfig.host}`\n+ }\nif (!file) {\nthis.contextValue = ModelType.SSH_CONNECTION;\nthis.iconPath = path.join(Constants.RES_PATH, \"ssh/chain.svg\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/connectService.ts",
"new_path": "src/service/connect/connectService.ts",
"diff": "@@ -6,6 +6,8 @@ import { NodeUtil } from \"../../model/nodeUtil\";\nimport { Util } from \"../../common/util\";\nimport { Global } from \"../../common/global\";\nimport { ConnectionManager } from \"@/service/connectionManager\";\n+import { DatabaseType } from \"@/common/constants\";\n+import { ClientManager } from \"../ssh/clientManager\";\nexport class ConnectService {\n@@ -57,6 +59,10 @@ export class ConnectService {\n}\npublic async connect(connectionNode: Node): Promise<void> {\n+ if (connectionNode.dbType == DatabaseType.SSH) {\n+ await ClientManager.getSSH(connectionNode.ssh, false)\n+ return;\n+ }\nConnectionManager.removeConnection(connectionNode.getConnectId())\nawait ConnectionManager.getConnection(connectionNode)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "@@ -31,6 +31,7 @@ import { PageService } from \"./page/pageService\";\nimport { PostgreSqlPageService } from \"./page/postgreSqlPageService\";\nimport { MysqlSettingService } from \"./setting/MysqlSettingService\";\nimport { SettingService } from \"./setting/settingService\";\n+import ConnectionProvider from \"@/model/ssh/connectionProvider\";\nexport class ServiceManager {\n@@ -51,6 +52,7 @@ export class ServiceManager {\nDatabaseCache.initCache(context);\nViewManager.initExtesnsionPath(context.extensionPath);\nFileManager.init(context)\n+ new ConnectionProvider();\n}\npublic init(): vscode.Disposable[] {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/ssh/forward/forwardService.ts",
"new_path": "src/service/ssh/forward/forwardService.ts",
"diff": "@@ -28,6 +28,8 @@ export class ForwardService {\nsplitView: false, path: \"forward\", title: `forward://${sshConfig.username}@${sshConfig.host}`,\neventHandler: (handler) => {\nhandler.on(\"init\", () => {\n+ handler.emit(\"route\", 'forward')\n+ }).on(\"route-forward\",()=>{\nhandler.emit(\"config\", sshConfig)\nhandler.emit(\"forwardList\", this.list(sshConfig))\n}).on(\"update\", async content => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/ssh/forward/lib/config.js",
"new_path": "src/service/ssh/forward/lib/config.js",
"diff": "var util = require('util');\nvar defaults = require('lodash.defaults');\n-var debug = require('debug')('tunnel-ssh-config');\nvar ConfigError = function (message, extra) {\nError.captureStackTrace(this, this.constructor);\n@@ -34,18 +33,6 @@ function createConfig(config) {\nif (!config.dstPort) {\nthrow new ConfigError('dstPort not set');\n}\n- debug('ssh-config', (function () {\n- var hiddenValues = ['password', 'privateKey'];\n-\n- return Object.keys(config).reduce(function (obj, key) {\n- if (hiddenValues.indexOf(key) === -1) {\n- obj[key] = config[key];\n- } else {\n- obj[key] = '***HIDDEN***';\n- }\n- return obj;\n- }, {});\n- })());\nreturn config;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/ssh/forward/tunnel.js",
"new_path": "src/service/ssh/forward/tunnel.js",
"diff": "var net = require('net');\n-var debug = require('debug')('tunnel-ssh');\nvar Connection = require('ssh2');\nvar createConfig = require('./lib/config');\nvar events = require('events');\n@@ -20,10 +19,8 @@ function bindSSHConnection(config, netConnection) {\nsshConnection.forwardOut(config.srcHost, config.srcPort, config.dstHost, config.dstPort, function (err, sshStream) {\nif (err) {\nnetConnection.emit('error', err);\n- debug('Destination port:', err);\nreturn;\n}\n- debug('sshStream:create');\ntunelMark[id] = { connection: sshConnection }\nsshStream.on('error', function (error) {\nconsole.log(err)\n@@ -42,7 +39,6 @@ function bindSSHConnection(config, netConnection) {\nvar sshConnection = new Connection();\nsshConnection.on('ready', function () {\n- debug('sshConnection:ready');\nnetConnection.emit('sshConnection', sshConnection, netConnection);\nforward(sshConnection, netConnection)\n}).on('error', () => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/tunnel/config.js",
"new_path": "src/service/tunnel/config.js",
"diff": "var util = require('util');\nvar defaults = require('lodash.defaults');\n-var debug = require('debug')('tunnel-ssh-config');\nvar ConfigError = function (message, extra) {\nError.captureStackTrace(this, this.constructor);\n@@ -34,19 +33,6 @@ function createConfig(config) {\nif (!config.dstPort) {\nthrow new ConfigError('dstPort not set');\n}\n- debug('ssh-config', (function () {\n- var hiddenValues = ['password', 'privateKey'];\n-\n- return Object.keys(config).reduce(function (obj, key) {\n- if (hiddenValues.indexOf(key) === -1) {\n- obj[key] = config[key];\n- } else {\n- obj[key] = '***HIDDEN***';\n- }\n- return obj;\n- }, {});\n- })());\n-\nreturn config;\n}\n"
},
{
"change_type": "RENAME",
"old_path": "src/vue/forward/App.vue",
"new_path": "src/vue/forward/index.vue",
"diff": "};\n},\nmounted() {\n- window.addEventListener(\"message\", ({ data }) => {\n- console.log(data);\n- if (!data) return;\n- switch (data.type) {\n- case \"forwardList\":\n- this.forwardList = data.content;\n+ this.on(\"forwardList\", content => {\n+ this.forwardList = ent;\nthis.panel.loading = false;\nthis.panel.visible = false;\n- break;\n- case \"config\":\n- this.title = data.content.host;\n- this.config = data.content;\n- break;\n- case \"success\":\n+ }).on(\"config\", content => {\n+ this.title = content.host;\n+ this.config = content;\n+ }).on(\"success\", (content) => {\nthis.error = false;\n- postMessage({ type: \"load\" });\n- break;\n- case \"error\":\n+ this.emit(\"load\")\n+ }).on(\"error\", content => {\nthis.error = true;\n- this.errorMessage = data.content;\n- break;\n- }\n- });\n- this.init()\n+ this.errorMessage = content;\n+ }).init()\n},\nmethods: {\ncreateRequest() {\nthis.panel.visible = true;\n},\nload() {\n- postMessage({ type: \"load\" });\n+ this.emit(\"load\")\n},\nconfirmUpdate() {\n- postMessage({ type: \"update\", content: this.panel.edit });\n+ this.emit(\"update\",this.panel.edit)\nthis.panel.loading = true;\n},\ninfo(row) {\n- postMessage({\n- type: \"cmd\",\n- content: `ssh -qTnN -L ${row.localHost}:${row.localPort}:${row.remoteHost}:${row.remotePort} ${this.config.username}@${this.config.host}`\n- });\n+ this.emit(\"cmd\",`ssh -qTnN -L ${row.localHost}:${row.localPort}:${row.remoteHost}:${row.remotePort} ${this.config.username}@${this.config.host}`)\n},\nstart(id) {\nthis.emit(\"start\", id)\n.catch(() => {\nthis.$message({ type: \"info\", message: \"Delete canceled\" });\n});\n- },\n- tryConnect() {\n- postMessage({\n- type: \"CONNECT_TO_SQL_SERVER\",\n- databaseType: this.databaseType,\n- connectionOption: this.connectionOption\n- });\n}\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/main.js",
"new_path": "src/vue/main.js",
"diff": "@@ -25,7 +25,7 @@ import structDiff from \"./structDiff\";\nimport keyView from \"./redis/keyView\";\nimport terminal from \"./redis/terminal\";\nimport redisStatus from \"./redis/redisStatus\";\n-\n+import forward from \"./forward\";\nconst router = new VueRouter({\nroutes: [\n@@ -39,6 +39,8 @@ const router = new VueRouter({\n{ path: '/keyView', component: keyView, name: 'keyView' },\n{ path: '/terminal', component: terminal, name: 'terminal' },\n{ path: '/redisStatus', component: redisStatus, name: 'redisStatus' },\n+ // ssh\n+ { path: '/forward', component: forward, name: 'forward' },\n]\n})\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support connect to ssh.
|
141,908
|
11.03.2021 21:42:34
| -28,800
|
6e2bcc227329b7b9defb300d39200646a2ded5e6
|
Integrate ssh success.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.ssh.connection.terminal\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"group\": \"inline@1\"\n},\n{\n\"command\": \"mysql.ssh.host.copy\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"group\": \"0_connection@-2\"\n},\n{\n\"command\": \"mysql.ssh.forward.port\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"group\": \"1_connection@0\"\n},\n{\n\"command\": \"mysql.ssh.socks.port\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"group\": \"1_connection@1\"\n},\n{\n\"command\": \"mysql.ssh.file.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"group\": \"2_connection@2\"\n},\n{\n\"command\": \"mysql.ssh.folder.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == connection \",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection \",\n\"group\": \"2_connection@4\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/fileNode.ts",
"new_path": "src/model/ssh/fileNode.ts",
"diff": "@@ -136,7 +136,7 @@ export class FileNode extends Node {\n}\n- return `${extPath}/resources/ssh/icon/${fileIcon}`\n+ return `${extPath}/ssh/icon/${fileIcon}`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/linkNode.ts",
"new_path": "src/model/ssh/linkNode.ts",
"diff": "@@ -8,8 +8,8 @@ export class LinkNode extends Node {\nconstructor(info: string) {\nsuper(info)\nthis.iconPath={\n- light: path.join(Constants.RES_PATH, \"ssh/image/light/link.svg\"),\n- dark: path.join(Constants.RES_PATH, \"ssh/image/dark/link.svg\"),\n+ light: path.join(Constants.RES_PATH, \"ssh/light/link.svg\"),\n+ dark: path.join(Constants.RES_PATH, \"ssh/dark/link.svg\"),\n}\nthis.collapsibleState = TreeItemCollapsibleState.None\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/ssh/forward/forwardService.ts",
"new_path": "src/service/ssh/forward/forwardService.ts",
"diff": "@@ -25,7 +25,7 @@ export class ForwardService {\npublic createForwardView(sshConfig: SSHConfig) {\nViewManager.createWebviewPanel({\niconPath: join(Constants.RES_PATH,'ssh/icon/forward.svg'),\n- splitView: false, path: \"forward\", title: `forward://${sshConfig.username}@${sshConfig.host}`,\n+ splitView: false, path: \"app\", title: `forward://${sshConfig.username}@${sshConfig.host}`,\neventHandler: (handler) => {\nhandler.on(\"init\", () => {\nhandler.emit(\"route\", 'forward')\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/ssh/terminal/xtermTerminalService.ts",
"new_path": "src/service/ssh/terminal/xtermTerminalService.ts",
"diff": "@@ -27,9 +27,9 @@ export class XtermTerminal implements TerminalService {\npublic async openMethod(sshConfig: SSHConfig, callback?: () => void) {\nViewManager.createWebviewPanel({\n- splitView: false, path: \"client\", iconPath: {\n- light: Util.getExtPath(\"resources\", \"image\", \"light\", \"terminal.png\"),\n- dark: Util.getExtPath(\"resources\", \"image\",\"dark\", \"terminal.svg\"),\n+ splitView: false, path: \"app\", iconPath: {\n+ light: Util.getExtPath(\"ssh\", \"light\", \"terminal.png\"),\n+ dark: Util.getExtPath(\"ssh\", \"dark\", \"terminal.svg\"),\n},\ntitle: this.getTitle(sshConfig),\neventHandler: (handler) => {\n@@ -43,7 +43,9 @@ export class XtermTerminal implements TerminalService {\nconst sshUrl = this.getSshUrl(sshConfig);\nlet dataBuffer = [];\n- handler.on(\"init\", (content) => {\n+ handler.on(\"init\", () => {\n+ handler.emit(\"route\", 'sshTerminal')\n+ }).on(\"initTerminal\", (content) => {\nhandler.emit('connecting', `connecting ${sshConfig.username}@${sshConfig.host}...\\n`);\nlet termCols: number, termRows: number;\nif (content) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/forward/index.vue",
"new_path": "src/vue/forward/index.vue",
"diff": "<template>\n<div>\n- <h1>{{title}}</h1>\n<blockquote class=\"panel\" id=\"error\" v-if=\"error\">\n<p class=\"panel__text\">\nConnection error! <span id=\"errorMessage\" v-text=\"errorMessage\"></span><br />\n},\nmounted() {\nthis.on(\"forwardList\", content => {\n- this.forwardList = ent;\n+ this.forwardList = content;\nthis.panel.loading = false;\nthis.panel.visible = false;\n}).on(\"config\", content => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/main.js",
"new_path": "src/vue/main.js",
"diff": "@@ -26,6 +26,7 @@ import keyView from \"./redis/keyView\";\nimport terminal from \"./redis/terminal\";\nimport redisStatus from \"./redis/redisStatus\";\nimport forward from \"./forward\";\n+import sshTerminal from \"./xterm\";\nconst router = new VueRouter({\nroutes: [\n@@ -41,6 +42,7 @@ const router = new VueRouter({\n{ path: '/redisStatus', component: redisStatus, name: 'redisStatus' },\n// ssh\n{ path: '/forward', component: forward, name: 'forward' },\n+ { path: '/sshTerminal', component: sshTerminal, name: 'sshTerminal' },\n]\n})\n"
},
{
"change_type": "DELETE",
"old_path": "src/vue/xterm/client.html",
"new_path": null,
"diff": "-<!DOCTYPE html>\n-<html>\n-\n-<head>\n- <title>Xterm-SSH</title>\n-</head>\n-\n-<body>\n- <div class=\"box\">\n- <div id=\"header\">\n- <div id=\"status\"></div>\n- </div>\n- <div id=\"terminal-container\" class=\"terminal\"></div>\n- </div>\n-</body>\n-\n-</html>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/vue/xterm/index.vue",
"diff": "+<template>\n+ <div class=\"box\">\n+ <div id=\"header\">\n+ <div id=\"status\"></div>\n+ </div>\n+ <div id=\"terminal-container\" class=\"terminal\"></div>\n+ </div>\n+</template>\n+\n+<script>\n+ import { Terminal } from 'xterm'\n+ import { FitAddon } from 'xterm-addon-fit'\n+ import { WebLinksAddon } from \"xterm-addon-web-links\";\n+ import { SearchAddon } from 'xterm-addon-search';\n+ import { SearchBarAddon } from 'xterm-addon-search-bar';\n+ import { auto } from \"./theme/auto\";\n+ import { eventNames } from 'process';\n+ require('xterm/css/xterm.css')\n+ require('./css/style.css')\n+ import { inject } from \"../mixin/vscodeInject\";\n+ export default {\n+ mixins: [inject],\n+ data() {\n+ return {};\n+ },\n+ mounted() {\n+ var errorExists = false;\n+ const terminal = new Terminal({\n+ theme: auto(),\n+ cursorStyle: \"bar\",\n+ fontSize: 18,\n+ fontFamily: \"'Consolas ligaturized',Consolas, 'Microsoft YaHei','Courier New', monospace\",\n+ disableStdin: false,\n+ lineHeight: 1.1,\n+ rightClickSelectsWord: true,\n+ cursorBlink: true, scrollback: 10000, tabStopWidth: 8, bellStyle: \"sound\"\n+ })\n+\n+ const fitAddon = new FitAddon()\n+ const searchAddon = new SearchAddon();\n+ const searchAddonBar = new SearchBarAddon({ searchAddon });\n+\n+ terminal.loadAddon(fitAddon)\n+ terminal.loadAddon(searchAddonBar);\n+ terminal.loadAddon(new WebLinksAddon(() => { }, {\n+ willLinkActivate: (e, uri) => {\n+ // set timeout to remove selection\n+ setTimeout(() => {\n+ this.emit('openLink', uri)\n+ }, 100);\n+ }\n+ }))\n+\n+ terminal.open(document.getElementById('terminal-container'))\n+ fitAddon.fit()\n+ terminal.focus()\n+ terminal.onData((data) => {\n+ this.emit('data', data)\n+ })\n+\n+ function resizeScreen() {\n+ fitAddon.fit()\n+ this.emit('resize', { cols: terminal.cols, rows: terminal.rows })\n+ }\n+\n+ window.addEventListener('resize', resizeScreen, false)\n+ window.addEventListener(\"keyup\", async event => {\n+ if (event.code == \"KeyV\" && event.ctrlKey && !event.altKey && !event.shiftKey) {\n+ this.emit('data', await navigator.clipboard.readText())\n+ event.preventDefault()\n+ event.stopPropagation()\n+ }\n+ if (event.code == \"KeyF\" && event.ctrlKey && !event.altKey && !event.shiftKey) {\n+ searchAddonBar.show();\n+ event.preventDefault()\n+ event.stopPropagation()\n+ }\n+ });\n+\n+ window.addEventListener(\"contextmenu\", async () => {\n+ if (terminal.hasSelection()) {\n+ document.execCommand('copy')\n+ terminal.clearSelection()\n+ } else {\n+ this.emit('data', await navigator.clipboard.readText())\n+ }\n+ })\n+\n+ const status = document.getElementById('status')\n+ this\n+ .on('connecting', content => {\n+ terminal.write(content)\n+ terminal.focus()\n+ })\n+ .on('data', (content) => {\n+ terminal.write(content)\n+ terminal.focus()\n+ })\n+ .on('path', path => {\n+ this.emit('data', `cd ${path}\\n`)\n+ })\n+ .on('status', (data) => {\n+ resizeScreen()\n+ status.innerHTML = data\n+ status.style.backgroundColor = '#338c33'\n+ terminal.focus()\n+ })\n+ .on('ssherror', (data) => {\n+ status.innerHTML = data\n+ status.style.backgroundColor = 'red'\n+ errorExists = true\n+ })\n+ .on('error', (err) => {\n+ if (!errorExists) {\n+ status.style.backgroundColor = 'red'\n+ status.innerHTML = 'ERROR: ' + err\n+ }\n+ });\n+\n+ this.emit('initTerminal', { cols: terminal.cols, rows: terminal.rows })\n+ },\n+ methods: {}\n+ };\n+</script>\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/vue/xterm/js/index.js",
"new_path": null,
"diff": "-import { Terminal } from 'xterm'\n-import { FitAddon } from 'xterm-addon-fit'\n-import { vscodeEvent } from \"./vscode\";\n-import { WebLinksAddon } from \"xterm-addon-web-links\";\n-import { SearchAddon } from 'xterm-addon-search';\n-import { SearchBarAddon } from 'xterm-addon-search-bar';\n-import { auto } from \"./theme/auto\";\n-import { eventNames } from 'process';\n-require('xterm/css/xterm.css')\n-require('../css/style.css')\n-\n-\n-var errorExists = false;\n-const terminal = new Terminal({\n- theme: auto(),\n- cursorStyle: \"bar\",\n- fontSize: 18,\n- fontFamily: \"'Consolas ligaturized',Consolas, 'Microsoft YaHei','Courier New', monospace\",\n- disableStdin: false,\n- lineHeight: 1.1,\n- rightClickSelectsWord: true,\n- cursorBlink: true, scrollback: 10000, tabStopWidth: 8, bellStyle: \"sound\"\n-})\n-\n-const fitAddon = new FitAddon()\n-const searchAddon = new SearchAddon();\n-const searchAddonBar = new SearchBarAddon({ searchAddon });\n-\n-terminal.loadAddon(fitAddon)\n-terminal.loadAddon(searchAddonBar);\n-terminal.loadAddon(new WebLinksAddon(() => { }, {\n- willLinkActivate: (e, uri) => {\n- // set timeout to remove selection\n- setTimeout(() => {\n- vscodeEvent.emit('openLink', uri)\n- }, 100);\n- }\n-}))\n-\n-terminal.open(document.getElementById('terminal-container'))\n-fitAddon.fit()\n-terminal.focus()\n-terminal.onData((data) => {\n- vscodeEvent.emit('data', data)\n-})\n-\n-function resizeScreen() {\n- fitAddon.fit()\n- vscodeEvent.emit('resize', { cols: terminal.cols, rows: terminal.rows })\n-}\n-\n-window.addEventListener('resize', resizeScreen, false)\n-window.addEventListener(\"keyup\", async event => {\n- if (event.code == \"KeyV\" && event.ctrlKey && !event.altKey && !event.shiftKey) {\n- vscodeEvent.emit('data', await navigator.clipboard.readText())\n- event.preventDefault()\n- event.stopPropagation()\n- }\n- if (event.code == \"KeyF\" && event.ctrlKey && !event.altKey && !event.shiftKey) {\n- searchAddonBar.show();\n- event.preventDefault()\n- event.stopPropagation()\n- }\n-});\n-\n-window.addEventListener(\"contextmenu\",async () => {\n- if (terminal.hasSelection()) {\n- document.execCommand('copy')\n- terminal.clearSelection()\n- } else {\n- vscodeEvent.emit('data', await navigator.clipboard.readText())\n- }\n-})\n-\n-const status = document.getElementById('status')\n-vscodeEvent\n- .on('connecting', content => {\n- terminal.write(content)\n- terminal.focus()\n- })\n- .on('data', (content) => {\n- terminal.write(content)\n- terminal.focus()\n- })\n- .on('path', path => {\n- vscodeEvent.emit('data', `cd ${path}\\n`)\n- })\n- .on('status', (data) => {\n- resizeScreen()\n- status.innerHTML = data\n- status.style.backgroundColor = '#338c33'\n- terminal.focus()\n- })\n- .on('ssherror', (data) => {\n- status.innerHTML = data\n- status.style.backgroundColor = 'red'\n- errorExists = true\n- })\n- .on('error', (err) => {\n- if (!errorExists) {\n- status.style.backgroundColor = 'red'\n- status.innerHTML = 'ERROR: ' + err\n- }\n- });\n-\n-vscodeEvent.emit('init', { cols: terminal.cols, rows: terminal.rows })\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/vue/xterm/js/vscode.js",
"new_path": null,
"diff": "-const vscode = typeof (acquireVsCodeApi) != \"undefined\" ? acquireVsCodeApi() : null;\n-const postMessage = (message) => { if (vscode) { vscode.postMessage(message) } }\n-let events = {}\n-window.addEventListener('message', ({ data }) => {\n- if (events[data.type]) {\n- events[data.type](data.content);\n- }\n-})\n-export const vscodeEvent = {\n- on(event, data) {\n- events[event] = data\n- return vscodeEvent;\n- },\n- emit(event, data) {\n- postMessage({ type: event, content: data })\n- }\n-}\n"
},
{
"change_type": "RENAME",
"old_path": "src/vue/xterm/js/theme/auto.js",
"new_path": "src/vue/xterm/theme/auto.js",
"diff": ""
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Integrate ssh success.
|
141,908
|
11.03.2021 21:46:31
| -28,800
|
bfd3a85743b5a020b1d83fd6ff6da69494713cf4
|
Support open downloaded file.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/fileNode.ts",
"new_path": "src/model/ssh/fileNode.ts",
"diff": "@@ -91,7 +91,11 @@ export class FileNode extends Node {\nstr.on(\"progress\", (progressData: any) => {\nif (progressData.percentage == 100) {\nresolve(null)\n- vscode.window.showInformationMessage(`Download ${this.fullPath} success, cost time: ${progressData.runtime}s`)\n+ vscode.window.showInformationMessage(`Download ${this.fullPath} success, cost time: ${progressData.runtime}s`, 'Open').then(action => {\n+ if (action) {\n+ vscode.commands.executeCommand('vscode.open', uri);\n+ }\n+ })\nreturn;\n}\nprogress.report({ increment: progressData.percentage-before,message:`remaining : ${prettyBytes(progressData.remaining)}` });\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support open downloaded file.
|
141,908
|
11.03.2021 21:56:56
| -28,800
|
c7dcdbdb0e1bf4cae1f0d8a2e4312d6ae143b09f
|
Change terminal style to scoped.
|
[
{
"change_type": "DELETE",
"old_path": "src/vue/xterm/css/style.css",
"new_path": null,
"diff": "-body, html {\n- font-family: helvetica, sans-serif, arial;\n- font-size: 1em;\n- color: #111;\n- /* background-color: #2f3032; */\n- color: rgb(240, 240, 240);\n- height: 100%;\n- margin: 0;\n- padding: 0;\n-}\n-\n-.dropup-content {\n- display: none;\n-}\n-\n-#header {\n- background-color: rgb(84, 84, 84);\n- color: #fafafa;\n- width: 100%;\n- border-color: white;\n- border-style: none none solid none;\n- border-width: 1px;\n- text-align: center;\n- flex: 0 1 auto;\n- z-index: 99;\n- height:19px;\n-}\n-\n-#header a{\n- color: #fafafa;\n-}\n-\n-.box {\n- display: block;\n- height: 100%;\n-}\n-#terminal-container {\n- display: block;\n- width: calc(100% - 1 px);\n- margin: 0 auto;\n- /* padding-top: 2px;\n- padding-left: 3px; */\n- height: calc(100% - 19px);\n-}\n-#terminal-container .terminal {\n- background-color: #000000;\n- color: #fafafa;\n- /* padding: 2px; */\n- height: calc(100% - 19px);\n-}\n-#terminal-container .terminal:focus .terminal-cursor {\n- background-color: #fafafa;\n-}\n-#bottomdiv {\n- position: fixed;\n- left: 0;\n- bottom: 0;\n- width: 100%;\n- background-color: rgb(50, 50, 50);\n- border-color: white;\n- border-style: solid none none none;\n- border-width: 1px;\n- z-index: 99;\n- height: 19px;\n-}\n-#status {\n- background-color: #338c33;\n- display: inline-block;\n- padding-left: 10px;\n- padding-right: 10px;\n- border-color: white;\n- border-style: none solid none solid;\n- border-width: 1px;\n- text-align: left;\n- z-index: 100;\n-}\n-@keyframes countdown {\n- from {\n- background-color: rgb(255, 255, 0);\n- }\n- to {\n- background-color: inherit;\n- }\n-}\n-#menu {\n- display: inline-block;\n- font-size: 16px;\n- color: rgb(255, 255, 255);\n- z-index: 100;\n-}\n-#menu:hover .dropup-content {\n- display: block;\n-}\n-#logBtn, #credentialsBtn, #reauthBtn {\n- color: #000;\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/xterm/index.vue",
"new_path": "src/vue/xterm/index.vue",
"diff": "import { auto } from \"./theme/auto\";\nimport { eventNames } from 'process';\nrequire('xterm/css/xterm.css')\n- require('./css/style.css')\nimport { inject } from \"../mixin/vscodeInject\";\nexport default {\nmixins: [inject],\nmethods: {}\n};\n</script>\n+<style scoped>\n+ body, html {\n+ font-family: helvetica, sans-serif, arial;\n+ font-size: 1em;\n+ color: #111;\n+ /* background-color: #2f3032; */\n+ color: rgb(240, 240, 240);\n+ height: 100%;\n+ margin: 0;\n+ padding: 0;\n+}\n+\n+.dropup-content {\n+ display: none;\n+}\n+\n+#header {\n+ background-color: rgb(84, 84, 84);\n+ color: #fafafa;\n+ width: 100%;\n+ border-color: white;\n+ border-style: none none solid none;\n+ border-width: 1px;\n+ text-align: center;\n+ flex: 0 1 auto;\n+ z-index: 99;\n+ height:19px;\n+}\n+\n+#header a{\n+ color: #fafafa;\n+}\n+\n+.box {\n+ display: block;\n+ height: 100%;\n+}\n+#terminal-container {\n+ display: block;\n+ width: calc(100% - 1 px);\n+ margin: 0 auto;\n+ /* padding-top: 2px;\n+ padding-left: 3px; */\n+ height: calc(100% - 19px);\n+}\n+#terminal-container .terminal {\n+ background-color: #000000;\n+ color: #fafafa;\n+ /* padding: 2px; */\n+ height: calc(100% - 19px);\n+}\n+#terminal-container .terminal:focus .terminal-cursor {\n+ background-color: #fafafa;\n+}\n+#bottomdiv {\n+ position: fixed;\n+ left: 0;\n+ bottom: 0;\n+ width: 100%;\n+ background-color: rgb(50, 50, 50);\n+ border-color: white;\n+ border-style: solid none none none;\n+ border-width: 1px;\n+ z-index: 99;\n+ height: 19px;\n+}\n+#status {\n+ background-color: #338c33;\n+ display: inline-block;\n+ padding-left: 10px;\n+ padding-right: 10px;\n+ border-color: white;\n+ border-style: none solid none solid;\n+ border-width: 1px;\n+ text-align: left;\n+ z-index: 100;\n+}\n+@keyframes countdown {\n+ from {\n+ background-color: rgb(255, 255, 0);\n+ }\n+ to {\n+ background-color: inherit;\n+ }\n+}\n+#menu {\n+ display: inline-block;\n+ font-size: 16px;\n+ color: rgb(255, 255, 255);\n+ z-index: 100;\n+}\n+#menu:hover .dropup-content {\n+ display: block;\n+}\n+#logBtn, #credentialsBtn, #reauthBtn {\n+ color: #000;\n+}\n+</style>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Change terminal style to scoped.
|
141,908
|
13.03.2021 10:32:35
| -28,800
|
13e0ecf0bec870245812b6907cff65465143f7ff
|
Support remove ssh connection.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"command\": \"mysql.connection.delete\",\n\"title\": \"%command.connection.delete%\",\n- \"category\": \"MySQL\"\n+ \"category\": \"MySQL\",\n+ \"icon\": {\n+ \"light\": \"resources/ssh/light/delete.svg\",\n+ \"dark\": \"resources/ssh/dark/delete.png\"\n+ }\n},\n{\n\"command\": \"mysql.database.add\",\n\"when\": \"view == github.cweijan.nosql && viewItem == redisKey\",\n\"group\": \"inline\"\n},\n+ {\n+ \"command\": \"mysql.connection.delete\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n+ \"group\": \"inline@0\"\n+ },\n{\n\"command\": \"mysql.ssh.connection.terminal\",\n\"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n\"ioredis\": \"^4.23.0\",\n\"json-format-highlight\": \"^1.0.4\",\n\"lodash\": \"^4.17.20\",\n+ \"lodash.defaults\": \"^4.1.0\",\n\"mysql2\": \"^2.2.5\",\n\"pg\": \"^8.5.1\",\n\"portfinder\": \"^1.0.26\",\n\"pretty-bytes\": \"^5.3.0\",\n+ \"progress-stream\": \"^2.0.0\",\n\"routington\": \"^1.0.3\",\n\"sqlstring\": \"^2.3.2\",\n\"ssh2\": \"0.5.4\",\n\"umy-table\": \"1.0.8\",\n\"vue\": \"^2.6.11\",\n- \"vue-router\": \"^3.4.1\",\n- \"lodash.defaults\": \"^4.1.0\",\n- \"progress-stream\": \"^2.0.0\"\n+ \"vue-router\": \"^3.4.1\"\n},\n\"__metadata\": {\n\"id\": \"38c08d09-caa0-4988-8ffb-bcbd51f86e55\",\n"
},
{
"change_type": "ADD",
"old_path": "resources/ssh/dark/delete.png",
"new_path": "resources/ssh/dark/delete.png",
"diff": "Binary files /dev/null and b/resources/ssh/dark/delete.png differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/ssh/light/delete.svg",
"diff": "+<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->\n+<svg version=\"1.1\" id=\"Capa_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"\n+ viewBox=\"0 0 384 384\" style=\"enable-background:new 0 0 384 384;\" xml:space=\"preserve\">\n+<g>\n+ <g>\n+ <g>\n+ <path d=\"M64,341.333C64,364.907,83.093,384,106.667,384h170.667C300.907,384,320,364.907,320,341.333v-256H64V341.333z\"/>\n+ <polygon points=\"266.667,21.333 245.333,0 138.667,0 117.333,21.333 42.667,21.333 42.667,64 341.333,64 341.333,21.333 \"/>\n+ </g>\n+ </g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+<g>\n+</g>\n+</svg>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -33,7 +33,7 @@ export enum ConfigKey {\nSHOW_TOTAL = \"showTotal\",\n}\n-export enum CommandKey {\n+export enum CodeCommand {\nRecordHistory = \"mysql.history.record\",\nRefresh = \"mysql.refresh\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "\"use strict\";\nimport * as vscode from \"vscode\";\n-import { CommandKey } from \"./common/constants\";\n+import { CodeCommand } from \"./common/constants\";\nimport { ConnectionNode } from \"./model/database/connectionNode\";\nimport { SchemaNode } from \"./model/database/schemaNode\";\nimport { UserGroup } from \"./model/database/userGroup\";\n@@ -60,7 +60,7 @@ export function activate(context: vscode.ExtensionContext) {\n...initCommand({\n// util\n...{\n- [CommandKey.Refresh]: async (node: Node) => {\n+ [CodeCommand.Refresh]: async (node: Node) => {\nif (node) {\nawait node.getChildren(true)\n} else {\n@@ -68,7 +68,7 @@ export function activate(context: vscode.ExtensionContext) {\n}\nDbTreeDataProvider.refresh(node)\n},\n- [CommandKey.RecordHistory]: (sql: string, costTime: number) => {\n+ [CodeCommand.RecordHistory]: (sql: string, costTime: number) => {\nserviceManager.historyService.recordHistory(sql, costTime);\n},\n\"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/connectionProvider.ts",
"new_path": "src/model/ssh/connectionProvider.ts",
"diff": "-import { CommandKey } from '@/common/constants';\n+import { CodeCommand } from '@/common/constants';\nimport { ClientManager } from '@/service/ssh/clientManager';\nimport * as path from 'path';\nimport * as vscode from 'vscode';\n@@ -24,7 +24,7 @@ export default class ConnectionProvider {\nif (err) {\nvscode.window.showErrorMessage(err.message)\n} else {\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\nvscode.window.showInformationMessage(\"Update to remote success!\")\n}\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/fileNode.ts",
"new_path": "src/model/ssh/fileNode.ts",
"diff": "-import { CommandKey, Constants, ModelType } from '@/common/constants';\n+import { CodeCommand, Constants, ModelType } from '@/common/constants';\nimport { FileManager, FileModel } from '@/common/filesManager';\nimport { ClientManager } from '@/service/ssh/clientManager';\nimport { createWriteStream } from 'fs';\n@@ -41,7 +41,7 @@ export class FileNode extends Node {\nif (err) {\nvscode.window.showErrorMessage(err.message)\n} else {\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n}\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/sshConnectionNode.ts",
"new_path": "src/model/ssh/sshConnectionNode.ts",
"diff": "-import { CommandKey, Constants, ModelType } from \"@/common/constants\";\n+import { CodeCommand, Constants, ModelType } from \"@/common/constants\";\nimport { FileManager, FileModel } from \"@/common/filesManager\";\nimport { Util } from \"@/common/util\";\nimport { ClientManager } from \"@/service/ssh/clientManager\";\n@@ -9,7 +9,7 @@ import { createReadStream, statSync } from \"fs\";\nimport * as path from \"path\";\nimport { FileEntry } from \"ssh2-streams\";\nimport * as vscode from \"vscode\";\n-import { Node } from \"../interface/node\";\n+import { CommandKey, Node } from \"../interface/node\";\nimport { SSHConfig } from \"../interface/sshConfig\";\nimport { InfoNode } from \"../other/infoNode\";\nimport { FileNode } from \"./fileNode\";\n@@ -22,7 +22,7 @@ export class SSHConnectionNode extends Node {\nfullPath: string;\nprivate terminalService: TerminalService = new XtermTerminal();\n- constructor(readonly sshConfig: SSHConfig, readonly name: string, readonly file?: FileEntry, readonly parentName?: string, iconPath?: string) {\n+ constructor(readonly key:string,readonly sshConfig: SSHConfig, readonly name: string, readonly file?: FileEntry, readonly parentName?: string, iconPath?: string) {\nsuper(name);\nthis.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed\nthis.fullPath = this.parentName + this.name;\n@@ -43,6 +43,14 @@ export class SSHConnectionNode extends Node {\n}\n}\n+ public async deleteConnection(context: vscode.ExtensionContext) {\n+\n+ Util.confirm(`Are you want to Delete Connection ${this.label} ? `, async () => {\n+ this.indent({ command: CommandKey.delete })\n+ })\n+\n+ }\n+\npublic copyIP() {\nUtil.copyToBoard(this.sshConfig.host)\n}\n@@ -71,7 +79,7 @@ export class SSHConnectionNode extends Node {\nif (err) {\nvscode.window.showErrorMessage(err.message)\n} else {\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n}\n})\n} else {\n@@ -88,7 +96,7 @@ export class SSHConnectionNode extends Node {\nif (err) {\nvscode.window.showErrorMessage(err.message)\n} else {\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n}\n})\n} else {\n@@ -159,7 +167,7 @@ export class SSHConnectionNode extends Node {\nif (err) {\nvscode.window.showErrorMessage(err.message)\n} else {\n- vscode.commands.executeCommand(CommandKey.Refresh)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n}\n})\n}\n@@ -202,7 +210,7 @@ export class SSHConnectionNode extends Node {\nfor (const entry of entryList) {\nif (entry.longname.startsWith(\"d\")) {\n- folderList.push(new SSHConnectionNode(this.sshConfig, entry.filename, entry, parentName))\n+ folderList.push(new SSHConnectionNode(this.key,this.sshConfig, entry.filename, entry, parentName))\n} else if (entry.longname.startsWith(\"l\")) {\nfileList.push(new LinkNode(entry.filename))\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -111,7 +111,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\n} else if (connectInfo.dbType == DatabaseType.REDIS) {\nnode = new RedisConnectionNode(key, connectInfo)\n} else if (connectInfo.dbType == DatabaseType.SSH) {\n- node = new SSHConnectionNode(connectInfo.ssh,connectInfo.name)\n+ node = new SSHConnectionNode(key,connectInfo.ssh,connectInfo.name)\n} else {\nnode = new ConnectionNode(key, connectInfo)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "\"use strict\";\nimport * as vscode from \"vscode\";\n-import { CommandKey, ConfigKey, Cursor, DatabaseType, MessageType } from \"../common/constants\";\n+import { CodeCommand, ConfigKey, Cursor, DatabaseType, MessageType } from \"../common/constants\";\nimport { Global } from \"../common/global\";\nimport { Console } from \"../common/Console\";\nimport { FileManager, FileModel } from \"../common/filesManager\";\n@@ -86,7 +86,7 @@ export class QueryUnit {\n}\nconst costTime = new Date().getTime() - executeTime;\nif (fromEditor) {\n- vscode.commands.executeCommand(CommandKey.RecordHistory, sql, costTime);\n+ vscode.commands.executeCommand(CodeCommand.RecordHistory, sql, costTime);\n}\nif (data.affectedRows) {\nQueryPage.send({ connection: connectionNode, type: MessageType.DML, queryOption, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse });\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support remove ssh connection.
|
141,908
|
13.03.2021 10:55:20
| -28,800
|
9509cc43c954cd242dcb89ae8bf960d0df40aadb
|
Support show mysql procedure last response.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -97,9 +97,11 @@ export class QueryUnit {\n// query result or multi statement.\nif (Array.isArray(data)) {\n// not query result\n- if (data[1] && (\n- data[1].__proto__.constructor.name == \"array\" || data[1].__proto__.constructor.name == \"OkPacket\" || data[1].__proto__.constructor.name == \"ResultSetHeader\")\n- ) {\n+ const lastEle = data[data.length - 1]\n+ if (lastEle && lastEle.__proto__.constructor.name == \"ResultSetHeader\") {\n+ data = data[data.length - 2]\n+ fields = fields[fields.length - 2] as any as FieldInfo[]\n+ } else if (lastEle && (lastEle.__proto__.constructor.name == \"array\" || lastEle.__proto__.constructor.name == \"OkPacket\")) {\nQueryPage.send({ connection: connectionNode, type: MessageType.MESSAGE, queryOption, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\nreturn;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show mysql procedure last response.
|
141,908
|
13.03.2021 11:27:14
| -28,800
|
e7b137cd55299b4cf0181cbc2bab28cce3c38bec
|
Remove diagram node.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"%command.name.copy%\",\n\"category\": \"MySQL\"\n},\n- {\n- \"command\": \"mysql.diagram.add\",\n- \"title\": \"%command.diagram.add%\",\n- \"icon\": {\n- \"light\": \"resources/light/add.svg\",\n- \"dark\": \"resources/dark/add.svg\"\n- },\n- \"category\": \"MySQL\"\n- },\n{\n\"command\": \"mysql.query.add\",\n\"title\": \"%command.query.add%\",\n\"title\": \"%command.query.rename%\",\n\"category\": \"MySQL\"\n},\n- {\n- \"command\": \"mysql.diagram.open\",\n- \"title\": \"%command.diagram.open%\",\n- \"category\": \"MySQL\"\n- },\n- {\n- \"command\": \"mysql.diagram.drop\",\n- \"title\": \"%command.diagram.drop%\",\n- \"category\": \"MySQL\",\n- \"icon\": \"resources/icon/criss-cross.svg\"\n- },\n{\n\"command\": \"mysql.connection.add\",\n\"title\": \"%command.connection.add%\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == connection\",\n\"group\": \"2_mysql@0\"\n},\n- {\n- \"command\": \"mysql.diagram.add\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == diagramGroup\",\n- \"group\": \"2_mysql@0\"\n- },\n{\n\"command\": \"mysql.query.add\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == queryGroup\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == connection\",\n\"group\": \"inline@0\"\n},\n- {\n- \"command\": \"mysql.diagram.add\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == diagramGroup\",\n- \"group\": \"inline@0\"\n- },\n{\n\"command\": \"mysql.query.add\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == queryGroup\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == view\",\n\"group\": \"1_mysql@1\"\n},\n- {\n- \"command\": \"mysql.diagram.drop\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem == diagram\",\n- \"group\": \"inline@0\"\n- },\n{\n\"command\": \"mysql.refresh\",\n\"when\": \"view =~ /cweijan.+?ql/ && viewItem == procedureGroup\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -23,8 +23,6 @@ import { ServiceManager } from \"./service/serviceManager\";\nimport { QueryUnit } from \"./service/queryUnit\";\nimport { FileManager } from \"./common/filesManager\";\nimport { ConnectionManager } from \"./service/connectionManager\";\n-import { DiagramNode } from \"./model/diagram/diagramNode\";\n-import { DiagramGroup } from \"./model/diagram/diagramGroup\";\nimport { QueryNode } from \"./model/query/queryNode\";\nimport { QueryGroup } from \"./model/query/queryGroup\";\nimport { Node } from \"./model/interface/node\";\n@@ -173,18 +171,6 @@ export function activate(context: vscode.ExtensionContext) {\nuserNode.selectSqlTemplate();\n},\n},\n- // diagram node\n- ...{\n- \"mysql.diagram.add\": (diagramNode: DiagramGroup) => {\n- diagramNode.openAdd()\n- },\n- \"mysql.diagram.open\": (node: DiagramNode) => {\n- node.open()\n- },\n- \"mysql.diagram.drop\": (node: DiagramNode) => {\n- node.drop()\n- },\n- },\n// query node\n...{\n\"mysql.runQuery\": (sql) => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Remove diagram node.
|
141,908
|
29.03.2021 10:55:31
| -28,800
|
e7eb28b31dc2d2762d3c6b6d3a02b6a663a1c355
|
Ssh connection node support show name.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"view/item/context\": [\n{\n\"command\": \"mysql.refresh\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(catalog|esConnection|redisConnection|connection|tableGroup|viewGroup|systemViewGroup|triggerGroup|procedureGroup|functionGroup|table)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(catalog|esConnection|sshConnection|redisConnection|connection|tableGroup|viewGroup|systemViewGroup|triggerGroup|procedureGroup|functionGroup|table)$/\",\n\"group\": \"inline@-2\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ssh/sshConnectionNode.ts",
"new_path": "src/model/ssh/sshConnectionNode.ts",
"diff": "@@ -26,12 +26,11 @@ export class SSHConnectionNode extends Node {\nsuper(name);\nthis.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed\nthis.fullPath = this.parentName + this.name;\n- if(!name){\n- this.label=`${sshConfig.username}@${sshConfig.host}`\n- }\nif (!file) {\nthis.contextValue = ModelType.SSH_CONNECTION;\nthis.iconPath = path.join(Constants.RES_PATH, \"ssh/chain.svg\");\n+ this.label=`${sshConfig.username}@${sshConfig.host}`\n+ this.description=this.name\n} else {\nthis.contextValue = ModelType.FOLDER;\nthis.iconPath = path.join(Constants.RES_PATH, \"ssh/folder.svg\");\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Ssh connection node support show name.
|
141,908
|
29.03.2021 10:59:18
| -28,800
|
f2a5e1c51c7b2deef2d6e6845aea018f19db1445
|
Drop table without schema.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -92,7 +92,7 @@ export class TableNode extends Node implements CopyAble {\npublic dropTable() {\nUtil.confirm(`Are you want to drop table ${this.table} ? `, async () => {\n- this.execute(`DROP TABLE ${this.schema}.${this.wrap(this.table)}`).then(() => {\n+ this.execute(`DROP TABLE ${this.wrap(this.table)}`).then(() => {\nthis.parent.setChildCache(null)\nDbTreeDataProvider.refresh(this.parent);\nvscode.window.showInformationMessage(`Drop table ${this.table} success!`);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Drop table without schema.
|
141,908
|
29.03.2021 11:09:32
| -28,800
|
3324a2fe1578991c7aa092c1bdca1f0d13c8faaf
|
Support show mysql import result.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/Console.ts",
"new_path": "src/common/Console.ts",
"diff": "@@ -9,7 +9,13 @@ export class Console {\n}\nthis.outputChannel.show(true);\nconst begin = format('yyyy-MM-dd hh:mm:ss', new Date());\n- this.outputChannel.appendLine(`${begin} : ${value}`);\n+ this.outputChannel.appendLine(`${begin} ${value}`);\n+ }\n+\n+ public static ling(){\n+ if (this.outputChannel == null) {\n+ this.outputChannel = vscode.window.createOutputChannel(\"MySQL\");\n+ }\nthis.outputChannel.appendLine(\"-----------------------------------------------------------------------------------------\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/import/mysqlImportService.ts",
"new_path": "src/service/import/mysqlImportService.ts",
"diff": "@@ -15,14 +15,11 @@ export class MysqlImportService extends ImportService {\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\nconst command = `mysql -h ${host} -P ${port} -u ${node.user} ${node.password ? `-p${node.password}` : \"\"} ${node.schema || \"\"} < ${importPath}`\nConsole.log(`Executing: ${command.replace(/-p.+? /, \"-p****** \")}`);\n- exec(command, (err,stdout,stderr) => {\n- if (err) {\n- Console.log(err);\n- }else if(stderr){\n- Console.log(stderr);\n- } else {\n- Console.log(`Import Success!`);\n- }\n+ const cp=exec(command, (err,stdout,stderr) => {\n+ Console.log(err||stdout||stderr);\n+ })\n+ cp.on(\"close\",(code,singal)=>{\n+ Console.log(code===0?'Import Done.':\"Import Occur Error!\");\n})\n} else {\nsuper.importSql(importPath,node)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show mysql import result.
|
141,908
|
29.03.2021 11:20:03
| -28,800
|
2a02d91ce30a16101053c568a17970bd22d63d88
|
Mysql dump add header, fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dump/dumpService.ts",
"new_path": "src/service/dump/dumpService.ts",
"diff": "@@ -12,6 +12,7 @@ import { ConfigKey, ModelType } from \"@/common/constants\";\nimport { Util } from \"@/common/util\";\nimport mysqldump, { Options } from './mysql/main';\nimport { Global } from \"@/common/global\";\n+import { SchemaNode } from \"@/model/database/schemaNode\";\nexport class DumpService {\n@@ -64,7 +65,7 @@ export class DumpService {\nconst option: Options = {\ndump: {\n- withDatabase: items.length != 1,\n+ withDatabase: node instanceof SchemaNode,\ntables, viewList, procedureList, functionList, triggerList\n},\ndumpToFile: dumpFilePath,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "@@ -8,6 +8,7 @@ import { getProcedureDump } from './getProcedureDump';\nimport { getTableDump } from './getTableDump';\nimport { getTriggerDump } from './getTriggerDump';\nimport { getViewDump } from './getViewDump';\n+import { HEADER_VARIABLES, FOOTER_VARIABLES } from './sessionVariables';\nimport {\nCompletedOptions, Options\n} from './interfaces/Options';\n@@ -45,18 +46,26 @@ const defaultOptions: Options = {\ndumpToFile: null,\n};\n+function isMysql(node: Node) {\n+ return node.dbType != DatabaseType.PG && node.dbType != DatabaseType.MSSQL;\n+}\n+\n+\nexport default async function main(inputOptions: Options, node: Node): Promise<void> {\nconst options = merge([defaultOptions, inputOptions]) as CompletedOptions;\n// write to the destination file (clear it)\n- if (options.dumpToFile) {\nfs.writeFileSync(options.dumpToFile, '');\n+\n+ // write the initial headers\n+ if (isMysql(node)) {\n+ fs.appendFileSync(options.dumpToFile, `${HEADER_VARIABLES}\\n`);\n}\n- if (options.dumpToFile && node.database && options.dump.withDatabase && node.dbType!=DatabaseType.PG && node.dbType!=DatabaseType.MSSQL) {\n- fs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ ${node.database} /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\n-USE ${node.database};\\n\\n`);\n+ if (node.schema && options.dump.withDatabase && isMysql(node)) {\n+ fs.appendFileSync(options.dumpToFile, `CREATE DATABASE /*!32312 IF NOT EXISTS*/ ${node.schema} /*!40100 DEFAULT CHARACTER SET utf8mb4 */;\n+USE ${node.schema};\\n\\n`);\n}\nconst sessionId = new Date().getTime() + \"\"\n@@ -91,6 +100,11 @@ USE ${node.database};\\n\\n`);\nfs.appendFileSync(options.dumpToFile, `${triggerDatas}\\n\\n`);\n}\n+ // reset all of the variables\n+ if (isMysql(node)) {\n+ fs.appendFileSync(options.dumpToFile, FOOTER_VARIABLES);\n+ }\n+\n}\n// a hacky way to make the package work with both require and ES modules\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dump/mysql/sessionVariables.ts",
"diff": "+// a bunch of session variables we use to make the import work smoothly\n+const HEADER_VARIABLES = [\n+ // Add commands to store the client encodings used when importing and set to UTF8 to preserve data\n+ '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;',\n+ '/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;',\n+ '/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;',\n+ '/*!40101 SET NAMES utf8 */;',\n+ // Add commands to disable foreign key checks\n+ '/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;',\n+ \"/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;\",\n+ '/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;',\n+ '',\n+].join('\\n');\n+const FOOTER_VARIABLES = [\n+ '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;',\n+ '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;',\n+ '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;',\n+ '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;',\n+ '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;',\n+ '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;',\n+ '',\n+].join('\\n');\n+\n+export { HEADER_VARIABLES, FOOTER_VARIABLES };\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Mysql dump add header, fix #149.
|
141,908
|
29.03.2021 11:25:24
| -28,800
|
e37f3132b8feca670a420ec2de5436d14eed45e6
|
Version 3.6.1, fix fix
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.6.0\",\n+ \"version\": \"3.6.1\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.6.1, fix #148, fix #142.
|
141,908
|
29.03.2021 12:00:44
| -28,800
|
87901273516ec2b7f0df53902d4389e6b4ee9a2f
|
Show column type, fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</ux-table-column>\n<ux-table-column v-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\" v-for=\"(field,index) in result.fields\" :key=\"index\" :resizable=\"true\" :field=\"field.name\" :title=\"field.name\" :sortable=\"true\" :width=\"computeWidth(field.name,0,index,toolbar.filter[field.name])\" edit-render>\n<template slot=\"header\" slot-scope=\"scope\">\n- <el-tooltip class=\"item\" effect=\"dark\" :content=\"(result.columnList[index]&&result.columnList[index].comment)?result.columnList[index].comment:scope.column.title\" placement=\"left-start\">\n+ <el-tooltip class=\"item\" effect=\"dark\" :content=\"getTip(result.columnList[index],scope.column)\" placement=\"left-start\">\n<span>\n<span v-if=\"result.columnList[index]&& (result.columnList[index].nullable != 'YES')\" style=\"color: #f94e4e; position: relative; top: .2em;\">\n*\n@@ -251,6 +251,10 @@ export default {\n});\n},\nmethods: {\n+ getTip(column,scopeColumn){\n+ if(!column)return scopeColumn.title\n+ return column.type;\n+ },\neditListen(event, scope) {\nconst { row, column, rowIndex } = scope;\nconst editList = this.update.editList;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Show column type, fix #150.
|
141,908
|
29.03.2021 12:25:06
| -28,800
|
d9fe1721716f0a076fc28ad2650bf34880ff9ca9
|
Update hover.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -253,7 +253,8 @@ export default {\nmethods: {\ngetTip(column,scopeColumn){\nif(!column)return scopeColumn.title\n- return column.type;\n+\n+ return `${column.type}${column.comment?`#${column.comment}`:\"\"}`\n},\neditListen(event, scope) {\nconst { row, column, rowIndex } = scope;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update hover.
|
141,908
|
29.03.2021 12:43:34
| -28,800
|
188a5b3342759adeaa3af8b478483fe2b28c95f5
|
Support delete redis folder, fix
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.redis.key.del\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == redisKey\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /^(redisKey|redisFolder)$/\",\n\"group\": \"inline\"\n},\n{\n},\n{\n\"command\": \"mysql.ssh.file.delete\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /^(folder|file|redisFolder)$/\",\n\"group\": \"folder@4\"\n},\n+\n{\n\"command\": \"mysql.ssh.file.download\",\n\"when\": \"view == github.cweijan.nosql && viewItem == file\",\n\"group\": \"file@1\"\n- },\n- {\n- \"command\": \"mysql.ssh.file.delete\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == file\",\n- \"group\": \"file@2\"\n}\n]\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/folderNode.ts",
"new_path": "src/model/redis/folderNode.ts",
"diff": "import { Constants, ModelType } from \"@/common/constants\";\n+import { Util } from \"@/common/util\";\nimport { Node } from \"@/model/interface/node\";\nimport * as path from \"path\";\nimport KeyNode from \"./keyNode\";\n@@ -36,5 +37,15 @@ export class FolderNode extends RedisBaseNode {\n})\n}\n+ public async delete() {\n+ Util.confirm(`Are you want delete folder ${this.label} ? `, async () => {\n+ const client = await this.getClient();\n+ for (const child of this.childens) {\n+ await client.del(child)\n+ }\n+ this.provider.reload()\n+ })\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/redis/keyNode.ts",
"new_path": "src/model/redis/keyNode.ts",
"diff": "import { Constants, ModelType, RedisType } from \"@/common/constants\";\n+import { Util } from \"@/common/util\";\nimport { ViewManager } from \"@/common/viewManager\";\nimport { Node } from \"@/model/interface/node\";\nimport * as path from \"path\";\n@@ -29,9 +30,11 @@ export default class KeyNode extends RedisBaseNode {\n}\npublic async delete() {\n+ Util.confirm(`Are you want delete key ${this.label} ? `, async () => {\nconst client = await this.getClient();\nawait client.del(this.label)\nthis.provider.reload()\n+ })\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support delete redis folder, fix #143
|
141,908
|
29.03.2021 12:51:01
| -28,800
|
3eae5a6ff5183f83ea7a3db62d5e67de35aca764
|
Version 3.6.4.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.6.1\",\n+ \"version\": \"3.6.4\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.6.4.
|
141,908
|
29.03.2021 14:16:34
| -28,800
|
b769aa0e7d21b6e919a2072933a345a29cc4787c
|
Dump header only append with database dump.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "@@ -59,7 +59,7 @@ export default async function main(inputOptions: Options, node: Node): Promise<v\nfs.writeFileSync(options.dumpToFile, '');\n// write the initial headers\n- if (isMysql(node)) {\n+ if (node.schema && options.dump.withDatabase && isMysql(node)) {\nfs.appendFileSync(options.dumpToFile, `${HEADER_VARIABLES}\\n`);\n}\n@@ -101,7 +101,7 @@ USE ${node.schema};\\n\\n`);\n}\n// reset all of the variables\n- if (isMysql(node)) {\n+ if (node.schema && options.dump.withDatabase && isMysql(node)) {\nfs.appendFileSync(options.dumpToFile, FOOTER_VARIABLES);\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Dump header only append with database dump.
|
141,908
|
29.03.2021 16:44:10
| -28,800
|
d0fcfdc84005dc645efc740d3307ca49c861ab64
|
Init ftp support.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"when\": \"view == github.cweijan.nosql && viewItem =~ /^(folder|file|redisFolder)$/\",\n\"group\": \"folder@4\"\n},\n-\n{\n\"command\": \"mysql.ssh.file.download\",\n\"when\": \"view == github.cweijan.nosql && viewItem == file\",\n\"xterm-addon-search-bar\": \"^0.2.0\"\n},\n\"dependencies\": {\n+ \"@types/ftp\": \"^0.3.31\",\n\"axios\": \"^0.21.1\",\n\"command-exists\": \"^1.2.9\",\n\"comment-json\": \"^4.1.0\",\n\"date-format\": \"^3.0.0\",\n\"deepmerge\": \"^3.2.0\",\n\"element-ui\": \"^2.13.2\",\n+ \"ftp\": \"^0.3.10\",\n\"ioredis\": \"^4.23.0\",\n\"json-format-highlight\": \"^1.0.4\",\n\"lodash\": \"^4.17.20\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -52,15 +52,18 @@ export enum Confirm {\nexport enum DatabaseType {\nMYSQL = \"MySQL\", PG = \"PostgreSQL\",\nMSSQL = \"SqlServer\", ORACLE = \"Oracle\",\n- ES = \"ElasticSearch\", REDIS = \"Redis\",SSH=\"SSH\"\n+ ES = \"ElasticSearch\", REDIS = \"Redis\",SSH=\"SSH\",FTP=\"FTP\"\n}\nexport enum ModelType {\n+ /**\n+ * ftp\n+ */\n+ FTP_CONNECTION=\"ftpConnection\", FTP_FOLDER = 'ftpFolder', FTP_FILE = \"ftp_file\",FTP_Link = \"ftp_link\",\n/**\n* ssh\n*/\n- SSH_CONNECTION=\"sshConnection\",\n- FOLDER = 'folder', FILE = \"file\",Link = \"link\",\n+ SSH_CONNECTION=\"sshConnection\", FOLDER = 'folder', FILE = \"file\",Link = \"link\",\n/**\n* redis\n*/\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/ftp/ftpBaseNode.ts",
"diff": "+import { FTPConnection } from \"@/service/connect/ftpConnection\";\n+import { ConnectionManager } from \"@/service/connectionManager\";\n+import * as Client from \"ftp\";\n+import { Node } from \"../interface/node\";\n+\n+export class FtpBaseNode extends Node {\n+\n+ constructor(label: string) {\n+ super(label)\n+ }\n+\n+ public async getClient(): Promise<Client> {\n+ const ftpConnection = await ConnectionManager.getConnection(this.parent) as FTPConnection\n+ return ftpConnection.getClient()\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/ftp/ftpConnectionNode.ts",
"diff": "+import { CodeCommand, Constants, ModelType } from \"@/common/constants\";\n+import { FileManager, FileModel } from \"@/common/filesManager\";\n+import { Util } from \"@/common/util\";\n+import * as path from \"path\";\n+import * as vscode from \"vscode\";\n+import { CommandKey, Node } from \"../interface/node\";\n+import { InfoNode } from \"../other/infoNode\";\n+import { FtpBaseNode } from \"./ftpBaseNode\";\n+import { FTPFileNode } from \"./ftpFileNode\";\n+import prettyBytes = require(\"pretty-bytes\");\n+import Client = require(\"ftp\");\n+var progressStream = require('progress-stream');\n+\n+export class FTPConnectionNode extends FtpBaseNode {\n+\n+ fullPath: string = \"/\";\n+ contextValue = ModelType.FTP_CONNECTION\n+ constructor(readonly key: string, readonly parent: Node, private file?: Client.ListingElement) {\n+ super(key);\n+ this.contextValue = this.file ? ModelType.FTP_FOLDER : ModelType.FTP_CONNECTION;\n+ this.init(parent)\n+ this.iconPath = path.join(Constants.RES_PATH, this.file ? \"ssh/folder.svg\" : \"ssh/chain.svg\");\n+ if (file) {\n+ this.fullPath = (parent as FTPConnectionNode).fullPath + key + \"/\"\n+ } else {\n+ this.description = this.name\n+ }\n+ }\n+\n+ public async deleteConnection(context: vscode.ExtensionContext) {\n+\n+ Util.confirm(`Are you want to Delete Connection ${this.label} ? `, async () => {\n+ this.indent({ command: CommandKey.delete })\n+ })\n+\n+ }\n+\n+ getChildren(): Promise<Node[]> {\n+\n+ return new Promise(async (resolve, reject) => {\n+ const client = await this.getClient()\n+ client.list(this.fullPath, (err, list) => {\n+ if (err) {\n+ resolve([new InfoNode(err.message)]);\n+ } else if (list.length == 0) {\n+ resolve([new InfoNode(\"There are no files in this folder.\")]);\n+ } else {\n+ resolve(this.build(list))\n+ }\n+ });\n+ })\n+\n+ }\n+\n+\n+\n+\n+ public copyIP() {\n+ Util.copyToBoard(this.host)\n+ }\n+\n+ public newFile(): any {\n+ vscode.window.showInputBox().then(async input => {\n+ if (input) {\n+ const client = await this.getClient()\n+ const tempPath = await FileManager.record(\"temp/\" + input, \"\", FileModel.WRITE);\n+ const targetPath = this.fullPath + \"/\" + input;\n+ client.put(tempPath, targetPath, err => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n+ }\n+ })\n+ }\n+ })\n+ }\n+\n+ public newFolder(): any {\n+ vscode.window.showInputBox().then(async input => {\n+ if (input) {\n+ const client = await this.getClient()\n+ client.mkdir(this.fullPath + \"/\" + input, err => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n+ }\n+ })\n+ }\n+ })\n+ }\n+\n+ upload(): any {\n+ vscode.window.showOpenDialog({ canSelectFiles: true, canSelectMany: false, canSelectFolders: false, openLabel: \"Select Upload Path\" })\n+ .then(async uri => {\n+ if (uri) {\n+ const client = await this.getClient()\n+ const targetPath = uri[0].fsPath;\n+ const start = new Date()\n+ vscode.window.showInformationMessage(`Start uploading ${targetPath}.`)\n+ client.put(targetPath, this.fullPath + \"/\" + path.basename(targetPath), err => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ vscode.window.showInformationMessage(`Upload ${this.fullPath} success, cost time: ${new Date().getTime() - start.getTime()}`)\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n+ }\n+ })\n+ }\n+ })\n+ }\n+\n+ delete(): any {\n+ vscode.window.showQuickPick([\"YES\", \"NO\"], { canPickMany: false }).then(async str => {\n+ if (str == \"YES\") {\n+ const client = await this.getClient()\n+ client.rmdir(this.fullPath, (err) => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n+ }\n+ })\n+ }\n+ })\n+ }\n+\n+\n+\n+ private build(list: Client.ListingElement[]): Node[] {\n+\n+ const folderList: Node[] = []\n+ const fileList: Node[] = []\n+\n+ for (const item of list) {\n+ if (item.type == \"d\") {\n+ folderList.push(new FTPConnectionNode(item.name, this, item))\n+ } else if (false) {\n+ // fileList.push(new LinkNode(entry.filename))\n+ } else {\n+ fileList.push(new FTPFileNode(item.name, this, item))\n+ }\n+ }\n+\n+ return [].concat(folderList.sort((a, b) => a.label.localeCompare(b.label)))\n+ .concat(fileList.sort((a, b) => a.label.localeCompare(b.label)));\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/ftp/ftpFileNode.ts",
"diff": "+import { CodeCommand, Constants, ModelType } from '@/common/constants';\n+import { FileManager, FileModel } from '@/common/filesManager';\n+import { createWriteStream } from 'fs';\n+import * as path from 'path';\n+import { extname } from 'path';\n+import * as vscode from 'vscode';\n+import { TreeItemCollapsibleState } from \"vscode\";\n+import { Node } from '../interface/node';\n+import { FtpBaseNode } from './ftpBaseNode';\n+import { FTPConnectionNode } from './ftpConnectionNode';\n+import Client = require('ftp');\n+var progressStream = require('progress-stream');\n+\n+const prettyBytes = require('pretty-bytes');\n+\n+export class FTPFileNode extends FtpBaseNode {\n+ contextValue = ModelType.FILE;\n+ fullPath: string;\n+ constructor(readonly name: string, parent: Node, private file: Client.ListingElement) {\n+ super(name)\n+ this.init(parent)\n+ this.collapsibleState = TreeItemCollapsibleState.None\n+ this.description = prettyBytes(file.size)\n+ this.iconPath = this.getIcon(this.file.name)\n+ this.fullPath = (parent as FTPConnectionNode).fullPath + this.file.name;\n+ this.command = {\n+ command: \"mysql.ssh.file.open\",\n+ arguments: [this],\n+ title: \"Open File\"\n+ }\n+ }\n+\n+ public async getChildren(): Promise<Node[]> {\n+ return [];\n+ }\n+ delete(): any {\n+ vscode.window.showQuickPick([\"YES\", \"NO\"], { canPickMany: false }).then(async str => {\n+ if (str == \"YES\") {\n+ const client = await this.getClient()\n+ client.delete(this.fullPath, (err) => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ vscode.commands.executeCommand(CodeCommand.Refresh)\n+ }\n+ })\n+ }\n+ })\n+ }\n+ async open() {\n+ if (this.file.size > 10485760) {\n+ vscode.window.showErrorMessage(\"File size except 10 MB, not support open!\")\n+ return;\n+ }\n+ const extName = path.extname(this.file.name).toLowerCase();\n+ if (extName == \".gz\" || extName == \".exe\" || extName == \".7z\" || extName == \".jar\" || extName == \".bin\" || extName == \".tar\") {\n+ vscode.window.showErrorMessage(`Not support open ${extName} file!`)\n+ return;\n+ }\n+ const client = await this.getClient()\n+ const tempPath = await FileManager.record(`temp/${this.file.name}`, null, FileModel.WRITE);\n+ // client.get(this.fullPath, tempPath, async (err) => {\n+ // if (err) {\n+ // vscode.window.showErrorMessage(err.message)\n+ // } else {\n+ // vscode.commands.executeCommand('vscode.open', vscode.Uri.file(tempPath))\n+ // }\n+ // })\n+ }\n+\n+ download(): any {\n+\n+ const extName = extname(this.file.name)?.replace(\".\", \"\");\n+ vscode.window.showSaveDialog({ defaultUri: vscode.Uri.file(this.file.name), filters: { \"Type\": [extName] }, saveLabel: \"Select Download Path\" })\n+ .then(async uri => {\n+ if (uri) {\n+ const client = await this.getClient()\n+ vscode.window.withProgress({\n+ location: vscode.ProgressLocation.Notification,\n+ title: `Start downloading ${this.fullPath}`,\n+ cancellable: true\n+ }, (progress, token) => {\n+ return new Promise((resolve) => {\n+ client.get(this.fullPath, (error, fileReadStream) => {\n+ var str = progressStream({\n+ length: this.file.size,\n+ time: 100\n+ });\n+ let before = 0;\n+ str.on(\"progress\", (progressData: any) => {\n+ if (progressData.percentage == 100) {\n+ resolve(null)\n+ vscode.window.showInformationMessage(`Download ${this.fullPath} success, cost time: ${progressData.runtime}s`, 'Open').then(action => {\n+ if (action) {\n+ vscode.commands.executeCommand('vscode.open', uri);\n+ }\n+ })\n+ return;\n+ }\n+ progress.report({ increment: progressData.percentage - before, message: `remaining : ${prettyBytes(progressData.remaining)}` });\n+ before = progressData.percentage\n+ })\n+ str.on(\"error\", err => {\n+ vscode.window.showErrorMessage(err.message)\n+ })\n+ const outStream = createWriteStream(uri.fsPath);\n+ fileReadStream.pipe(str).pipe(outStream);\n+ token.onCancellationRequested(() => {\n+ outStream.destroy()\n+ });\n+ })\n+ })\n+ })\n+ }\n+ })\n+ }\n+\n+ getIcon(fileName: string): string {\n+\n+ const extPath = `${Constants.RES_PATH}`;\n+\n+ const ext = path.extname(fileName).replace(\".\", \"\").toLowerCase()\n+ let fileIcon;\n+ switch (ext) {\n+ case 'pub': case 'pem': fileIcon = \"key.svg\"; break;\n+ case 'ts': fileIcon = \"typescript.svg\"; break;\n+ case 'log': fileIcon = \"log.svg\"; break;\n+ case 'sql': fileIcon = \"sql.svg\"; break;\n+ case 'xml': fileIcon = \"xml.svg\"; break;\n+ case 'html': fileIcon = \"html.svg\"; break;\n+ case 'java': case 'class': fileIcon = \"java.svg\"; break;\n+ case 'js': case 'map': fileIcon = \"javascript.svg\"; break;\n+ case 'yml': case 'yaml': fileIcon = \"yaml.svg\"; break;\n+ case 'json': fileIcon = \"json.svg\"; break;\n+ case 'sh': fileIcon = \"console.svg\"; break;\n+ case 'cfg': case 'conf': fileIcon = \"settings.svg\"; break;\n+ case 'rar': case 'zip': case '7z': case 'gz': case 'tar': fileIcon = \"zip.svg\"; break;\n+ default: fileIcon = \"file.svg\"; break;\n+\n+ }\n+\n+ return `${extPath}/ssh/icon/${fileIcon}`\n+ }\n+\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/ftp/linkNode.ts",
"diff": "+import { Constants, ModelType } from \"@/common/constants\";\n+import * as path from \"path\";\n+import { TreeItemCollapsibleState } from \"vscode\";\n+import { Node } from \"../interface/node\";\n+\n+export class LinkNode extends Node {\n+ contextValue = ModelType.Link;\n+ constructor(info: string) {\n+ super(info)\n+ this.iconPath={\n+ light: path.join(Constants.RES_PATH, \"ssh/light/link.svg\"),\n+ dark: path.join(Constants.RES_PATH, \"ssh/dark/link.svg\"),\n+ }\n+ this.collapsibleState = TreeItemCollapsibleState.None\n+ }\n+ getChildren(): Promise<Node[]> {\n+ return null;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "import { CatalogNode } from \"@/model/database/catalogNode\";\nimport { EsConnectionNode } from \"@/model/es/model/esConnectionNode\";\n+import { FTPConnectionNode } from \"@/model/ftp/ftpConnectionNode\";\nimport { InfoNode } from \"@/model/other/infoNode\";\nimport { RedisConnectionNode } from \"@/model/redis/redisConnectionNode\";\nimport { SSHConnectionNode } from \"@/model/ssh/sshConnectionNode\";\n@@ -112,6 +113,8 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nnode = new RedisConnectionNode(key, connectInfo)\n} else if (connectInfo.dbType == DatabaseType.SSH) {\nnode = new SSHConnectionNode(key,connectInfo.ssh,connectInfo.name)\n+ } else if (connectInfo.dbType == DatabaseType.FTP) {\n+ node = new FTPConnectionNode(key,connectInfo)\n} else {\nnode = new ConnectionNode(key, connectInfo)\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/connect/ftpConnection.ts",
"diff": "+import { Node } from \"@/model/interface/node\";\n+import EventEmitter = require(\"events\");\n+import { IConnection, queryCallback } from \"./connection\";\n+import * as Client from 'ftp'\n+\n+export class FTPConnection extends IConnection {\n+\n+ private client: Client;\n+ constructor(private node: Node) {\n+ super()\n+ this.client = new Client();\n+ }\n+\n+ public getClient():Client{\n+ return this.client;\n+ }\n+\n+ query(sql: string, callback?: queryCallback): void | EventEmitter;\n+ query(sql: string, values: any, callback?: queryCallback): void | EventEmitter;\n+ query(sql: any, values?: any, callback?: any) {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ connect(callback: (err: Error) => void): void {\n+ const client = this.client;\n+ client.on('ready', function () {\n+ callback(null)\n+ });\n+ client.on('error', (err: Error) => {\n+ callback(err)\n+ })\n+ client.on('close', () => {\n+ this.dead = true;\n+ })\n+ client.connect({\n+ host: this.node.host,\n+ port: this.node.port,\n+ user: this.node.user,\n+ password: this.node.password,\n+ secure: false,\n+ connTimeout: this.node.connectTimeout||3000,\n+ pasvTimeout: this.node.requestTimeout\n+ });\n+ }\n+ beginTransaction(callback: (err: Error) => void): void {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ rollback(): void {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ commit(): void {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ end(): void {\n+ }\n+ isAlive(): boolean {\n+ return true;\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": "@@ -15,6 +15,7 @@ import { MSSqlConnnection } from \"./connect/mssqlConnection\";\nimport { MysqlConnection } from \"./connect/mysqlConnection\";\nimport { PostgreSqlConnection } from \"./connect/postgreSqlConnection\";\nimport { RedisConnection } from \"./connect/redisConnection\";\n+import { FTPConnection } from \"./connect/ftpConnection\";\ninterface ConnectionWrapper {\nconnection: IConnection;\n@@ -149,6 +150,8 @@ export class ConnectionManager {\nreturn new EsConnection(opt);\ncase DatabaseType.REDIS:\nreturn new RedisConnection(opt);\n+ case DatabaseType.FTP:\n+ return new FTPConnection(opt);\n}\nreturn new MysqlConnection(opt)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "@@ -216,7 +216,8 @@ export default {\n\"SqlServer\",\n\"ElasticSearch\",\n\"Redis\",\n- \"SSH\"\n+ \"SSH\",\n+ \"FTP\"\n],\nconnect: {\nloading: false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init ftp support.
|
141,908
|
29.03.2021 17:10:01
| -28,800
|
8cd16cf1d17d85ce5cc5cf60af05b1e4af42cec8
|
Bind command to ftp node.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.connection.edit\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection|ftpConnection)$/\",\n\"group\": \"1_mysql@2\"\n},\n{\n\"command\": \"mysql.connection.disable\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection|ftpConnection)$/\",\n\"group\": \"1_mysql@4\"\n},\n{\n},\n{\n\"command\": \"mysql.refresh\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection|ftpConnection)$/\",\n\"group\": \"2_mysql@1\"\n},\n{\n},\n{\n\"command\": \"mysql.connection.delete\",\n- \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection)$/\",\n+ \"when\": \"view =~ /cweijan.+?ql/ && viewItem =~ /^(connection|esConnection|redisConnection|ftpConnection)$/\",\n\"group\": \"10mysql@2\"\n},\n{\n},\n{\n\"command\": \"mysql.connection.delete\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(sshConnection|ftpConnection)/\",\n\"group\": \"inline@0\"\n},\n{\n},\n{\n\"command\": \"mysql.ssh.host.copy\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(sshConnection|ftpConnection)/\",\n\"group\": \"0_connection@-2\"\n},\n{\n},\n{\n\"command\": \"mysql.ssh.file.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(sshConnection|ftpConnection)/\",\n\"group\": \"2_connection@2\"\n},\n{\n\"command\": \"mysql.ssh.folder.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == sshConnection \",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(sshConnection|ftpConnection)/\",\n\"group\": \"2_connection@4\"\n},\n{\n},\n{\n\"command\": \"mysql.ssh.file.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(folder|ftpFolder)/\",\n\"group\": \"folder@0\"\n},\n{\n\"command\": \"mysql.ssh.folder.new\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == folder \",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(folder|ftpFolder)/\",\n\"group\": \"folder@1\"\n},\n{\n\"command\": \"mysql.ssh.file.upload\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == folder\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(folder|ftpFolder)/\",\n\"group\": \"folder@2\"\n},\n{\n\"command\": \"mysql.ssh.file.delete\",\n- \"when\": \"view == github.cweijan.nosql && viewItem =~ /^(folder|file|redisFolder)$/\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /^(folder|ftpFolder|file|ftpFile|redisFolder)$/\",\n\"group\": \"folder@4\"\n},\n{\n\"command\": \"mysql.ssh.file.download\",\n- \"when\": \"view == github.cweijan.nosql && viewItem == file\",\n+ \"when\": \"view == github.cweijan.nosql && viewItem =~ /(file|ftpFile)/\",\n\"group\": \"file@1\"\n}\n]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -59,7 +59,7 @@ export enum ModelType {\n/**\n* ftp\n*/\n- FTP_CONNECTION=\"ftpConnection\", FTP_FOLDER = 'ftpFolder', FTP_FILE = \"ftp_file\",FTP_Link = \"ftp_link\",\n+ FTP_CONNECTION=\"ftpConnection\", FTP_FOLDER = 'ftpFolder', FTP_FILE = \"ftpFile\",FTP_Link = \"ftpLink\",\n/**\n* ssh\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -37,6 +37,7 @@ import { DiffService } from \"./service/diff/diffService\";\nimport { DatabaseCache } from \"./service/common/databaseCache\";\nimport { FileNode } from \"./model/ssh/fileNode\";\nimport { SSHConnectionNode } from \"./model/ssh/sshConnectionNode\";\n+import { FTPFileNode } from \"./model/ftp/ftpFileNode\";\nexport function activate(context: vscode.ExtensionContext) {\n@@ -132,7 +133,7 @@ export function activate(context: vscode.ExtensionContext) {\n'mysql.ssh.path.copy': (node: Node) => node.copyName(),\n'mysql.ssh.socks.port': (parentNode: SSHConnectionNode) => parentNode.startSocksProxy(),\n'mysql.ssh.file.delete': (fileNode: FileNode | SSHConnectionNode) => fileNode.delete(),\n- 'mysql.ssh.file.open': (fileNode: FileNode) => fileNode.open(),\n+ 'mysql.ssh.file.open': (fileNode: FileNode|FTPFileNode) => fileNode.open(),\n'mysql.ssh.file.download': (fileNode: FileNode) => fileNode.download(),\n},\n// database\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ftp/ftpConnectionNode.ts",
"new_path": "src/model/ftp/ftpConnectionNode.ts",
"diff": "@@ -38,6 +38,7 @@ export class FTPConnectionNode extends FtpBaseNode {\ngetChildren(): Promise<Node[]> {\nreturn new Promise(async (resolve, reject) => {\n+ try {\nconst client = await this.getClient()\nclient.list(this.fullPath, (err, list) => {\nif (err) {\n@@ -48,6 +49,9 @@ export class FTPConnectionNode extends FtpBaseNode {\nresolve(this.build(list))\n}\n});\n+ } catch (error) {\n+ reject(error)\n+ }\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/ftp/ftpFileNode.ts",
"new_path": "src/model/ftp/ftpFileNode.ts",
"diff": "@@ -59,13 +59,15 @@ export class FTPFileNode extends FtpBaseNode {\n}\nconst client = await this.getClient()\nconst tempPath = await FileManager.record(`temp/${this.file.name}`, null, FileModel.WRITE);\n- // client.get(this.fullPath, tempPath, async (err) => {\n- // if (err) {\n- // vscode.window.showErrorMessage(err.message)\n- // } else {\n- // vscode.commands.executeCommand('vscode.open', vscode.Uri.file(tempPath))\n- // }\n- // })\n+ client.get(this.fullPath, async (err, stream) => {\n+ if (err) {\n+ vscode.window.showErrorMessage(err.message)\n+ } else {\n+ stream.pipe(createWriteStream(tempPath)).on(\"close\", () => {\n+ vscode.commands.executeCommand('vscode.open', vscode.Uri.file(tempPath))\n+ })\n+ }\n+ })\n}\ndownload(): any {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -67,7 +67,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nprivate getKeyByNode(connectionNode: Node): string {\nconst dbType = connectionNode.dbType;\n- if (dbType == DatabaseType.ES || dbType == DatabaseType.REDIS || dbType==DatabaseType.SSH) {\n+ if (dbType == DatabaseType.ES || dbType == DatabaseType.REDIS || dbType==DatabaseType.SSH || dbType==DatabaseType.FTP) {\nreturn CacheKey.NOSQL_CONNECTION;\n}\nreturn CacheKey.ConectionsKey;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "</div>\n</section>\n- <section class=\"mb-2\">\n+ <section class=\"mb-2\" v-if=\"connectionOption.dbType!='FTP'\">\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-32\">Databases</label>\n<input class=\"w-64 field__input\" placeholder=\"Special connection database\" v-model=\"connectionOption.database\" />\n@@ -308,6 +308,10 @@ export default {\nthis.connectionOption.user = null;\nthis.connectionOption.database = \"0\";\nbreak;\n+ case \"FTP\":\n+ this.connectionOption.port = 12;\n+ this.connectionOption.user = null;\n+ break;\ncase \"SSH\":\nbreak;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Bind command to ftp node.
|
141,908
|
29.03.2021 17:33:53
| -28,800
|
cb31b460aecda68d13525ad4707e49f95823bff8
|
Version 3.6.5.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+# 3.6.5 2021-3-29\n+\n+- Support connectio to ftp server.\n+- Support delete ssh connection.\n+- Support show procedrue one result.\n+- Fix bugs.\n+\n# 3.6.0 2021-3-11\n- Support connect to database server without exists connection.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.6.4\",\n+ \"version\": \"3.6.5\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.6.5.
|
141,908
|
30.03.2021 16:16:04
| -28,800
|
9c83dec2e2396687fed581ee1ec68783f662144f
|
Dont show hidden file by default on ftp.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/ftp/ftpConnectionNode.ts",
"new_path": "src/model/ftp/ftpConnectionNode.ts",
"diff": "@@ -135,6 +135,9 @@ export class FTPConnectionNode extends FtpBaseNode {\nconst folderList: Node[] = []\nconst fileList: Node[] = []\n+ if (!this.showHidden) {\n+ list = list.filter(item => !item.name.startsWith(\".\"))\n+ }\nfor (const item of list) {\nif (item.type == \"d\") {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -76,6 +76,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\n* encoding, ftp only\n*/\npublic encoding: string;\n+ public showHidden: boolean;\nconstructor(public label: string) {\nsuper(label)\n@@ -96,6 +97,7 @@ export abstract class Node extends vscode.TreeItem implements CopyAble {\nthis.usingSSH = source.usingSSH\nthis.scheme = source.scheme\nthis.encoding=source.encoding\n+ this.showHidden=source.showHidden\nif (!this.schema) {\nthis.schema = source.schema\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<section class=\"mb-2\" v-if=\"connectionOption.dbType=='FTP'\">\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-32\">Encoding</label>\n- <input class=\"w-64 field__input\" placeholder=\"millisecond\" required v-model=\"connectionOption.encoding\" />\n+ <input class=\"w-64 field__input\" placeholder=\"UTF8\" required v-model=\"connectionOption.encoding\" />\n+ </div>\n+ <div class=\"inline-block mr-10\">\n+ <label class=\"font-bold mr-5 inline-block w-32\">Show Hidden File</label>\n+ <el-switch v-model=\"connectionOption.showHidden\"></el-switch>\n</div>\n</section>\n<section class=\"mb-2\">\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-32\">ConnectTimeout</label>\n- <input class=\"w-64 field__input\" placeholder=\"millisecond\" required v-model=\"connectionOption.connectTimeout\" />\n+ <input class=\"w-64 field__input\" placeholder=\"5000\" required v-model=\"connectionOption.connectTimeout\" />\n</div>\n<div class=\"inline-block mr-10\">\n<label class=\"font-bold mr-5 inline-block w-32\">RequestTimeout</label>\n- <input class=\"w-64 field__input\" placeholder=\"millisecond\" required type=\"number\" v-model=\"connectionOption.requestTimeout\" />\n+ <input class=\"w-64 field__input\" placeholder=\"10000\" required type=\"number\" v-model=\"connectionOption.requestTimeout\" />\n</div>\n</section>\n@@ -201,6 +205,7 @@ export default {\nencoding: \"utf8\",\ndatabase: null,\nusingSSH: false,\n+ showHidden: false,\nincludeDatabases: null,\ndbType: \"MySQL\",\nencrypt: true,\n@@ -317,7 +322,7 @@ export default {\nthis.connectionOption.database = \"0\";\nbreak;\ncase \"FTP\":\n- this.connectionOption.port = 12;\n+ this.connectionOption.port = 21;\nthis.connectionOption.user = null;\nbreak;\ncase \"SSH\":\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Dont show hidden file by default on ftp.
|
141,908
|
30.03.2021 16:17:59
| -28,800
|
2c50033bcd4eaed735f01b8a90f915614bd1ae38
|
Version 3.6.6.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"Database Client for vscode\",\n- \"version\": \"3.6.5\",\n+ \"version\": \"3.6.6\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Version 3.6.6.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.