author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
141,908
|
11.08.2020 11:22:02
| -28,800
|
26da45b62c058480462d04a9eb70f6d2ea51f14c
|
update to 2.4.6
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.4.5\",\n+ \"version\": \"2.4.6\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n{\n\"command\": \"mysql.index.template\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n- \"group\": \"2_mysql@3\"\n+ \"group\": \"1_inline@7\"\n},\n{\n\"command\": \"mysql.template.table\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -112,7 +112,7 @@ ADD\npublic indexTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`-- ALTER TABLE ${Util.wrap(this.database)}.${Util.wrap(this.table)} DROP INDEX [indexName];\n--- ALTER TABLE ${Util.wrap(this.database)}.${Util.wrap(this.table)} ADD [UNIQUE|KEY|PRIMARY KEY] INDEX ([column]);`, Template.alter);\n+-- ALTER TABLE ${Util.wrap(this.database)}.${Util.wrap(this.table)} ADD [UNIQUE|INDEX|PRIMARY KEY] ([columns]);`, Template.alter);\nsetTimeout(() => {\nQueryUnit.runQuery(`SELECT COLUMN_NAME name,table_schema,index_name,non_unique FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${this.database}' and table_name='${this.table}';`, this);\n}, 10);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/keywordChain.ts",
"new_path": "src/provider/Complection/chain/keywordChain.ts",
"diff": "@@ -3,10 +3,10 @@ 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\",\n- \"GROUP BY\", \"ORDER BY\", \"HAVING\", \"LIMIT\", \"ALTER\", \"CREATE\", \"DROP\", \"FUNCTION\", \"CASE\", \"PROCEDURE\", \"TRIGGER\", \"INDEX\", \"CHANGE\", \"COLUMN\", \"BETWEEN\",\n- \"ADD\", 'SHOW', \"PRIVILEGES\", \"IDENTIFIED\", \"VIEW\", \"CURSOR\", \"EXPLAIN\", \"ROLLBACK\", \"COMMENT\", \"COMMIT\", \"BEGIN\", \"DELIMITER\", \"CALL\", \"REPLACE\",\n- \"REFERENCES\", \"USING\", \"END\", \"BEFORE\", \"AFTER\", \"GRANT\", \"RETURNS\", \"IN\", \"SOME\", \"ANY\", \"SOME\", \"ASC\", \"DESC\", \"UNIQUE\", \"UNION\", \"ALL\", \"ON\",\n+ private keywordList: string[] = [\"JOIN\", \"AND\", \"OR\", \"SELECT\", \"SET\", \"UPDATE\", \"DELETE\", \"TABLE\", \"INSERT\", \"INTO\", \"VALUES\", \"FROM\", \"WHERE\", \"IS\",\"NULL\",\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\"OUTER\", \"INNER\", \"EXEC\", \"EXISTS\", \"NOT\", \"FOREIGN\", \"FULL\", \"LIKE\", \"IN\", \"PRIMARY\", \"KEY\", \"RIGHT\", \"LEFT\", \"TRUNCATE\", \"IGNORE\", \"DISTINCT\",\"SOURCE\"];\nprivate keywordComplectionItems: vscode.CompletionItem[] = [];\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(ignore|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|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
|
update to 2.4.6
|
141,908
|
13.08.2020 23:19:34
| -28,800
|
71ce4a810dd806ae93e4b994fb5d056482d35c26
|
update to 2.4.7
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+## 2.4.7 - 2020/8/13\n+- Fix overview render bug.\n+\n+## 2.4.6 - 2020/8/11\n+- Add more keyword.\n+\n## 2.4.5 - 2020/8/10\n- Support big number type.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.4.6\",\n+ \"version\": \"2.4.7\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/overview/index.vue",
"new_path": "src/vue/overview/index.vue",
"diff": "<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(scope.row.data_length)}}</span>\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(scope.row.index_length)}}</span>\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\"></el-table-column>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 2.4.7
|
141,908
|
14.08.2020 18:40:48
| -28,800
|
0ca04f36ace2eaaf837b8d0ae9e6737fd79c3b53
|
fix new panel bug
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -86,7 +86,7 @@ export class QueryUnit {\nconst isMulti = sql.match(Pattern.MULTI_PATTERN);\nif (!isMulti) {\n- if(sql.match(this.selectPattern) && !sql.match(/\\blimit\\b/i) && !sql.match(/;\\s*$/)){\n+ if(sql.match(this.selectPattern) && !sql.match(/\\blimit\\b/i) && !sql.match(/;\\s*$/) && !sql.match(/[count|sum|min|max]\\(/i)){\nsql+=` LIMIT ${Global.getConfig(ConfigKey.DEFAULT_LIMIT)}`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -82,7 +82,7 @@ export class QueryPage {\nswitch (params.type) {\ncase OperateType.execute:\nif (!queryParam.singlePage) {\n- this.hodlder.set(params.sql, title)\n+ this.hodlder.set(params.sql.trim(), title)\n}\nQueryUnit.runQuery(params.sql);\nbreak;\n@@ -90,7 +90,7 @@ export class QueryPage {\nconst sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nQueryUnit.queryPromise(connection, sql).then((rows) => {\n- QueryPage.send({ type: MessageType.NEXT_PAGE, res: { sql, data: rows } as DataResponse });\n+ viewPanel.webview.postMessage({ type: MessageType.NEXT_PAGE, res: { sql, data: rows } as DataResponse });\n})\nbreak;\ncase OperateType.export:\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix new panel bug
|
141,908
|
17.08.2020 15:02:11
| -28,800
|
601ec80251bc10924693abda34b55a965bc9cc3e
|
add new panel button
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"command\": \"mysql.table.show\",\n\"title\": \"Open In New Panel\",\n- \"category\": \"MySQL\"\n+ \"category\": \"MySQL\",\n+ \"icon\": \"resources/icon/analysis.svg\"\n},\n{\n\"command\": \"mysql.column.update\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table\",\n\"group\": \"inline@0\"\n},\n+ {\n+ \"command\": \"mysql.table.show\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"group\": \"inline@3\"\n+ },\n{\n\"command\": \"mysql.table.drop\",\n\"when\": \"view == github.cweijan.mysql && viewItem == table && false\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/icon/analysis.svg",
"diff": "+<svg id=\"Capa_1\" enable-background=\"new 0 0 512.007 512.007\" height=\"512\" viewBox=\"0 0 512.007 512.007\" width=\"512\" xmlns=\"http://www.w3.org/2000/svg\"><g><path d=\"m191.492 320.515-31.816-31.816-146.514 146.483c-17.549 17.549-17.549 46.084 0 63.633 17.598 17.598 46.051 17.582 63.633 0l146.514-146.483z\" fill=\"#ffda2d\"/><path d=\"m76.794 498.815 146.514-146.483-31.816-31.816-178.331 178.3c17.599 17.597 46.052 17.58 63.633-.001z\" fill=\"#ff9100\"/><circle cx=\"317\" cy=\"195.007\" fill=\"#596c76\" r=\"194.907\"/><path d=\"m454.82 332.827c76.273-76.273 76.227-199.413 0-275.64l-275.64 275.64c76.273 76.273 199.413 76.227 275.64 0z\" fill=\"#465a61\"/><circle cx=\"317\" cy=\"195.007\" fill=\"#f2f2f2\" r=\"164.923\"/><path d=\"m433.618 311.625c64.497-64.497 64.537-168.699 0-233.236l-233.236 233.236c64.497 64.497 168.699 64.538 233.236 0z\" fill=\"#daedff\"/><path d=\"m392 270.007h-45l-30-20.282v-69.718h75c8.284 0 15 6.716 15 15v60c0 8.284-6.716 15-15 15z\" fill=\"#fdbf00\"/><path d=\"m242 150.007c-8.284 0-15 6.716-15 15v90c0 8.284 6.716 15 15 15h45l30-20.916v-54.084-45z\" fill=\"#1fcefc\"/><path d=\"m317 249.091v-54.084l-75 75h45z\" fill=\"#4b97f7\"/><path d=\"m332 90.007h-30c-8.284 0-15 6.716-15 15v120 45h60v-105-60c0-8.284-6.716-15-15-15z\" fill=\"#fe810d\"/><path d=\"m347 270.007v-105l-60 60v45z\" fill=\"#ff495a\"/></g></svg>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add new panel button
|
141,908
|
17.08.2020 18:10:08
| -28,800
|
550d458cf524ca9c845018d17489ae4bda9152bf
|
using umy-ui as table render, and support batch delete
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"pretty-bytes\": \"^5.3.0\",\n\"sql-formatter\": \"^2.3.3\",\n\"tunnel-ssh\": \"^4.1.4\",\n+ \"umy-ui\": \"^1.0.4\",\n\"vue\": \"^2.6.11\",\n\"vue-router\": \"^3.4.1\"\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</template>\n<el-tag type=\"success\">CostTime :</el-tag>\n<span v-text=\"toolbar.costTime\"></span>ms\n- <span v-if=\"result.table\">, <el-tag type=\"warning\">Row :</el-tag>{{result.data.length-1}}, <el-tag type=\"danger\"> Col :</el-tag> {{columnCount}}</span>\n+ <span v-if=\"result.table\">, <el-tag type=\"warning\">Row :</el-tag>{{ result.data.length - 1 }}, <el-tag\n+ type=\"danger\"> Col :</el-tag> {{ columnCount }}</span>\n</el-row>\n<!-- info panel -->\n<div v-if=\"info.visible \">\n<!-- toolbar -->\n<div style=\"margin:8px\">\n<el-input v-model=\"table.search\" placeholder=\"Input To Search Data\" style=\"width:200px\"/>\n- <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-orange\" circle title=\"Export\"></el-button>\n+ <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-orange\" circle\n+ title=\"Export\"></el-button>\n<el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"small\" circle @click=\"insertRequest\">\n</el-button>\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-tag type=\"warning\" style=\"margin:0 10px\">Row :</el-tag>\n<el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n</el-button>\n- <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\" circle>\n+ <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"small\" title=\"copy\"\n+ icon=\"el-icon-document-copy\" circle>\n</el-button>\n- <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\" icon=\"el-icon-delete\" circle>\n+ <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\"\n+ icon=\"el-icon-delete\" circle>\n</el-button>\n</template>\n</div>\n- <!-- talbe result -->\n- <el-table id=\"dataTable\" v-loading='table.loading' :cell-style=\"{padding: '0', height: '20px'}\" size='small' @sort-change=\"sort\" element-loading-text=\"Loading Data\" :row-class-name=\"tableRowClassName\" ref=\"dataTable\" :height=\"remainHeight\" width=\"100vh\" stripe :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" border @row-dblclick=\"row=>openEdit(row)\" @row-click=\"row=>updateEdit(row)\">\n- <!-- tool bar -->\n- <el-table-column fixed=\"left\" type=\"index\" :index=\"0\" width=\"50\" align=\"center\">\n- </el-table-column>\n- <!-- data -->\n- <el-table-column v-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\" v-for=\"(field,index) in result.fields\" :key=\"index\" :label=\"field.name\" align=\"center\" sortable :width=\"computeWidth(field.name,0,index,toolbar.filter[field.name])\" title='test'>\n+ <ux-grid\n+ ref=\"dataTable\"\n+ v-loading='table.loading'\n+ :cell-style=\"{height: '40px'}\"\n+ @sort-change=\"sort\"\n+ @table-body-scroll=\"(_,e)=>scrollChange(e)\"\n+ :height=\"remainHeight\"\n+ width=\"100vh\" stripe\n+ :checkboxConfig=\"{ highlight: true}\"\n+ :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\"\n+ @row-dblclick=\"row=>openEdit(row)\"\n+ @row-click=\"row=>updateEdit(row)\"\n+ :show-header-overflow=\"false\"\n+ :show-overflow=\"false\"\n+ >\n+ <ux-table-column type=\"checkbox\" width=\"80\"/>\n+ <ux-table-column type=\"index\" width=\"100\"\n+ :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\"/>\n+ <ux-table-column v-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\"\n+ v-for=\"(field,index) in result.fields\"\n+ :key=\"index\"\n+ :resizable=\"true\"\n+ :field=\"field.name\"\n+ :title=\"field.name\"\n+ :sortable=\"true\"\n+ :width=\"computeWidth(field.name,0,index,toolbar.filter[field.name])\">\n<template slot=\"header\" slot-scope=\"scope\">\n- <el-tooltip class=\"item\" effect=\"dark\" :content=\"getTypeByColumn(scope.column.label)\" placement=\"left-start\">\n- <span>{{scope.column.label}}</span>\n+ <el-tooltip class=\"item\" effect=\"dark\" :content=\"scope.column.title\" placement=\"left-start\">\n+ <span v-text=\"scope.column.title\">\n+ {{ scope.column.title }}\n+ </span>\n</el-tooltip>\n</template>\n<template slot-scope=\"scope\">\n- <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[field.name]\" placeholder=\"Filter\" v-on:keyup.enter.native=\"filter($event,field.name)\">\n+ <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[scope.column.title]\" placeholder=\"Filter\"\n+ v-on:keyup.enter.native=\"filter($event,scope.column.title)\">\n</el-input>\n- <span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[field.name])'></span>\n+ <span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[scope.column.title])'></span>\n</template>\n- </el-table-column>\n- </el-table>\n+ </ux-table-column>\n+ </ux-grid>\n+ <!-- talbe result -->\n+\n<el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n<el-form ref=\"infoForm\" :model=\"update.currentNew\" :inline=\"true\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n</template>\n<template v-else-if=\"column.type=='datetime'\">\n<br/>\n- <el-date-picker value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" v-model=\"update.currentNew[column.name]\"></el-date-picker>\n+ <el-date-picker value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\"\n+ v-model=\"update.currentNew[column.name]\"></el-date-picker>\n</template>\n<el-input v-else=\"column.type\" v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\n@@ -175,19 +204,6 @@ export default {\n};\n},\nmounted() {\n- setTimeout(() => {\n- const table = document.querySelector(\".el-table__fixed-body-wrapper\");\n- table.addEventListener(\"scroll\", event => {\n- if (\n- table.scrollHeight -\n- table.scrollTop -\n- document.documentElement.clientHeight <=\n- 200\n- ) {\n- this.nextPage();\n- }\n- });\n- }, 1000);\nconst handlerData = (data, sameTable) => {\nthis.result = data;\nthis.toolbar.sql = data.sql;\n@@ -198,7 +214,6 @@ export default {\nthis.reset();\n}\n};\n-\nconst handlerCommon = res => {\nthis.editor.loading = false;\nthis.editor.visible = false;\n@@ -263,12 +278,21 @@ export default {\npostMessage({type: \"init\"});\nwindow.addEventListener(\"keyup\", event => {\nif (event.key == \"c\" && event.ctrlKey) {\n- console.log(document.activeElement.value);\ndocument.execCommand(\"copy\");\n}\n});\n},\nmethods: {\n+ output(obj) {\n+ console.log(obj)\n+ },\n+ scrollChange(event) {\n+ const table = event.target\n+ if (table.scrollHeight - table.scrollTop\n+ - document.documentElement.clientHeight <= 50) {\n+ this.nextPage();\n+ }\n+ },\nchangeTheme(theme) {\npostMessage({\ntype: \"changeTheme\",\n@@ -281,14 +305,12 @@ export default {\nconfirmButtonText: \"Yes\",\ncancelButtonText: \"No\",\ntype: \"warning\"\n- })\n- .then(() => {\n+ }).then(() => {\npostMessage({\ntype: \"export\",\nsql: this.result.sql.replace(/\\blimit\\b.+/gi, \"\")\n});\n- })\n- .catch(() => {\n+ }).catch(() => {\npostMessage({\ntype: \"export\",\nsql: this.result.sql\n@@ -308,7 +330,7 @@ export default {\nif (inputvalue) {\nconst condition =\n- inputvalue.toLowerCase() == \"null\"\n+ inputvalue.toLowerCase() === \"null\"\n? `${column} is null`\n: `${column}='${inputvalue}'`;\nif (existsCheck.exec(filterSql)) {\n@@ -348,14 +370,13 @@ export default {\n);\n},\nsort(row) {\n- let order = row.order == \"ascending\" ? \"asc\" : \"desc\";\nlet sortSql = this.result.sql\n.replace(/\\n/, \" \")\n.replace(\";\", \"\")\n.replace(/order by .+? (desc|asc)?/gi, \"\")\n.replace(\n/\\s?(limit.+)?$/i,\n- ` ORDER BY ${row.column.label} ${order} \\$1 `\n+ ` ORDER BY ${row.prop} ${row.order} \\$1 `\n);\nthis.execute(sortSql + \";\");\n},\n@@ -384,9 +405,9 @@ export default {\nreturn `'${value}'`;\ndefault:\nif (\n- type.indexOf(\"text\") != -1 ||\n- type.indexOf(\"blob\") != -1 ||\n- type.indexOf(\"binary\") != -1\n+ type.indexOf(\"text\") !== -1 ||\n+ type.indexOf(\"blob\") !== -1 ||\n+ type.indexOf(\"binary\") !== -1\n) {\nreturn `'${value}'`;\n}\n@@ -396,7 +417,7 @@ export default {\ngetTypeByColumn(key) {\nif (!this.result.columnList) return;\nfor (const column of this.result.columnList) {\n- if (column.name == key) {\n+ if (column.name === key) {\nreturn column.simpleType;\n}\n}\n@@ -426,7 +447,7 @@ export default {\nfor (const key in this.update.currentNew) {\nconst oldEle = this.update.current[key];\nconst newEle = this.update.currentNew[key];\n- if (oldEle != newEle) {\n+ if (oldEle !== newEle) {\nchange += `\\`${this.wrap(key)}\\`=${this.wrapQuote(key, newEle)},`;\n}\n}\n@@ -468,20 +489,24 @@ export default {\nconfirmButtonText: \"OK\",\ncancelButtonText: \"Cancel\",\ntype: \"warning\"\n- })\n- .then(() => {\n- const deleteSql = `DELETE FROM ${this.result.table} WHERE ${\n- this.result.primaryKey\n- }=${this.wrapQuote(this.result.primaryKey, primaryValue)}`;\n+ }).then(() => {\n+ let checkboxRecords = this.$refs.dataTable.getCheckboxRecords();\n+ if (checkboxRecords.length > 0) {\n+ checkboxRecords = checkboxRecords.map(checkboxRecord =>\n+ this.wrapQuote(this.result.primaryKey,checkboxRecord[this.result.primaryKey])\n+ )\n+ }\n+ const deleteSql = (checkboxRecords.length > 0) ? `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey} in (${checkboxRecords.join(',')})`\n+ : `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey}=${this.wrapQuote(this.result.primaryKey, primaryValue)}`;\nthis.execute(deleteSql);\n- })\n- .catch(() => {\n+ }).catch((e) => {\n+ console.log(e)\nthis.$message({type: \"warning\", message: \"Delete canceled\"});\n});\n},\ntableRowClassName({row, rowIndex}) {\nif (!this.result.primaryKey || !this.update.primary) return \"\";\n- if (row[this.result.primaryKey] == this.update.primary) {\n+ if (row[this.result.primaryKey] === this.update.primary) {\nreturn \"edit-row\";\n}\nreturn \"\";\n@@ -621,7 +646,6 @@ export default {\n},\n// show call when change table\nreset() {\n- console.log(this.result.fields.length);\nthis.clear();\n// table\nthis.table.widthItem = {};\n@@ -684,6 +708,10 @@ body {\nmargin-top: 8px;\n}\n+.plx-cell, .plx-cell--title {\n+ text-overflow: unset !important;\n+}\n+\n.cell {\noverflow: hidden !important;\ntext-overflow: unset !important;\n@@ -720,6 +748,7 @@ body {\nborder-radius: 8px;\nbackground-color: #b0b0b0;\n}\n+\n::-webkit-scrollbar-thumb:hover {\nborder-radius: 8px;\nbackground-color: #ccc;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
using umy-ui as table render, and support batch delete
|
141,908
|
17.08.2020 18:47:57
| -28,800
|
c019d37d91be02b1b0f1695eaf638afa59b1070b
|
init dark theme
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/theme/dark/dark-custom.css",
"new_path": "src/vue/result/theme/dark/dark-custom.css",
"diff": ".hint {\ncolor: #eee !important;\n}\n+\n+.plx-table.border--full .plx-table--header-wrapper{\n+ background: #222933 !important;\n+}\n+\n+.plx-table .plx-table--border-line {\n+ border: 1px solid #222933;\n+}\n+\n+.plx-header--column {\n+ border-radius: 3px;\n+ border: 1px solid #121820 !important;\n+}\n+\n+.plx-table .plx-body--row {\n+ background: #222933;\n+ color: #E5E6E7;\n+}\n+\n+.plx-table .plx-body--row.row--stripe,.plx-table .plx-header--row {\n+ background: #33373c;\n+ color: #E5E6E7;\n+}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
init dark theme
|
141,908
|
17.08.2020 23:05:27
| -28,800
|
d7da8cc9e538f833edff78425039f95c3c104874
|
update limit setting name
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"default\": true,\n\"description\": \"Load database meta info when connected, If your machine's performance is low, turn it off.\"\n},\n- \"vscode-mysql.defaultLimit\": {\n+ \"vscode-mysql.defaultSelectLimit\": {\n\"type\": \"integer\",\n- \"default\": 30,\n+ \"default\": 100,\n\"description\": \"Default limit of query sql.\"\n},\n\"vscode-mysql.resultTheme\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -27,7 +27,7 @@ export enum ConfigKey {\nENABLE_DELIMITER = \"enableDelimiter\",\nLOAD_META_ON_CONNECT = \"loadMetaOnConnect\",\nREULST_THEME = \"resultTheme\",\n- DEFAULT_LIMIT = \"defaultLimit\",\n+ DEFAULT_LIMIT = \"defaultSelectLimit\",\n}\nexport enum CommandKey {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update limit setting name
|
141,908
|
25.08.2020 13:50:11
| -28,800
|
757851ca1f0f60d873d5f9abbc522e333b624bd2
|
adjust result page
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.5.2\",\n+ \"version\": \"2.5.3\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-row>\n<!-- tool panel -->\n<el-row id=\"tool-panel\">\n- <el-button type=\"primary\" @click='count(toolbar.sql);'>Count</el-button>\n- <el-button type=\"primary\" @click='info.visible = false;execute(toolbar.sql);'>Execute</el-button>\n+ <el-button type=\"success\" size=\"small\" @click='count(toolbar.sql);'>Count</el-button>\n+ <el-button type=\"primary\" size=\"small\" @click='info.visible = false;execute(toolbar.sql);'>Execute</el-button>\n<el-tag>Theme :</el-tag>\n<el-select v-model=\"theme.select\" @change=\"changeTheme\">\n<el-option v-for=\"theme in theme.list\" :key=\"theme\" :label=\"theme\" :value=\"theme\">\n</el-popover>\n<el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\" circle>\n</el-button>\n- <template v-if=\"result.primaryKey && toolbar.row[result.primaryKey]\">\n+ <template v-if=\"result.primaryKey && (toolbar.row[result.primaryKey]||toolbar.show)\">\n<el-tag type=\"warning\" style=\"margin:0 10px\">Row :</el-tag>\n<el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n</el-button>\n@table-body-scroll=\"(_,e)=>scrollChange(e)\"\n:height=\"remainHeight\"\nwidth=\"100vh\" stripe\n+ @select-all=\"toolbar.show=true\"\n:checkboxConfig=\"{ highlight: true}\"\n:data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\"\n@row-dblclick=\"row=>openEdit(row)\"\n:show-header-overflow=\"false\"\n:show-overflow=\"false\"\n>\n- <ux-table-column type=\"checkbox\" width=\"80\"/>\n- <ux-table-column type=\"index\" width=\"100\"\n+ <ux-table-column type=\"checkbox\" width=\"40\" fixed=\"left\" />\n+ <ux-table-column type=\"index\" width=\"40\"\n:seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\"/>\n<ux-table-column v-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\"\nv-for=\"(field,index) in result.fields\"\n@@ -183,6 +184,7 @@ export default {\ntoolbar: {\nrow: {},\nsql: null,\n+ show:false,\ncostTime: 0,\nfilter: {},\nshowColumns: []\n@@ -493,7 +495,7 @@ export default {\n}).then(() => {\nlet checkboxRecords = this.$refs.dataTable.getCheckboxRecords();\nif (checkboxRecords.length > 0) {\n- checkboxRecords = checkboxRecords.map(checkboxRecord =>\n+ checkboxRecords = checkboxRecords.filter(checkboxRecord=>checkboxRecord[this.result.primaryKey]!=null).map(checkboxRecord =>\nthis.wrapQuote(this.result.primaryKey, checkboxRecord[this.result.primaryKey])\n)\n}\n@@ -769,5 +771,9 @@ body {\n.plx-cell span{\nmargin: 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</style>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/theme/dark/dark-custom.css",
"new_path": "src/vue/result/theme/dark/dark-custom.css",
"diff": "color: #eee !important;\n}\n-.plx-table.border--full .plx-table--header-wrapper{\n+.plx-table.border--full .plx-table--header-wrapper,\n+.plx-table--body-wrapper{\nbackground: #222933 !important;\n}\n-.plx-table .plx-table--border-line {\n- border: 1px solid #222933;\n+.plx-table .plx-table--border-line,\n+.plx-table--fixed-left-wrapper {\n+ border: 1px solid #222933 !important;\n}\n.plx-header--column {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
adjust result page
|
141,908
|
25.08.2020 21:44:08
| -28,800
|
87a249dbed5e34d2f793e57a2e8d6bb2ff8d13fa
|
update to 2.5.4
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.5.3\",\n+ \"version\": \"2.5.4\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 2.5.4
|
141,908
|
06.09.2020 19:40:57
| -28,800
|
37e1ee6a4f13a6f7b3048b23e85b5617b81bdc52
|
init quick edit
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</template>\n<el-tag type=\"success\">CostTime :</el-tag>\n<span v-text=\"toolbar.costTime\"></span>ms\n- <span v-if=\"result.table\">, <el-tag type=\"warning\">Row :</el-tag>{{ result.data.length - 1 }}, <el-tag\n- type=\"danger\"> Col :</el-tag> {{ columnCount }}</span>\n+ <span v-if=\"result.table\">, <el-tag type=\"warning\">Row :</el-tag>{{ result.data.length - 1 }}, <el-tag type=\"danger\"> Col :</el-tag> {{ columnCount }}</span>\n</el-row>\n<!-- info panel -->\n<div v-if=\"info.visible \">\n<!-- toolbar -->\n<div style=\"margin:8px\">\n<el-input v-model=\"table.search\" placeholder=\"Input To Search Data\" style=\"width:200px\" />\n- <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-orange\" circle\n- title=\"Export\"></el-button>\n+ <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-orange\" circle title=\"Export\"></el-button>\n<el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"small\" circle @click=\"insertRequest\">\n</el-button>\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-tag type=\"warning\" style=\"margin:0 10px\">Row :</el-tag>\n<el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n</el-button>\n- <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"small\" title=\"copy\"\n- icon=\"el-icon-document-copy\" circle>\n+ <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\" circle>\n</el-button>\n- <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\"\n- icon=\"el-icon-delete\" circle>\n+ <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\" icon=\"el-icon-delete\" circle>\n</el-button>\n</template>\n</div>\n- <ux-grid\n- ref=\"dataTable\"\n- v-loading='table.loading'\n- size='small'\n- :cell-style=\"{height: '30px'}\"\n- @sort-change=\"sort\"\n- @table-body-scroll=\"(_,e)=>scrollChange(e)\"\n- :height=\"remainHeight\"\n- width=\"100vh\" stripe\n- @select-all=\"toolbar.show=true\"\n- :checkboxConfig=\"{ highlight: true}\"\n- :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\"\n- @row-dblclick=\"row=>openEdit(row)\"\n- @row-click=\"row=>updateEdit(row)\"\n- :show-header-overflow=\"false\"\n- :show-overflow=\"false\"\n- >\n+ <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '30px'}\" @sort-change=\"sort\" @table-body-scroll=\"(_,e)=>scrollChange(e)\" :height=\"remainHeight\" width=\"100vh\" stripe @select-all=\"toolbar.show=true\" :edit-config=\"{trigger: 'dblclick', mode: 'cell',autoClear:false}\" :checkboxConfig=\"{ highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-click=\"row=>updateEdit(row)\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n<ux-table-column type=\"checkbox\" width=\"40\" fixed=\"left\" />\n- <ux-table-column type=\"index\" width=\"40\"\n- :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\"/>\n- <ux-table-column v-if=\"result.fields && field.name && toolbar.showColumns.includes(field.name.toLowerCase())\"\n- v-for=\"(field,index) in result.fields\"\n- :key=\"index\"\n- :resizable=\"true\"\n- :field=\"field.name\"\n- :title=\"field.name\"\n- :sortable=\"true\"\n- :width=\"computeWidth(field.name,0,index,toolbar.filter[field.name])\">\n+ <ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\" />\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=\"scope.column.title\" placement=\"left-start\">\n<span v-text=\"scope.column.title\">\n</el-tooltip>\n</template>\n<template slot-scope=\"scope\">\n- <el-input v-if=\"scope.row.isFilter\" v-model=\"toolbar.filter[scope.column.title]\" placeholder=\"Filter\"\n- v-on:keyup.enter.native=\"filter($event,scope.column.title)\">\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<span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[scope.column.title])'></span>\n</template>\n+ <template slot=\"edit\" slot-scope=\"scope\">\n+ <el-input v-model=\"update.currentNew[scope.column.title]\" @keypress.enter.native=\"confirmUpdate\"></el-input>\n+ </template>\n</ux-table-column>\n</ux-grid>\n<!-- talbe result -->\n</template>\n<template v-else-if=\"column.type=='datetime'\">\n<br />\n- <el-date-picker value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\"\n- v-model=\"update.currentNew[column.name]\"></el-date-picker>\n+ <el-date-picker value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" v-model=\"update.currentNew[column.name]\"></el-date-picker>\n</template>\n<el-input v-else=\"column.type\" v-model=\"update.currentNew[column.name]\"></el-input>\n</template>\n@@ -287,12 +260,16 @@ export default {\n},\nmethods: {\noutput(obj) {\n- console.log(obj)\n+ console.log(obj);\n},\nscrollChange(event) {\n- const table = event.target\n- if (table.scrollHeight - table.scrollTop\n- - document.documentElement.clientHeight <= 50) {\n+ const table = event.target;\n+ if (\n+ table.scrollHeight -\n+ table.scrollTop -\n+ document.documentElement.clientHeight <=\n+ 50\n+ ) {\nthis.nextPage();\n}\n},\n@@ -308,12 +285,14 @@ export default {\nconfirmButtonText: \"Yes\",\ncancelButtonText: \"No\",\ntype: \"warning\"\n- }).then(() => {\n+ })\n+ .then(() => {\npostMessage({\ntype: \"export\",\nsql: this.result.sql.replace(/\\blimit\\b.+/gi, \"\")\n});\n- }).catch(() => {\n+ })\n+ .catch(() => {\npostMessage({\ntype: \"export\",\nsql: this.result.sql\n@@ -377,10 +356,7 @@ export default {\n.replace(/\\n/, \" \")\n.replace(\";\", \"\")\n.replace(/order by .+? (desc|asc)?/gi, \"\")\n- .replace(\n- /\\s?(limit.+)?$/i,\n- ` ORDER BY ${row.prop} ${row.order} \\$1 `\n- );\n+ .replace(/\\s?(limit.+)?$/i, ` ORDER BY ${row.prop} ${row.order} \\$1 `);\nthis.execute(sortSql + \";\");\n},\ninsertRequest() {\n@@ -492,17 +468,32 @@ export default {\nconfirmButtonText: \"OK\",\ncancelButtonText: \"Cancel\",\ntype: \"warning\"\n- }).then(() => {\n+ })\n+ .then(() => {\nlet checkboxRecords = this.$refs.dataTable.getCheckboxRecords();\nif (checkboxRecords.length > 0) {\n- checkboxRecords = checkboxRecords.filter(checkboxRecord=>checkboxRecord[this.result.primaryKey]!=null).map(checkboxRecord =>\n- this.wrapQuote(this.result.primaryKey, checkboxRecord[this.result.primaryKey])\n+ checkboxRecords = checkboxRecords\n+ .filter(\n+ checkboxRecord => checkboxRecord[this.result.primaryKey] != null\n)\n+ .map(checkboxRecord =>\n+ this.wrapQuote(\n+ this.result.primaryKey,\n+ checkboxRecord[this.result.primaryKey]\n+ )\n+ );\n}\n- const deleteSql = (checkboxRecords.length > 0) ? `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey} in (${checkboxRecords.join(',')})`\n- : `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey}=${this.wrapQuote(this.result.primaryKey, primaryValue)}`;\n+ const deleteSql =\n+ checkboxRecords.length > 0\n+ ? `DELETE FROM ${this.result.table} WHERE ${\n+ this.result.primaryKey\n+ } in (${checkboxRecords.join(\",\")})`\n+ : `DELETE FROM ${this.result.table} WHERE ${\n+ this.result.primaryKey\n+ }=${this.wrapQuote(this.result.primaryKey, primaryValue)}`;\nthis.execute(deleteSql);\n- }).catch((e) => {\n+ })\n+ .catch(e => {\nif (e) {\nthis.$message.error(e);\n} else {\n@@ -714,7 +705,8 @@ body {\nmargin-top: 8px;\n}\n-.plx-cell, .plx-cell--title {\n+.plx-cell,\n+.plx-cell--title {\ntext-overflow: unset !important;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
init quick edit
|
141,908
|
06.09.2020 20:01:52
| -28,800
|
ba18b4854d8f6d44afb3c161ac93a393649c6cb1
|
adjust interactive
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-button>\n</template>\n</div>\n- <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '30px'}\" @sort-change=\"sort\" @table-body-scroll=\"(_,e)=>scrollChange(e)\" :height=\"remainHeight\" width=\"100vh\" stripe @select-all=\"toolbar.show=true\" :edit-config=\"{trigger: 'dblclick', mode: 'row',autoClear:false}\" :checkboxConfig=\"{ highlight: true}\" :data=\"result.data.filter(data => !table.search || JSON.stringify(data).toLowerCase().includes(table.search.toLowerCase()))\" @row-dblclick=\"row=>updateEdit(row)\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n+ <ux-grid ref=\"dataTable\" v-loading='table.loading' size='small' :cell-style=\"{height: '30px'}\" @sort-change=\"sort\" @table-body-scroll=\"(_,e)=>scrollChange(e)\" :height=\"remainHeight\" width=\"100vh\" stripe @select-all=\"toolbar.show=true\" :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=\"row=>updateEdit(row)\" :show-header-overflow=\"false\" :show-overflow=\"false\">\n<ux-table-column type=\"checkbox\" width=\"40\" fixed=\"left\" />\n<ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\" />\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@@ -170,7 +170,8 @@ export default {\nsql: null,\nmessage: null,\nvisible: false,\n- error: false\n+ error: false,\n+ needRefresh:true\n},\nupdate: {\ncurrent: {},\n@@ -231,6 +232,7 @@ export default {\ncase \"DDL\":\nhandlerCommon(response);\nthis.info.error = false;\n+ this.info.needRefresh=false;\nthis.refresh();\nbreak;\ncase \"ERROR\":\n@@ -635,7 +637,11 @@ export default {\nthis.page.lock = false;\nthis.page.pageSize = this.result.pageSize;\n// info\n+ if(this.info.needRefresh){\nthis.info.visible = false;\n+ }else{\n+ this.info.needRefresh=true;\n+ }\n// loading\nthis.table.loading = false;\n// toolbar\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
adjust interactive
|
141,908
|
06.09.2020 20:02:36
| -28,800
|
61ca0751c2a5158612015bdfeb26b77ce217a953
|
update to 2.5.5
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+## 2.5.5 - 2020/9/6\n+- Change update as edit in same view.\n+\n## 2.5.0 - 2020/8/17\n- Improvement query result render performance.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.5.4\",\n+ \"version\": \"2.5.5\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 2.5.5
|
141,908
|
21.09.2020 15:45:46
| -28,800
|
3ea8fd2702f58a46917f413042a4cc3305bfd670
|
init export panel
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</ux-table-column>\n</ux-grid>\n<!-- talbe result -->\n-\n<el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n<el-form ref=\"infoForm\" :model=\"update.currentNew\" :inline=\"true\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\nInsert</el-button>\n</span>\n</el-dialog>\n+ <el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n+ <el-form :model=\"exportOption\">\n+ <el-form-item label=\"Export File Type\">\n+ <el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n+ <el-radio v-model=\"exportOption.type\" label=\"sql\" disabled=\"disabled\">Sql</el-radio>\n+ </el-form-item>\n+ <el-form-item label=\"With Out Limit\">\n+ <el-switch v-model=\"exportOption.withOutLimit\"></el-switch>\n+ </el-form-item>\n+ </el-form>\n+ <span slot=\"footer\" class=\"dialog-footer\">\n+ <el-button type=\"primary\" :loading=\"exportOption.loading\" @click=\"confirmExport\">Export</el-button>\n+ <el-button @click=\"exportOption.visible = false\">Cancel</el-button>\n+ </span>\n+ </el-dialog>\n</div>\n</template>\n@@ -168,6 +182,12 @@ export default {\nvisible: false,\nloading: false\n},\n+ exportOption: {\n+ visible: false,\n+ loading: false,\n+ type: \"excel\",\n+ withOutLimit: true\n+ },\ninfo: {\nsql: null,\nmessage: null,\n@@ -284,24 +304,22 @@ export default {\nsql: this.result.sql\n});\n},\n- exportData() {\n- this.$confirm(\"Export without limit?\", \"Export\", {\n- confirmButtonText: \"Yes\",\n- cancelButtonText: \"No\",\n- type: \"warning\"\n- })\n- .then(() => {\n+ confirmExport(){\n+ if(this.exportOption.withOutLimit){\npostMessage({\ntype: \"export\",\nsql: this.result.sql.replace(/\\blimit\\b.+/gi, \"\")\n});\n- })\n- .catch(() => {\n+ }else{\npostMessage({\ntype: \"export\",\nsql: this.result.sql\n});\n- });\n+ }\n+ this.exportOption.visible=false;\n+ },\n+ exportData() {\n+ this.exportOption.visible = true;\n},\nfilter(event, column) {\nlet inputvalue = \"\" + event.target.value;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
init export panel
|
141,908
|
21.09.2020 16:20:17
| -28,800
|
a11760b87b21d84e6951b163e1cfe1b482337b2c
|
refactor export flow
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -3,18 +3,23 @@ import { ExportService } from \"./exportService\";\nimport { FieldInfo } from \"mysql\";\nimport * as fs from \"fs\";\nimport { Console } from \"../../common/outputChannel\";\n+import { ExportOption } from \"./exportOption\";\nexport abstract class AbstractExportService implements ExportService {\n- public export(sql: string): void {\n+ public export(exportOption: ExportOption): void {\nvscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\nif (folderPath) {\n- this.exportExcel(folderPath[0].fsPath, sql)\n+ exportOption.folderPath=folderPath[0].fsPath;\n+ if(exportOption.withOutLimit){\n+ exportOption.sql=exportOption.sql.replace(/\\blimit\\b.+/gi, \"\")\n+ }\n+ this.exportExcel(exportOption)\n}\n});\n}\n- protected abstract exportExcel(folderPath: string, sql: string): void;\n+ protected abstract exportExcel(exportOption:ExportOption): void;\nprotected exportByNodeXlsx(folderPath: string, fields: FieldInfo[], rows: any) {\nConsole.log(\"start export data...\")\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/export/exportOption.ts",
"diff": "+export class ExportOption {\n+ type: ExportType;\n+ withOutLimit: boolean;\n+ sql: string;\n+ folderPath: string;\n+}\n+\n+export enum ExportType {\n+ excel = \"excel\", sql = \"sql\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportService.ts",
"new_path": "src/service/export/exportService.ts",
"diff": "+import { ExportOption } from \"./exportOption\";\n+\nexport interface ExportService {\n- export(sql: string): void;\n+ export(exportOption:ExportOption): void;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/mysqlExportService.ts",
"new_path": "src/service/export/mysqlExportService.ts",
"diff": "@@ -2,11 +2,14 @@ import { FieldInfo } from \"mysql\";\nimport { Console } from \"../../common/outputChannel\";\nimport { ConnectionManager } from \"../connectionManager\";\nimport { AbstractExportService } from \"./abstractExportService\";\n+import { ExportOption } from \"./exportOption\";\nexport class MysqlExportService extends AbstractExportService {\n- protected async exportExcel(folderPath: string, sql: string) {\n+ protected async exportExcel(exportOption: ExportOption) {\n+ const folderPath = exportOption.folderPath\n+ const sql = exportOption.sql\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nconnection.query(sql, (err, rows, fields?: FieldInfo[]) => {\nif (err) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -94,7 +94,7 @@ export class QueryPage {\n})\nbreak;\ncase OperateType.export:\n- this.exportService.export(params.sql)\n+ this.exportService.export(params.option)\nbreak;\ncase OperateType.changeTheme:\nawait Global.updateConfig(ConfigKey.REULST_THEME, params.theme)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<!-- toolbar -->\n<div style=\"margin:8px\">\n<el-input v-model=\"table.search\" placeholder=\"Input To Search Data\" style=\"width:200px\" />\n- <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-orange\" circle title=\"Export\"></el-button>\n+ <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-share\" circle title=\"Export\"></el-button>\n<el-button type=\"info\" icon=\"el-icon-circle-plus-outline\" size=\"small\" circle @click=\"insertRequest\">\n</el-button>\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\nInsert</el-button>\n</span>\n</el-dialog>\n- <el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n+ <el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"30%\" top=\"3vh\" size=\"small\">\n<el-form :model=\"exportOption\">\n<el-form-item label=\"Export File Type\">\n<el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n@@ -305,17 +305,13 @@ export default {\n});\n},\nconfirmExport() {\n- if(this.exportOption.withOutLimit){\n- postMessage({\n- type: \"export\",\n- sql: this.result.sql.replace(/\\blimit\\b.+/gi, \"\")\n- });\n- }else{\npostMessage({\ntype: \"export\",\n+ option: {\n+ ...this.exportOption,\nsql: this.result.sql\n- });\n}\n+ });\nthis.exportOption.visible = false;\n},\nexportData() {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
refactor export flow
|
141,908
|
21.09.2020 16:29:57
| -28,800
|
3b5b077ba8c23327eb07d01b0737732e15b791a3
|
update to 2.5.7
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+## 2.5.7 - 2020/9/21\n+- Refacotr export panel.\n+\n## 2.5.5 - 2020/9/6\n- Change update as edit in same view.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.5.6\",\n+ \"version\": \"2.5.7\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 2.5.7
|
141,908
|
22.09.2020 23:09:38
| -28,800
|
d26f4c6b4009786213012581cf9fc56d26c60769
|
export data within db
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"element-ui\": \"^2.13.2\",\n\"mockjs\": \"^1.1.0\",\n\"mysql\": \"^2.18.1\",\n- \"mysqldump\": \"^3.1.0\",\n+ \"mysqldump_plus\": \"^3.2.2\",\n\"node-xlsx\": \"^0.15.0\",\n\"portfinder\": \"^1.0.26\",\n\"pretty-bytes\": \"^5.3.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "-import mysqldump, { Options } from 'mysqldump';\n+import mysqldump, { Options } from 'mysqldump_plus';\nimport * as vscode from \"vscode\";\nimport { Console } from \"../../common/outputChannel\";\nimport { Node } from \"../../model/interface/node\";\n@@ -29,6 +29,7 @@ Origin command : \\`mysqldump -h ${host} -P ${port} -u ${node.user} -p --database\nport: port,\n},\ndump: {\n+ withDatabase: true,\ntables: tableName ? [tableName] : [],\nschema: {\nformat: false,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
export data within db
|
141,908
|
22.09.2020 23:54:49
| -28,800
|
ee12032a388ee39aa20e099020df96c091ba5340
|
update to 2.5.8
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.5.7\",\n+ \"version\": \"2.5.8\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update to 2.5.8
|
141,909
|
01.10.2020 14:15:57
| -28,800
|
520c842fa8e103449aa409f2bd540a253192923c
|
sort by column order origin position
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -39,7 +39,7 @@ export class TableNode extends Node implements CopyAble {\nif (columnNodes && !isRresh) {\nreturn columnNodes;\n}\n- return QueryUnit.queryPromise<ColumnMeta[]>(await ConnectionManager.getConnection(this), `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength,COLUMN_DEFAULT defaultValue,EXTRA extra FROM information_schema.columns WHERE table_schema = '${this.database}' AND table_name = '${this.table}';`)\n+ return QueryUnit.queryPromise<ColumnMeta[]>(await ConnectionManager.getConnection(this), `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength,COLUMN_DEFAULT defaultValue,EXTRA extra FROM information_schema.columns WHERE table_schema = '${this.database}' AND table_name = '${this.table}' ORDER BY ORDINAL_POSITION;`)\n.then((columns) => {\ncolumnNodes = columns.map<ColumnNode>((column) => {\nif (column && column.key == \"PRI\") {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
sort by column order origin position
|
141,908
|
20.10.2020 14:33:44
| -28,800
|
93add9aaa13929c4c5dc09971832634f839617e4
|
Support add workspace connection
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"properties\": {\n\"vscode-mysql.maxTableCount\": {\n\"type\": \"integer\",\n- \"default\": 500,\n+ \"default\": 1000,\n\"description\": \"The maximum table count shown in the tree view\"\n},\n\"vscode-mysql.enableDelimiter\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -22,8 +22,9 @@ export class ConnectionNode extends Node implements CopyAble {\nconstructor(readonly id: string, readonly parent: Node) {\nsuper(id)\nthis.init(parent)\n+ this.id=this.getConnectId()\nif (parent.name) {\n- this.label = `${parent.name}_${id}`\n+ this.label = `${parent.name}_${this.id}`\nthis.name = parent.name\n}\nconst lcp = ConnectionManager.getLastConnectionOption(false);\n@@ -109,11 +110,12 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async deleteConnection(context: vscode.ExtensionContext) {\nUtil.confirm(`Are you want to Delete Connection ${this.id} ? `, async () => {\n- const connections = context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n+ const targetContext = this.global === false ? context.workspaceState : context.globalState;\n+ const connections = targetContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nConnectionManager.removeConnection(this.id)\nDatabaseCache.clearDatabaseCache(this.id)\ndelete connections[this.id];\n- await context.globalState.update(CacheKey.ConectionsKey, connections);\n+ await targetContext.update(CacheKey.ConectionsKey, connections);\nDbTreeDataProvider.refresh();\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -14,6 +14,7 @@ export abstract class Node extends vscode.TreeItem {\npublic certPath?: string;\npublic excludeDatabases?: string;\n+ public global?: boolean;\npublic usingSSH?: boolean;\npublic ssh?: SSHConfig;\n@@ -31,6 +32,7 @@ export abstract class Node extends vscode.TreeItem {\nthis.certPath = source.certPath\nthis.ssh = source.ssh\nthis.usingSSH = source.usingSSH\n+ this.global = source.global\nthis.excludeDatabases = source.excludeDatabases\nthis.collapsibleState = DatabaseCache.getElementState(this)\n}\n@@ -39,11 +41,15 @@ export abstract class Node extends vscode.TreeItem {\nreturn []\n}\n- public getConnectId(): string {\n+ public getConnectId(SpecGlobal?: boolean): string {\n+\n+ const targetGlobal = SpecGlobal != null ? SpecGlobal : this.global;\n+ const prefix = targetGlobal === false ? \"workspace\" : \"global\";\n+\nif (this.usingSSH && this.ssh) {\n- return `${this.ssh.host}_${this.ssh.port}_${this.ssh.username}`;\n+ return `${prefix}_${this.ssh.host}_${this.ssh.port}_${this.ssh.username}`;\n}\n- return `${this.host}_${this.port}_${this.user}`;\n+ return `${prefix}_${this.host}_${this.port}_${this.user}`;\n}\npublic getHost(): string { return this.usingSSH ? this.ssh.host : this.host }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -53,7 +53,19 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic async addConnection(connectionNode: Node) {\n- let connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n+\n+ // if is add from edit, clear previous connection info.\n+ const editGlobal = (connectionNode as any).isGlobal;\n+ if (editGlobal != null) {\n+ const oldContext = editGlobal === false ? this.context.workspaceState : this.context.globalState;\n+ const oldConnections = oldContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey)\n+ delete oldConnections[connectionNode.getConnectId(editGlobal)]\n+ await oldContext.update(CacheKey.ConectionsKey, oldConnections);\n+ }\n+\n+ const targetContext = connectionNode.global === false ? this.context.workspaceState : this.context.globalState;\n+\n+ let connections = targetContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (!connections) {\nconnections = {};\n@@ -64,7 +76,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nConnectionManager.removeConnection(connectId)\n- await this.context.globalState.update(CacheKey.ConectionsKey, connections);\n+ await targetContext.update(CacheKey.ConectionsKey, connections);\nDbTreeDataProvider.refresh();\n}\n@@ -81,7 +93,13 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\npublic async getConnectionNodes(): Promise<ConnectionNode[]> {\nconst connectionNodes = [];\n- const connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n+ let connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n+ if (connections) {\n+ for (const key of Object.keys(connections)) {\n+ connectionNodes.push(new ConnectionNode(key, connections[key]));\n+ }\n+ }\n+ connections = this.context.workspaceState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\nconnectionNodes.push(new ConnectionNode(key, connections[key]));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "@@ -68,7 +68,10 @@ export class DatabaseCache {\n}\nif (!this.collpaseState || Object.keys(this.collpaseState).length == 0) {\n- this.collpaseState = this.context.globalState.get(CacheKey.CollapseSate);\n+ this.collpaseState =\n+ (element.global === false) ?\n+ this.context.workspaceState.get(CacheKey.CollapseSate) : this.context.globalState.get(CacheKey.CollapseSate)\n+ ;\n}\nif (!this.collpaseState) {\n@@ -98,7 +101,11 @@ export class DatabaseCache {\n}\nthis.collpaseState[element.id] = collapseState;\n+ if (element.global === false) {\n+ this.context.workspaceState.update(CacheKey.CollapseSate, this.collpaseState);\n+ } else {\nthis.context.globalState.update(CacheKey.CollapseSate, this.collpaseState);\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -14,7 +14,8 @@ import { DbTreeDataProvider } from \"../provider/treeDataProvider\";\ninterface ConnectionWrapper {\nconnection: mysql.Connection;\n- ssh: SSHConfig\n+ ssh: SSHConfig;\n+ createTime: Date\n}\nexport class ConnectionManager {\n@@ -92,7 +93,7 @@ export class ConnectionManager {\nreturn;\n}\n}\n- this.activeConnection[key] = { connection: this.createConnection(connectOption), ssh };\n+ this.activeConnection[key] = { connection: this.createConnection(connectOption), ssh, createTime: new Date() };\nthis.activeConnection[key].connection.connect((err: Error) => {\nif (!err) {\nthis.lastConnectionNode = NodeUtil.of(connectionNode);\n@@ -127,12 +128,13 @@ export class ConnectionManager {\nif (fileName.includes('cweijan.vscode-mysql-client2')) {\nconst queryName = path.basename(fileName, path.extname(fileName))\nconst filePattern = queryName.split('_');\n- const [host, port, user] = filePattern\n+ const [mode, host, port, user] = filePattern\nlet database: string;\n- if (filePattern.length >= 4) {\n- database = filePattern[3]\n- if (filePattern.length >= 4) {\n- for (let index = 4; index < filePattern.length; index++) {\n+ if (filePattern.length >= 5) {\n+ database = filePattern[4]\n+ // fix if database name has _, loop append\n+ if (filePattern.length >= 5) {\n+ for (let index = 5; index < filePattern.length; index++) {\ndatabase = `${database}_${filePattern[index]}`\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/connect/abstractConnectService.ts",
"new_path": "src/view/connect/abstractConnectService.ts",
"diff": "@@ -13,7 +13,7 @@ export abstract class AbstractConnectService {\npublic async openConnect(provider: DbTreeDataProvider, connectionNode?: ConnectionNode) {\nlet node: any;\nif (connectionNode) {\n- node = { ...connectionNode }\n+ node = { ...connectionNode ,isGlobal:connectionNode.global }\nif (node.ssh) {\nnode.ssh.tunnelPort = null\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "</div>\n</div>\n</el-row>\n+ <el-row>\n+ <div class=\"field field__input\">\n+ Global:\n+ <el-switch v-model=\"connectionOption.global\"></el-switch>\n+ </div>\n+ </el-row>\n<el-row>\n<div class=\"field field__input\">\nusingSSH:\n@@ -127,6 +133,7 @@ export default {\npassword: \"\",\ndatabase: null,\nusingSSH: false,\n+ global: true,\nexcludeDatabases: \"mysql,performance_schema,information_schema,sys\",\ntimezone: \"+00:00\",\nssh: {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support add workspace connection
|
141,908
|
20.10.2020 15:22:54
| -28,800
|
858a7e8e5d6f94d4db7425448b051220910e9c44
|
Fix run mock fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockModel.ts",
"new_path": "src/service/mock/mockModel.ts",
"diff": "export interface MockModel {\n+ mode: string;\nhost: string;\nport: number;\nuser: string;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -22,6 +22,7 @@ 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',\nhost: tableNode.getHost(), port: tableNode.getPort(), user: tableNode.getUser(), database: tableNode.database, table: tableNode.table,\nmockStartIndex: MockRunner.primaryKeyMap[tableNode.getConnectId()] ? 'auto' : 1\n, mockCount: 50, examples: \"http://mockjs.com/examples.html#DPD\", mock: {}\n@@ -58,7 +59,10 @@ export class MockRunner {\nconst content = vscode.window.activeTextEditor.document.getText()\nconst mockModel = JSON.parse(content) as MockModel;\n- const databaseid = `${mockModel.host}_${mockModel.port}_${mockModel.user}_${mockModel.database}`;\n+ if(!mockModel.mode){\n+ mockModel.mode='global'\n+ }\n+ const databaseid = `${mockModel.mode}_${mockModel.host}_${mockModel.port}_${mockModel.user}_${mockModel.database}`;\nconst tableList = DatabaseCache.getChildListOfDatabase(databaseid) as TableNode[]\nif (!tableList) {\nvscode.window.showErrorMessage(`Database ${mockModel.database} not found!`)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix run mock fail
|
141,908
|
20.10.2020 16:06:57
| -28,800
|
f25108c53b9ebc0ef6f6525cf01b44650e188ce9
|
Compatible previous connection
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -96,15 +96,25 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nlet connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\n- connectionNodes.push(new ConnectionNode(key, connections[key]));\n+ const connection = new ConnectionNode(key, connections[key]);\n+ delete connections[key]\n+ connections[connection.getConnectId()] = connection\n+ connectionNodes.push(connection);\n}\n}\n+ await this.context.globalState.update(CacheKey.ConectionsKey, connections);\n+\nconnections = this.context.workspaceState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\n- connectionNodes.push(new ConnectionNode(key, connections[key]));\n+ const connection = new ConnectionNode(key, connections[key]);\n+ delete connections[key]\n+ connections[connection.getConnectId()] = connection\n+ connectionNodes.push(connection);\n}\n}\n+ await this.context.workspaceState.update(CacheKey.ConectionsKey, connections);\n+\nreturn connectionNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/connect/abstractConnectService.ts",
"new_path": "src/view/connect/abstractConnectService.ts",
"diff": "@@ -13,7 +13,10 @@ export abstract class AbstractConnectService {\npublic async openConnect(provider: DbTreeDataProvider, connectionNode?: ConnectionNode) {\nlet node: any;\nif (connectionNode) {\n- node = { ...connectionNode ,isGlobal:connectionNode.global }\n+ if (connectionNode.global == null) {\n+ connectionNode.global = true\n+ }\n+ node = { ...connectionNode, isGlobal: connectionNode.global !== false }\nif (node.ssh) {\nnode.ssh.tunnelPort = null\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Compatible previous connection
|
141,908
|
20.10.2020 16:18:40
| -28,800
|
f8d2ba795fef9e4c807b8c16ea253eb478054e79
|
Prevent global state failure
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -96,6 +96,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nlet connections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\n+ connections[key].global = true;\nconst connection = new ConnectionNode(key, connections[key]);\ndelete connections[key]\nconnections[connection.getConnectId()] = connection\n@@ -107,6 +108,7 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nconnections = this.context.workspaceState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\nif (connections) {\nfor (const key of Object.keys(connections)) {\n+ connections[key].global = false;\nconst connection = new ConnectionNode(key, connections[key]);\ndelete connections[key]\nconnections[connection.getConnectId()] = connection\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Prevent global state failure
|
141,908
|
09.11.2020 09:27:59
| -28,800
|
5e44676429f19c9af7858d9ec60ae9ccc85d5246
|
export custom path
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dump/abstractDumpService.ts",
"new_path": "src/service/dump/abstractDumpService.ts",
"diff": "@@ -3,6 +3,8 @@ import * as vscode from \"vscode\";\nimport { DatabaseCache } from \"../common/databaseCache\";\nimport { Console } from \"../../common/outputChannel\";\nimport { DatabaseNode } from \"../../model/database/databaseNode\";\n+import format = require('date-format');\n+import path = require('path');\nimport { TableNode } from \"../../model/main/tableNode\";\nexport abstract class AbstractDumpService {\n@@ -21,11 +23,14 @@ export abstract class AbstractDumpService {\n}\n}\n- vscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\n+ const tableName = node instanceof TableNode ? node.table : null;\n+ const exportSqlName = `${tableName ? tableName : ''}_${format('yyyy-MM-dd_hhmmss', new Date())}_${node.database}.sql`;\n+\n+ vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(exportSqlName), filters: { 'sql': ['sql'] } }).then((folderPath) => {\nif (folderPath) {\n- this.dumpData(node, folderPath[0].fsPath, withData, tables)\n+ this.dumpData(node, folderPath.fsPath, withData, tables)\n}\n- });\n+ })\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "@@ -2,20 +2,14 @@ import mysqldump, { Options } from 'mysqldump_plus';\nimport * as vscode from \"vscode\";\nimport { Console } from \"../../common/outputChannel\";\nimport { Node } from \"../../model/interface/node\";\n-import { TableNode } from \"../../model/main/tableNode\";\nimport { NodeUtil } from \"../../model/nodeUtil\";\nimport { AbstractDumpService } from \"./abstractDumpService\";\n-import format = require('date-format');\n-import path = require('path');\nexport class MysqlDumpService extends AbstractDumpService {\n- protected dumpData(node: Node, exportPath: string, withData: boolean,tables:string[]): void {\n+ protected dumpData(node: Node, dumpFilePath: string, withData: boolean,tables:string[]): void {\nconst host = node.usingSSH ? \"127.0.0.1\" : node.host\nconst port = node.usingSSH ? NodeUtil.getTunnelPort(node.getConnectId()) : node.port;\n- const tableName = node instanceof TableNode ? node.table : null;\n- const dumpFilePath = path.join(exportPath, `${node.database}${tableName ? \"_\" + tableName : ''}_${format('yyyy-MM-dd_hhmmss', new Date())}.sql`);\n-\nConsole.log(`Doing backup ${host}_${node.database}...\nOrigin command : \\`mysqldump -h ${host} -P ${port} -u ${node.user} -p --database ${node.database} > ${dumpFilePath}\\`.`);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
export custom path
|
141,908
|
09.11.2020 10:31:25
| -28,800
|
47693058cec4ea69203da6a4a2a790dfc12c7bb1
|
export xlsx can custom file name
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -7,24 +7,26 @@ import { ExportOption } from \"./exportOption\";\nexport abstract class AbstractExportService implements ExportService {\npublic export(exportOption: ExportOption): void {\n- vscode.window.showOpenDialog({ canSelectMany: false, openLabel: \"Select export file path\", canSelectFiles: false, canSelectFolders: true }).then((folderPath) => {\n- if (folderPath) {\n- exportOption.folderPath=folderPath[0].fsPath;\n+ const randomFileName=`${new Date().getTime()}.xlsx`\n+\n+ vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'xlsx': ['xlsx'] } }).then((filePath) => {\n+ if (filePath) {\n+ exportOption.exportPath=filePath.fsPath;\nif(exportOption.withOutLimit){\nexportOption.sql=exportOption.sql.replace(/\\blimit\\b.+/gi, \"\")\n}\nthis.exportExcel(exportOption)\n}\n- });\n+ })\n}\nprotected abstract exportExcel(exportOption:ExportOption): void;\n- protected exportByNodeXlsx(folderPath: string, fields: FieldInfo[], rows: any) {\n+ protected exportByNodeXlsx(filePath: string, fields: FieldInfo[], rows: any) {\nConsole.log(\"start export data...\")\nconst nodeXlsx = require('node-xlsx');\n- fs.writeFileSync(`${folderPath}/${new Date().getTime()}.xlsx`, nodeXlsx.build([{\n+ fs.writeFileSync(filePath, nodeXlsx.build([{\nname: \"sheet1\",\ndata: [\nfields.map((field) => field.name),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportOption.ts",
"new_path": "src/service/export/exportOption.ts",
"diff": "@@ -2,7 +2,7 @@ export class ExportOption {\ntype: ExportType;\nwithOutLimit: boolean;\nsql: string;\n- folderPath: string;\n+ exportPath: string;\n}\nexport enum ExportType {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/mysqlExportService.ts",
"new_path": "src/service/export/mysqlExportService.ts",
"diff": "@@ -8,7 +8,7 @@ export class MysqlExportService extends AbstractExportService {\nprotected async exportExcel(exportOption: ExportOption) {\n- const folderPath = exportOption.folderPath\n+ const filePath = exportOption.exportPath\nconst sql = exportOption.sql\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nconnection.query(sql, (err, rows, fields?: FieldInfo[]) => {\n@@ -16,7 +16,7 @@ export class MysqlExportService extends AbstractExportService {\nConsole.log(err)\nreturn;\n}\n- super.exportByNodeXlsx(folderPath, fields, rows);\n+ super.exportByNodeXlsx(filePath, fields, rows);\n})\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
export xlsx can custom file name
|
141,908
|
12.11.2020 09:15:24
| -28,800
|
b66686d210e980f878c7f6000e3ac9d900e088da
|
add more function
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/Complection/chain/functionChain.ts",
"new_path": "src/provider/Complection/chain/functionChain.ts",
"diff": "@@ -3,7 +3,7 @@ import { ComplectionChain, ComplectionContext } from \"../complectionContext\";\nexport class FunctionChain implements ComplectionChain {\nprivate functionList: string[] = [\"CHAR_LENGTH\", \"CONCAT\", \"NOW\", \"DATE_ADD\", \"DATE_SUB\", \"MAX\", \"COUNT\", \"MIN\", \"SUM\", \"AVG\", \"LENGTH\", \"IF\", \"IFNULL\",\n- \"MD5\", \"SHA\", \"CURRENT_DATE\", \"DATE_FORMAT\", \"CAST\", \"TRIM\"];\n+ \"MD5\", \"SHA\", \"CURRENT_DATE\", \"DATE_FORMAT\", \"CAST\", \"TRIM\",\"LAST_INSERT_ID\",\"MOD\"];\nprivate functionComplectionItems: vscode.CompletionItem[] = [];\nconstructor() {\nthis.functionList.forEach((keyword) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -40,6 +40,7 @@ module.exports = [\nplugins: [\nnew VueLoaderPlugin(),\nnew HtmlWebpackPlugin({ inject: true, template: './src/vue/index.html', chunks: ['app'], filename: 'webview/app.html' }),\n+ new HtmlWebpackPlugin({ inject: true, template: './src/vue/index.html', chunks: ['query'], filename: 'webview/result.html' }),\nnew CopyWebpackPlugin({\npatterns: [{ from: 'public', to: './webview' }]\n}),\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add more function
|
141,908
|
12.11.2020 10:01:24
| -28,800
|
744e18bdace6675e17921e2cbc17fffea5cc1fb0
|
support using function on gui
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<template>\n<span>\n{{ column.name }} : {{ column.type }} \n- <span style=\"color: red;\">{{ column.key }}{{ column.nullable == 'YES' ? '' : ' NOT NULL' }}</span> \n+ <span style=\"color: red !important;\">{{ column.key }}{{ column.nullable == 'YES' ? '' : ' NOT NULL' }}</span> \n<span>{{ column.defaultValue ? ` Default : ${column.defaultValue}` : \"\" }}</span>\n<span>{{ column.extra == \"auto_increment\" ? ` AUTO_INCREMENT` : \"\" }}</span>\n</span>\n@@ -392,6 +392,9 @@ export default {\nif (value === \"\") {\nreturn \"null\";\n}\n+ if(/\\(.*?\\)/.exec(value)){\n+ return value;\n+ }\nif (typeof value == \"string\") {\nvalue = value.replace(/'/g, \"\\\\'\");\n}\n@@ -453,6 +456,7 @@ export default {\nconst oldEle = this.update.current[key];\nconst newEle = this.update.currentNew[key];\nif (oldEle !== newEle) {\n+ console.log(newEle)\nchange += `\\`${key}\\`=${this.wrapQuote(key, newEle)},`;\n}\n}\n@@ -731,6 +735,12 @@ body {\nmargin-right: 10px;\n}\n+.title-info,\n+.plx-cell--title {\n+ user-select: all;\n+}\n+\n+\n.hint {\nbox-sizing: border-box;\npadding: 5px;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support using function on gui
|
141,908
|
12.11.2020 11:51:48
| -28,800
|
58cc35e16701cb549e810e237f89baa8e5d82dcb
|
add includeDatabase filter
|
[
{
"change_type": "RENAME",
"old_path": "src/vue/index.html",
"new_path": "public/index.html",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -46,9 +46,14 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn QueryUnit.queryPromise<any[]>(connection, \"show databases\")\n.then((databases) => {\nconst databaseNodes = databases.filter((db) => {\n- if (this.database) {\n- return db.Database == this.database;\n+\n+ if (this.includeDatabases) {\n+ for (const includeDatabase of this.includeDatabases.split(\",\")) {\n+ if (db.Database == includeDatabase.trim()) { return true; }\n+ }\n+ return false;\n}\n+\nif (this.excludeDatabases) {\nfor (const excludeDatabase of this.excludeDatabases.split(\",\")) {\nif (db.Database == excludeDatabase.trim()) { return false; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -12,6 +12,7 @@ export abstract class Node extends vscode.TreeItem {\npublic name?: string;\npublic timezone?: string;\npublic certPath?: string;\n+ public includeDatabases?: string;\npublic excludeDatabases?: string;\npublic global?: boolean;\n@@ -33,6 +34,7 @@ export abstract class Node extends vscode.TreeItem {\nthis.ssh = source.ssh\nthis.usingSSH = source.usingSSH\nthis.global = source.global\n+ this.includeDatabases = source.includeDatabases\nthis.excludeDatabases = source.excludeDatabases\nthis.collapsibleState = DatabaseCache.getElementState(this)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "</div>\n<div>\n<div class=\"field field__input\">\n- <strong>database:</strong>\n- <input class=\"field__input\" placeholder=\"database, can be empty\" v-model=\"connectionOption.database\" />\n+ <strong>includeDatabases:</strong>\n+ <input class=\"field__input\" v-model=\"connectionOption.includeDatabases\" />\n</div>\n</div>\n<div>\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -39,8 +39,8 @@ module.exports = [\n},\nplugins: [\nnew VueLoaderPlugin(),\n- new HtmlWebpackPlugin({ inject: true, template: './src/vue/index.html', chunks: ['app'], filename: 'webview/app.html' }),\n- new HtmlWebpackPlugin({ inject: true, template: './src/vue/index.html', chunks: ['query'], filename: 'webview/result.html' }),\n+ new HtmlWebpackPlugin({ inject: true, template: './public/index.html', chunks: ['app'], filename: 'webview/app.html' }),\n+ new HtmlWebpackPlugin({ inject: true, template: './public/index.html', chunks: ['query'], filename: 'webview/result.html' }),\nnew CopyWebpackPlugin({\npatterns: [{ from: 'public', to: './webview' }]\n}),\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add includeDatabase filter
|
141,908
|
12.11.2020 12:45:55
| -28,800
|
c632ea470e735fd062db1fbf2937c333c0766f5d
|
update table color
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/auto.css",
"new_path": "public/theme/auto.css",
"diff": "@@ -1331,7 +1331,7 @@ body {\n.el-pagination__sizes {\nmargin: 0 10px 0 0;\nfont-weight: 400;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-pagination__sizes .el-input .el-input__inner {\n@@ -1346,13 +1346,13 @@ body {\n.el-pagination__total {\nmargin-right: 10px;\nfont-weight: 400;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-pagination__jump {\nmargin-left: 24px;\nfont-weight: 400;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-pagination__jump .el-input__inner {\n@@ -1413,7 +1413,7 @@ body {\n}\n.el-dialog, .el-pager li {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\n-webkit-box-sizing: border-box\n}\n@@ -2218,7 +2218,7 @@ body {\n.el-radio-button__inner {\nwhite-space: nowrap;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid var(--border-color);\nfont-weight: 500;\nborder-left: 0;\n@@ -2740,7 +2740,7 @@ body {\nwidth: 100%;\nmax-width: 100%;\nfont-size: 14px;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-table--mini, .el-table--small, .el-table__expand-icon {\n@@ -3058,7 +3058,7 @@ body {\n.el-table__fixed-footer-wrapper tbody td {\nborder-top: 1px solid #EBEEF5;\nbackground-color: #F5F7FA;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-table__fixed-body-wrapper {\n@@ -3092,7 +3092,7 @@ body {\n.el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {\nbackground-color: #F5F7FA;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-table__body-wrapper {\n@@ -3164,19 +3164,23 @@ body {\n}\n.el-table--striped .el-table__body tr.el-table__row--striped td {\n- background: #FAFAFA\n+ background: var(--vscode-editorSuggestWidget-background) !important;\n+ color: var(--primary-color) !important;\n}\n.el-table--striped .el-table__body tr.el-table__row--striped.current-row td {\n- background-color: #ecf5ff\n+ background: var(--vscode-editorSuggestWidget-background) !important;\n+ color: var(--primary-color) !important;\n}\n.el-table__body tr.hover-row.current-row > td, .el-table__body tr.hover-row.el-table__row--striped.current-row > td, .el-table__body tr.hover-row.el-table__row--striped > td, .el-table__body tr.hover-row > td {\n- background-color: #F5F7FA\n+ background: var(--vscode-tab-hoverBackground) !important;\n+ color: var(--primary-color) !important;\n}\n.el-table__body tr.current-row > td {\n- background-color: #ecf5ff\n+ background: var(--vscode-editorSuggestWidget-background) !important;\n+ color: var(--primary-color) !important;\n}\n.el-table__column-resize-proxy {\n@@ -3208,7 +3212,7 @@ body {\n}\n.el-table--enable-row-hover .el-table__body tr:hover > td {\n- background-color: #F5F7FA\n+ background: var(--vscode-tab-hoverBackground) !important;\n}\n.el-table--fluid-height .el-table__fixed, .el-table--fluid-height .el-table__fixed-right {\n@@ -3330,7 +3334,7 @@ body {\n}\n.el-date-table.is-week-mode .el-date-table__row:hover td.available:hover {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-date-table.is-week-mode .el-date-table__row:hover td:first-child div {\n@@ -3444,7 +3448,7 @@ body {\n.el-date-table td.week {\nfont-size: 80%;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-month-table, .el-year-table {\n@@ -3743,7 +3747,7 @@ body {\nline-height: 22px;\ntext-align: center;\ncursor: pointer;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-date-picker__header-label.active, .el-date-picker__header-label:hover {\n@@ -3857,7 +3861,7 @@ body {\noutline: 0;\npadding: 0;\nwidth: 39%;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-date-editor .el-range-input::-webkit-input-placeholder {\n@@ -3994,7 +3998,7 @@ body {\ncolor: var(--input-color);\nborder: 1px solid var(--border-color);\nbox-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder-radius: 4px;\nline-height: 30px;\nmargin: 5px 0\n@@ -4142,7 +4146,7 @@ body {\n}\n.el-time-spinner__wrapper.is-arrow .el-time-spinner__item:hover:not(.disabled):not(.active) {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\ncursor: default\n}\n@@ -4191,7 +4195,7 @@ body {\nheight: 32px;\nline-height: 32px;\nfont-size: 12px;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-time-spinner__item:hover:not(.disabled):not(.active) {\n@@ -4336,7 +4340,7 @@ body {\n.el-popover {\nposition: absolute;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nmin-width: 150px;\nborder: 1px solid #EBEEF5;\npadding: 12px;\n@@ -4681,7 +4685,7 @@ body {\n}\n.el-breadcrumb__inner {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link {\n@@ -5101,7 +5105,7 @@ body {\n}\n.el-tabs--border-card {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid var(--border-color);\n-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04);\nbox-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04)\n@@ -5554,8 +5558,8 @@ body {\n.el-tree {\nposition: relative;\ncursor: default;\n- background: #FFF;\n- color: #606266\n+ background-color: var(--vscode-editor-background);\n+ color: var(--primary-color);\n}\n.el-tree__empty-block {\n@@ -5882,7 +5886,7 @@ body {\n}\n.el-notification__closeBtn:hover {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-notification .el-icon-success {\n@@ -6189,7 +6193,7 @@ body {\n}\n.el-tooltip__popper.is-light {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid #303133\n}\n@@ -9492,7 +9496,7 @@ body {\nright: 5px;\ncursor: pointer;\nopacity: .75;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-upload-list__item .el-icon-close:hover {\n@@ -10476,7 +10480,7 @@ body {\nfont-size: 14px;\n-webkit-box-sizing: border-box;\nbox-sizing: border-box;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\n-webkit-transition: .15s ease-out;\ntransition: .15s ease-out\n}\n@@ -11656,7 +11660,7 @@ body {\n.el-cascader__dropdown {\nmargin: 5px 0;\nfont-size: 14px;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid var(--border-color);\nborder-radius: 4px;\n-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);\n@@ -11868,7 +11872,7 @@ body {\nwidth: 4px;\nheight: 100%;\nborder-radius: 1px;\n- background: #fff;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid #f0f0f0;\n-webkit-box-shadow: 0 0 2px rgba(0, 0, 0, .6);\nbox-shadow: 0 0 2px rgba(0, 0, 0, .6);\n@@ -11958,7 +11962,7 @@ body {\nwidth: 4px;\nheight: 100%;\nborder-radius: 1px;\n- background: #fff;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid #f0f0f0;\n-webkit-box-shadow: 0 0 2px rgba(0, 0, 0, .6);\nbox-shadow: 0 0 2px rgba(0, 0, 0, .6);\n@@ -12240,7 +12244,7 @@ body {\n.el-textarea .el-input__count {\ncolor: #909399;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nposition: absolute;\nfont-size: 12px;\nbottom: 5px;\n@@ -12305,7 +12309,7 @@ body {\n}\n.el-input::-webkit-scrollbar-track-piece {\n- background: #fff;\n+ background-color: var(--vscode-editor-background);\nwidth: 6px\n}\n@@ -12334,7 +12338,7 @@ body {\n}\n.el-input .el-input__count .el-input__count-inner {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nline-height: initial;\ndisplay: inline-block;\npadding: 0 5px\n@@ -12632,7 +12636,7 @@ body {\nborder: 1px solid #EBEEF5;\nborder-radius: 4px;\noverflow: hidden;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\ndisplay: inline-block;\nvertical-align: middle;\nwidth: 200px;\n@@ -12673,7 +12677,7 @@ body {\n}\n.el-transfer-panel__item.el-checkbox {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-transfer-panel__item:hover {\n@@ -12760,7 +12764,7 @@ body {\n.el-transfer-panel .el-transfer-panel__footer {\nheight: 40px;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nmargin: 0;\npadding: 0;\nborder-top: 1px solid #EBEEF5;\n@@ -12785,7 +12789,7 @@ body {\n.el-transfer-panel .el-transfer-panel__footer .el-checkbox {\npadding-left: 20px;\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-transfer-panel .el-transfer-panel__empty {\n@@ -13037,7 +13041,7 @@ body {\n}\n.el-link.el-link--default {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-link.el-link--default:hover {\n@@ -13401,7 +13405,7 @@ body {\nline-height: 1;\nwhite-space: nowrap;\ncursor: pointer;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid var(--border-color);\ncolor: var(--input-color);\n-webkit-appearance: none;\n@@ -13443,7 +13447,7 @@ body {\n}\n.el-button.is-plain:focus, .el-button.is-plain:hover {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder-color: #409EFF;\ncolor: #409EFF\n}\n@@ -13454,7 +13458,7 @@ body {\n}\n.el-button.is-plain:active {\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\noutline: 0\n}\n@@ -14365,7 +14369,7 @@ body {\nwhite-space: nowrap;\nvertical-align: middle;\ncursor: pointer;\n- background: #FFF;\n+ background-color: var(--vscode-editor-background);\nborder: 1px solid var(--border-color);\nborder-left: 0;\ncolor: var(--input-color);\n@@ -14821,7 +14825,7 @@ body {\n}\n.el-cascader-node.is-selectable.in-active-path {\n- color: #606266\n+ color: var(--primary-color);\n}\n.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
update table color
|
141,908
|
19.11.2020 12:10:06
| -28,800
|
22ca95783e7e6556573568ed1ddef9176b2e439f
|
migrate webview to new inner api
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -65,31 +65,26 @@ export class QueryPage {\nsplitView: this.isActiveSql(),\npath: 'result', title,\niconPath: Global.getExtPath(\"resources\", \"icon\", \"query.svg\"),\n- initListener: (webviewPanel) => {\n+ eventHandler: async (handler) => {\n+ handler.on(\"init\", () => {\nif (queryParam.res?.table) {\n- webviewPanel.title = queryParam.res.table\n+ handler.panel.title = queryParam.res.table\n}\n- webviewPanel.webview.postMessage(queryParam);\n- },\n- receiveListener: async (viewPanel, params) => {\n- switch (params.type) {\n- case OperateType.execute:\n+ handler.emit(queryParam.type, queryParam.res)\n+ }).on(OperateType.execute, (params) => {\nif (!queryParam.singlePage) {\nthis.hodlder.set(params.sql.trim(), title)\n}\nQueryUnit.runQuery(params.sql);\n- break;\n- case OperateType.next:\n+ }).on(OperateType.next,async (params) => {\nconst sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nQueryUnit.queryPromise(connection, sql).then((rows) => {\n- viewPanel.webview.postMessage({ type: MessageType.NEXT_PAGE, res: { sql, data: rows } as DataResponse });\n+ handler.panel.webview.postMessage({ type: MessageType.NEXT_PAGE, res: { sql, data: rows } as DataResponse });\n})\n- break;\n- case OperateType.export:\n+ }).on(OperateType.export,(params)=>{\nthis.exportService.export(params.option)\n- break;\n- }\n+ })\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/viewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -4,7 +4,6 @@ import * as vscode from \"vscode\";\nimport { WebviewPanel } from \"vscode\";\nimport { Console } from \"../common/Console\";\nimport { EventEmitter } from 'events'\n-import webpack = require(\"webpack\");\nexport class ViewOption {\npublic iconPath?: string;\n@@ -23,14 +22,6 @@ export class ViewOption {\n* receive webview send message\n*/\npublic handleHtml?: (html: string, viewPanel: WebviewPanel) => string;\n- /**\n- * receive webview send message\n- */\n- public receiveListener?: (viewPanel: WebviewPanel, message: any) => void;\n- /**\n- * callback when init success.\n- */\n- public initListener?: (viewPanel: WebviewPanel) => void;\npublic eventHandler?: (handler: Hanlder) => void;\n}\n@@ -53,8 +44,6 @@ interface ViewState {\ninstance: WebviewPanel;\ncreating: boolean;\neventEmitter: EventEmitter;\n- initListener: (viewPanel: WebviewPanel) => void;\n- receiveListener: (viewPanel: WebviewPanel, message: any) => void;\n}\nexport class ViewManager {\n@@ -81,12 +70,6 @@ export class ViewManager {\nif (viewOption.killHidden && currentStatus.instance?.visible == false) {\ncurrentStatus.instance.dispose()\n} else {\n- if (currentStatus.creating) {\n- currentStatus.initListener = viewOption.initListener\n- } else if (viewOption.initListener) {\n- viewOption.initListener(currentStatus.instance)\n- }\n- if (viewOption.receiveListener) { currentStatus.receiveListener = viewOption.receiveListener }\ncurrentStatus.eventEmitter.removeAllListeners()\nif (viewOption.eventHandler) {\nviewOption.eventHandler(new Hanlder(currentStatus.instance, currentStatus.eventEmitter))\n@@ -95,7 +78,7 @@ export class ViewManager {\nreturn Promise.resolve(currentStatus.instance);\n}\n}\n- const newStatus = { creating: true, instance: null, eventEmitter: new EventEmitter(), initListener: viewOption.initListener, receiveListener: viewOption.receiveListener }\n+ const newStatus = { creating: true, instance: null, eventEmitter: new EventEmitter() }\nthis.viewStatu[viewOption.title] = newStatus\nconst targetPath = `${this.webviewPath}/${viewOption.path}.html`;\nfs.readFile(targetPath, 'utf8', async (err, data) => {\n@@ -133,11 +116,6 @@ export class ViewManager {\nnewStatus.eventEmitter.emit(message.type, message.content)\nif (message.type == 'init') {\nnewStatus.creating = false\n- if (newStatus.initListener) {\n- newStatus.initListener(webviewPanel)\n- }\n- } else if (newStatus.receiveListener) {\n- newStatus.receiveListener(webviewPanel, message)\n}\n})\nresolve(webviewPanel);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
migrate webview to new inner api
|
141,908
|
19.11.2020 14:05:56
| -28,800
|
9dfa0b8489840c147f200d48ce9a59b611c4b653
|
Hide extra toolbar when not select
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -448,6 +448,10 @@ export default {\nif (row.isFilter) {\nreturn;\n}\n+ if(this.$refs.dataTable.getCheckboxRecords().length==0){\n+ this.toolbar.row = {};\n+ return;\n+ }\nthis.toolbar.row = row;\nthis.update = {\ncurrent: row,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Hide extra toolbar when not select
|
141,908
|
19.11.2020 14:19:52
| -28,800
|
3576162adb0df376b7e8e8c3d751fc2a6eb06051
|
fix load next fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -94,7 +94,7 @@ export class QueryPage {\nconst sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nQueryUnit.queryPromise(connection, sql).then((rows) => {\n- handler.panel.webview.postMessage({ type: MessageType.NEXT_PAGE, res: { sql, data: rows } as DataResponse });\n+ handler.emit(MessageType.NEXT_PAGE, { sql, data: rows })\n})\n}).on(OperateType.export, (params) => {\nthis.exportService.export(params.option)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix load next fail
|
141,908
|
20.11.2020 11:13:09
| -28,800
|
a171b59b1a14d29f1b7f479514cdce880f82e0eb
|
fix edit fail
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -448,7 +448,7 @@ export default {\nif (row.isFilter) {\nreturn;\n}\n- if(this.$refs.dataTable.getCheckboxRecords().length==0){\n+ if(column.type == \"checkbox\" && this.$refs.dataTable.getCheckboxRecords().length==0){\nthis.toolbar.row = {};\nreturn;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix edit fail
|
141,908
|
29.11.2020 01:00:23
| -28,800
|
d5bf4ffc9232941a28303d6c5081a8fc08c7a50d
|
Support export view
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "# CHANGELOG\n+## 2.7.8 - 2020/11/29\n+- Support change active database from status bar.\n+- Support export view.\n+\n## 2.7.5 - 2020/11/19\n- Migrate status to status bar.\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n{\n\"command\": \"mysql.data.import\",\n- \"title\": \"Import Data\",\n+ \"title\": \"Import Sql\",\n\"category\": \"MySQL\"\n},\n{\n},\n{\n\"command\": \"mysql.struct.export\",\n- \"title\": \"Export Table Struct\",\n+ \"title\": \"Export Struct\",\n\"category\": \"MySQL\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/global.ts",
"new_path": "src/common/global.ts",
"diff": "@@ -18,6 +18,7 @@ export class Global {\nGlobal.mysqlStatusBarItem.text = Global.getStatusBarItemText(activeConnection);\n} else {\nGlobal.mysqlStatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);\n+ Global.mysqlStatusBarItem.command='mysql.db.active'\nGlobal.mysqlStatusBarItem.text = Global.getStatusBarItemText(activeConnection);\nGlobal.mysqlStatusBarItem.show();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "@@ -186,6 +186,11 @@ export class DatabaseCache {\nreturn tableList;\n}\n+ public static getViewListOfDatabase(databaseid: string): Node[] {\n+ const viewList = this.databaseNodeMapTableNode[databaseid + \"_\" + ModelType.VIEW_GROUP];\n+ return viewList;\n+ }\n+\npublic static getDatabase(connectId: string, dbName: string): DatabaseNode {\nconst dbList = this.connectionNodeMapDatabaseNode[connectId];\nif (!dbList) { return null; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/abstractDumpService.ts",
"new_path": "src/service/dump/abstractDumpService.ts",
"diff": "@@ -11,13 +11,15 @@ export abstract class AbstractDumpService {\npublic async dump(node: Node, withData: boolean) {\n- const tableList = DatabaseCache.getTableListOfDatabase(node.id);\nlet tables = []\nif (node instanceof TableNode) {\ntables = [node.table]\n} else {\n- tables = await vscode.window.showQuickPick(tableList.map(table => table.label), { canPickMany: true, placeHolder: \"Select databases to export, default is all\" })\n+ const tableList = DatabaseCache.getTableListOfDatabase(node.id);\n+ const viewList = DatabaseCache.getViewListOfDatabase(node.id);\n+ const tableAndViewList=tableList.concat(viewList)\n+ tables = await vscode.window.showQuickPick(tableAndViewList.map(table => table.label), { canPickMany: true, placeHolder: \"Select databases to export, default is all\" })\nif (!tables) {\nreturn;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support export view
|
141,908
|
29.11.2020 01:27:30
| -28,800
|
a8c0edd8ffd851b5351336d622826f3c2cfe3b56
|
support open export sql
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysqlDumpService.ts",
"new_path": "src/service/dump/mysqlDumpService.ts",
"diff": "@@ -45,7 +45,11 @@ Origin command : \\`mysqldump -h ${host} -P ${port} -u ${node.user} -p --database\n}\n}\nmysqldump(option).then(() => {\n- vscode.window.showInformationMessage(`Backup ${node.getHost()}_${node.database} success!`);\n+ vscode.window.showInformationMessage(`Backup ${node.getHost()}_${node.database} success!`,'open').then(action=>{\n+ if(action=='open'){\n+ vscode.commands.executeCommand('vscode.open', vscode.Uri.file(dumpFilePath));\n+ }\n+ })\n}).catch((err) => {\nvscode.window.showErrorMessage(`Backup ${node.getHost()}_${node.database} fail!\\n${err}`);\n}).then(() => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support open export sql
|
141,908
|
29.11.2020 01:57:30
| -28,800
|
97423c7791993214bc04a4aff9c9435d8fad8278
|
support export procedure and function
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## 2.7.8 - 2020/11/29\n- Support change active database from status bar.\n-- Support export view.\n+- Support export view, procedure, function.\n## 2.7.5 - 2020/11/19\n- Migrate status to status bar.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dump/mysql/getFunctionDump.ts",
"diff": "+import { FunctionDumpOptions } from './interfaces/Options';\n+import { DB } from './DB';\n+\n+interface ShowFunctions {\n+ Name: string;\n+ sql_mode: string;\n+ definer: string;\n+ character_set_client: string;\n+ coallation_connection: string;\n+ 'Database Collation': string;\n+}\n+interface ShowCreateFunction {\n+ Function: string;\n+ sql_mode: string;\n+ 'Create Function': string;\n+ character_set_client: string;\n+ coallation_connection: string;\n+ 'Database Collation': string;\n+}\n+\n+async function getFunctionDump(\n+ connection: DB,\n+ dbName: string,\n+ options: Required<FunctionDumpOptions>,\n+): Promise<Array<string>> {\n+ const 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+ 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+ // clean up the generated SQL\n+ let sql = `${res['Create Function']}`;\n+\n+ if (!options || !options.definer) {\n+ sql = sql.replace(/CREATE DEFINER=.+?@.+? /, 'CREATE ');\n+ }\n+\n+ // add the delimiter\n+ if (options && options.delimiter) {\n+ sql = `DELIMITER ${options.delimiter}\\n${sql}${\n+ options.delimiter\n+ }\\nDELIMITER ;`;\n+ } else {\n+ sql = `DELIMITER ;;\\n${sql};;\\nDELIMITER ;`;\n+ }\n+\n+ // drop stored Function should go outside the delimiter mods\n+ if (!options || options.dropIfExist) {\n+ sql = `DROP Function IF EXISTS ${res.Function};\\n${sql}`;\n+ }\n+\n+ // add a header to the stored Function\n+ sql = [\n+ '',\n+ sql,\n+ '',\n+ ].join('\\n');\n+\n+ return output.push(sql);\n+ });\n+\n+ return output;\n+}\n+\n+export { ShowFunctions, ShowCreateFunction, getFunctionDump };\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dump/mysql/getProcedureDump.ts",
"diff": "+import { ProcedureDumpOptions } from './interfaces/Options';\n+import { DB } from './DB';\n+\n+interface ShowProcedures {\n+ Name: string;\n+ sql_mode: string;\n+ definer: string;\n+ character_set_client: string;\n+ coallation_connection: string;\n+ 'Database Collation': string;\n+}\n+interface ShowCreateProcedure {\n+ Procedure: string;\n+ sql_mode: string;\n+ 'Create Procedure': string;\n+ character_set_client: string;\n+ coallation_connection: string;\n+ 'Database Collation': string;\n+}\n+\n+async function getProcedureDump(\n+ connection: DB,\n+ dbName: string,\n+ options: Required<ProcedureDumpOptions>,\n+): Promise<Array<string>> {\n+ const 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+ const result = await connection.multiQuery<ShowCreateProcedure>(\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+ // clean up the generated SQL\n+ let sql = `${res['Create Procedure']}`;\n+\n+ if (!options || !options.definer) {\n+ sql = sql.replace(/CREATE DEFINER=.+?@.+? /, 'CREATE ');\n+ }\n+\n+ // add the delimiter\n+ if (options && options.delimiter) {\n+ sql = `DELIMITER ${options.delimiter}\\n${sql}${\n+ options.delimiter\n+ }\\nDELIMITER ;`;\n+ } else {\n+ sql = `DELIMITER ;;\\n${sql};;\\nDELIMITER ;`;\n+ }\n+\n+ // drop stored procedure should go outside the delimiter mods\n+ if (!options || options.dropIfExist) {\n+ sql = `DROP PROCEDURE IF EXISTS ${res.Procedure};\\n${sql}`;\n+ }\n+\n+ // add a header to the stored procedure\n+ sql = [\n+ '',\n+ sql,\n+ '',\n+ ].join('\\n');\n+\n+ return output.push(sql);\n+ });\n+\n+ return output;\n+}\n+\n+export { ShowProcedures, ShowCreateProcedure, getProcedureDump };\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/interfaces/DumpReturn.ts",
"new_path": "src/service/dump/mysql/interfaces/DumpReturn.ts",
"diff": "@@ -20,6 +20,16 @@ interface DumpReturn {\n* Null if configured not to dump.\n*/\ntrigger: 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": "@@ -159,6 +159,44 @@ interface TriggerDumpOptions {\ndefiner?: boolean;\n}\n+interface FunctionDumpOptions {\n+ /**\n+ * The temporary delimiter to use between statements.\n+ * Set to false to not use delmiters\n+ * Defaults to ';;'.\n+ */\n+ delimiter?: string;\n+ /**\n+ * Drop function before creation.\n+ * Defaults to false.\n+ */\n+ dropIfExist?: boolean;\n+ /**\n+ * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the sp definition or not\n+ * Defaults to false.\n+ */\n+ definer?: boolean;\n+}\n+\n+interface ProcedureDumpOptions {\n+ /**\n+ * The temporary delimiter to use between statements.\n+ * Set to false to not use delmiters\n+ * Defaults to ';;'.\n+ */\n+ delimiter?: string;\n+ /**\n+ * Drop procedure before creation.\n+ * Defaults to false.\n+ */\n+ dropIfExist?: boolean;\n+ /**\n+ * Include the `DEFINER = {\\`user\\`@\\`host\\` | CURRENT_USER}` in the sp definition or not\n+ * Defaults to false.\n+ */\n+ definer?: boolean;\n+}\n+\ninterface DataDumpOptions {\n/**\n* True to run a sql formatter over the output, false otherwise.\n@@ -236,6 +274,17 @@ interface DumpOptions {\n* Defaults to including the triggers.\n*/\ntrigger?: false | TriggerDumpOptions;\n+ /**\n+ * Explicitly set to false to not include procedures in the dump.\n+ * Defaults to including the procedures.\n+ */\n+ procedure?: false | ProcedureDumpOptions;\n+\n+ /**\n+ * Explicitly set to false to not include function in the dump.\n+ * Defaults to including the function.\n+ */\n+ function?: null | FunctionDumpOptions;\n}\ninterface Options {\n@@ -287,4 +336,6 @@ export {\nOptions,\nSchemaDumpOptions,\nTriggerDumpOptions,\n+ ProcedureDumpOptions,\n+ FunctionDumpOptions\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/main.ts",
"new_path": "src/service/dump/mysql/main.ts",
"diff": "@@ -10,6 +10,8 @@ import { DumpReturn } from './interfaces/DumpReturn';\nimport { getTables } from './getTables';\nimport { getSchemaDump } from './getSchemaDump';\nimport { getTriggerDump } from './getTriggerDump';\n+import { getProcedureDump } from './getProcedureDump';\n+import { getFunctionDump } from './getFunctionDump';\nimport { getDataDump } from './getDataDump';\nimport { compressFile } from './compressFile';\nimport { DB } from './DB';\n@@ -131,6 +133,8 @@ export default async function main(inputOptions: Options): Promise<DumpReturn> {\nschema: null,\ndata: null,\ntrigger: null,\n+ procedure: null,\n+ function:null\n},\ntables: await getTables(\nconnection,\n@@ -182,6 +186,31 @@ USE \\`${options.connection.database}\\`;\\n`);\n.trim();\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+\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// data dump uses its own connection so kill ours\nawait connection.end();\n@@ -207,6 +236,16 @@ USE \\`${options.connection.database}\\`;\\n`);\nfs.appendFileSync(options.dumpToFile, `${res.dump.trigger}\\n\\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+ }\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+ }\n+\n// reset all of the variables\nif (options.dumpToFile) {\nfs.appendFileSync(options.dumpToFile, FOOTER_VARIABLES);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
support export procedure and function
|
141,908
|
29.11.2020 02:46:40
| -28,800
|
4cef477379440e741c6ecbde641d33c03a93c03c
|
Fix multi query page database change.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "## 2.7.8 - 2020/11/29\n- Support change active database from status bar.\n- Support export view, procedure, function.\n+- Fix multi query page database change.\n## 2.7.5 - 2020/11/19\n- Migrate status to status bar.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/nodeUtil.ts",
"new_path": "src/model/nodeUtil.ts",
"diff": "@@ -3,6 +3,9 @@ import { ConnectionManager } from \"../service/connectionManager\";\nexport abstract class NodeUtil {\npublic static of(node: any): Node {\n+ if(!node){\n+ return null;\n+ }\nif (node && !(node instanceof Node)) {\nnode.__proto__ = Node.prototype\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -65,17 +65,12 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nconst targetContext = connectionNode.global === false ? this.context.workspaceState : this.context.globalState;\n- let connections = targetContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey);\n-\n- if (!connections) {\n- connections = {};\n- }\n+ let connections = targetContext.get<{ [key: string]: Node }>(CacheKey.ConectionsKey, {});\nconst connectId = connectionNode.getConnectId();\nconnections[connectId] = connectionNode;\nConnectionManager.removeConnection(connectId)\n-\nawait targetContext.update(CacheKey.ConectionsKey, connections);\nDbTreeDataProvider.refresh();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -13,6 +13,7 @@ import { QueryUnit } from \"../../service/queryUnit\";\nimport { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\nimport { Global } from \"../../common/global\";\n+import { NodeUtil } from \"@/model/nodeUtil\";\nexport class QueryParam<T> {\n/**\n@@ -78,6 +79,7 @@ export class QueryPage {\nif (queryParam.res?.table) {\nhandler.panel.title = queryParam.res.table\n}\n+ queryParam.res.dbInfo={...ConnectionManager.getLastConnectionOption(),command:null,info:null }\nhandler.emit(queryParam.type, queryParam.res)\n}).on(\"showCost\", ({ cost }) => {\nthis.costStatusBar.text = `$(scrollbar-button-right) ${cost}ms`\n@@ -89,7 +91,7 @@ export class QueryPage {\nif (!queryParam.singlePage) {\nthis.hodlder.set(params.sql.trim(), title)\n}\n- QueryUnit.runQuery(params.sql);\n+ QueryUnit.runQuery(params.sql,params.dbInfo);\n}).on(OperateType.next, async (params) => {\nconst sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/viewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -78,15 +78,6 @@ export class ViewManager {\nreturn Promise.resolve(currentStatus.instance);\n}\n}\n- const newStatus = { creating: true, instance: null, eventEmitter: new EventEmitter() }\n- this.viewStatu[viewOption.title] = newStatus\n- const targetPath = `${this.webviewPath}/${viewOption.path}.html`;\n- fs.readFile(targetPath, 'utf8', async (err, data) => {\n- if (err) {\n- Console.log(err);\n- reject(err);\n- return;\n- }\nconst webviewPanel = vscode.window.createWebviewPanel(\nviewOption.title,\nviewOption.title,\n@@ -96,10 +87,18 @@ export class ViewManager {\n},\n{ enableScripts: true, retainContextWhenHidden: true },\n);\n+ const newStatus = { creating: true, instance: webviewPanel, eventEmitter: new EventEmitter() }\n+ this.viewStatu[viewOption.title] = newStatus\n+ const targetPath = `${this.webviewPath}/${viewOption.path}.html`;\n+ fs.readFile(targetPath, 'utf8', async (err, data) => {\n+ if (err) {\n+ Console.log(err);\n+ reject(err);\n+ return;\n+ }\nif (viewOption.iconPath) {\nwebviewPanel.iconPath = vscode.Uri.file(viewOption.iconPath)\n}\n- this.viewStatu[viewOption.title].instance = webviewPanel\nconst contextPath = path.resolve(targetPath, \"..\");\nif (viewOption.handleHtml) {\ndata = viewOption.handleHtml(data, webviewPanel)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -122,6 +122,7 @@ export default {\nname: \"App\",\ndata() {\nreturn {\n+ dbInfo:{},\nresult: {\ndata: [],\nsql: \"\",\n@@ -176,6 +177,10 @@ export default {\n},\nmounted() {\nconst handlerData = (data, sameTable) => {\n+ console.log('data')\n+ if(data.dbInfo){\n+ this.dbInfo=data.dbInfo;\n+ }\nthis.result = data;\nthis.toolbar.sql = data.sql;\n@@ -202,6 +207,7 @@ export default {\nvscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime });\n};\nwindow.addEventListener(\"message\", ({ data }) => {\n+ console.log(data)\nif (!data) return;\nconst response = data.content;\nthis.table.loading = false;\n@@ -557,6 +563,7 @@ export default {\nif (!sql) return;\nvscodeEvent.emit(\"execute\", {\nsql: sql.replace(/ +/gi, \" \"),\n+ dbInfo:this.dbInfo\n});\nthis.table.loading = true;\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "tsconfig.json",
"new_path": "tsconfig.json",
"diff": "\"sourceMap\": true,\n\"baseUrl\": \".\",\n\"paths\": {\n- \"~/*\": [\n- \"./src/*\"\n- ],\n\"@/*\": [\n\"./src/*\"\n]\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -24,7 +24,8 @@ module.exports = [\nvscode: 'commonjs vscode'\n},\nresolve: {\n- extensions: ['.ts', '.js']\n+ extensions: ['.ts', '.js'],\n+ alias: { '@': path.resolve('src'), }\n},\nmodule: { rules: [{ test: /\\.ts$/, exclude: /node_modules/, use: ['ts-loader'] }] },\noptimization: { minimize: false },\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix multi query page database change.
|
141,908
|
29.11.2020 03:04:51
| -28,800
|
4187b2bc8526d334e93b2a934a0f88a0193c1f34
|
remove message border
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/auto.css",
"new_path": "public/theme/auto.css",
"diff": "@@ -4410,8 +4410,8 @@ body {\npadding-bottom: 10px;\nvertical-align: middle;\nbackground-color: var(--vscode-editor-background);;\n- border-radius: 4px;\n- border: 1px solid #EBEEF5;\n+ /* border-radius: 4px;\n+ border: 1px solid #EBEEF5; */\nfont-size: 18px;\n-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);\nbox-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
remove message border
|
141,908
|
29.11.2020 05:04:29
| -28,800
|
8c6bb0a030cb1c7e53818520eb8b366bd5d54c8a
|
fix run after query result
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/common/trans.ts",
"diff": "+/**\n+ * avoid run send after date on query result.\n+ */\n+export class Trans {\n+ public static transId: string;\n+ public static begin() {\n+ this.transId=new Date().getTime()+\"_query\";\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": "@@ -67,7 +67,7 @@ export class ConnectionManager {\n}\nconst key = connectionNode.getConnectId();\nconst connection = this.activeConnection[key];\n- if (connection && connection.connection.state == 'authenticated') {\n+ if (connection && (connection.connection.state == 'authenticated' || connection.connection.authorized)) {\nif (connectionNode.database) {\ntry {\nawait QueryUnit.queryPromise(connection.connection, `use \\`${connectionNode.database}\\``)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -13,6 +13,7 @@ import { DataResponse, DMLResponse, ErrorResponse, MessageResponse, RunResponse\nimport { ConnectionManager } from \"./connectionManager\";\nimport { DelimiterHolder } from \"./common/delimiterHolder\";\nimport { ServiceManager } from \"./serviceManager\";\n+import { Trans } from \"~/common/trans\";\nexport class QueryUnit {\n@@ -42,6 +43,7 @@ export class QueryUnit {\nvscode.window.showWarningMessage(\"No SQL file selected\");\nreturn;\n}\n+ Trans.begin()\nif (!connectionNode) {\nconnectionNode = ConnectionManager.getLastConnectionOption();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -14,6 +14,7 @@ import { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\nimport { Global } from \"../../common/global\";\nimport { NodeUtil } from \"@/model/nodeUtil\";\n+import { Trans } from \"~/common/trans\";\nexport class QueryParam<T> {\n/**\n@@ -80,6 +81,7 @@ export class QueryPage {\nhandler.panel.title = queryParam.res.table\n}\nqueryParam.res.dbInfo={...ConnectionManager.getLastConnectionOption(),command:null,info:null }\n+ queryParam.res.transId=Trans.transId;\nhandler.emit(queryParam.type, queryParam.res)\n}).on(\"showCost\", ({ cost }) => {\nthis.costStatusBar.text = `$(scrollbar-button-right) ${cost}ms`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -177,7 +177,6 @@ export default {\n},\nmounted() {\nconst handlerData = (data, sameTable) => {\n- console.log('data')\nif (data.dbInfo) {\nthis.dbInfo = data.dbInfo;\n}\n@@ -207,8 +206,8 @@ export default {\nvscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime });\n};\nwindow.addEventListener(\"message\", ({ data }) => {\n- console.log(data)\nif (!data) return;\n+ console.log(data);\nconst response = data.content;\nthis.table.loading = false;\nif (response && response.costTime) {\n@@ -223,7 +222,7 @@ export default {\nswitch (data.type) {\ncase \"RUN\":\nthis.toolbar.sql = response.sql;\n- this.table.loading = true;\n+ this.table.loading = response.transId != this.result.transId;\nbreak;\ncase \"DATA\":\nhandlerData(response);\n@@ -454,7 +453,10 @@ export default {\nif (row.isFilter) {\nreturn;\n}\n- if(column.type == \"checkbox\" && this.$refs.dataTable.getCheckboxRecords().length==0){\n+ if (\n+ column.type == \"checkbox\" &&\n+ this.$refs.dataTable.getCheckboxRecords().length == 0\n+ ) {\nthis.toolbar.row = {};\nreturn;\n}\n@@ -563,7 +565,7 @@ export default {\nif (!sql) return;\nvscodeEvent.emit(\"execute\", {\nsql: sql.replace(/ +/gi, \" \"),\n- dbInfo:this.dbInfo\n+ dbInfo: this.dbInfo,\n});\nthis.table.loading = true;\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "types/mysql2.d.ts",
"new_path": "types/mysql2.d.ts",
"diff": "@@ -101,6 +101,8 @@ declare module 'mysql2' {\nstate: 'connected' | 'authenticated' | 'disconnected' | 'protocol_error' | string;\n+ authorized: boolean;\n+\nthreadId: number | null;\ncreateQuery: QueryFunction;\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -25,7 +25,8 @@ module.exports = [\n},\nresolve: {\nextensions: ['.ts', '.js'],\n- alias: { '@': path.resolve('src'), }\n+ alias: { '@': path.resolve('src'), },\n+ alias: { '~': path.resolve('src'), }\n},\nmodule: { rules: [{ test: /\\.ts$/, exclude: /node_modules/, use: ['ts-loader'] }] },\noptimization: { minimize: false },\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix run after query result
|
141,908
|
29.11.2020 06:14:35
| -28,800
|
995e61207a1c385a7cf49fead885a3bff531eacd
|
add connection shortcut
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -30,7 +30,12 @@ export class ConnectionManager {\nif (fileNode) { return fileNode }\n}\n- return this.lastConnectionNode;\n+ const node = this.lastConnectionNode;\n+ if(node==null){\n+ ConnectionManager.checkConnection();\n+ }\n+\n+ return node;\n}\npublic static getActiveConnectByKey(key: string): ConnectionWrapper {\n@@ -55,8 +60,7 @@ export class ConnectionManager {\npublic static getConnection(connectionNode: Node, changeActive: boolean = false): Promise<mysql.Connection> {\nif (!connectionNode) {\n- // TODO add button to create\n- vscode.window.showWarningMessage(\"No MySQL Server or Database selected!\");\n+ this.checkConnection()\nthrow new Error(\"No MySQL Server or Database selected!\")\n}\nreturn new Promise(async (resolve, reject) => {\n@@ -153,4 +157,13 @@ export class ConnectionManager {\nreturn null;\n}\n+ private static checkConnection() {\n+ vscode.window.showErrorMessage(\"Please create database connection.\", \"Config\").then(action => {\n+ if (action == \"Config\") {\n+ vscode.commands.executeCommand('mysql.connection.add');\n+ }\n+ });\n+ }\n+\n+\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
add connection shortcut
|
141,908
|
30.11.2020 10:56:53
| -28,800
|
6e822182a136d9cc030db454f22b3a0af2f3864b
|
change connection alive check logic
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -76,16 +76,14 @@ export class ConnectionManager {\nconst key = connectionNode.getConnectId();\nconst connection = this.activeConnection[key];\nif (connection && (connection.connection.state == 'authenticated' || connection.connection.authorized)) {\n- if (connectionNode.database) {\n+ const sql = connectionNode.database ? `use \\`${connectionNode.database}\\`` : `SHOW STATUS WHERE variable_name = 'Max_used_connections';`;\ntry {\n- await QueryUnit.queryPromise(connection.connection, `use \\`${connectionNode.database}\\``)\n+ await QueryUnit.queryPromise(connection.connection, sql)\n+ resolve(connection.connection);\n+ return;\n} catch (err) {\nthis.activeConnection[key] = null\n- reject(err);\n- }\n}\n- resolve(connection.connection);\n- return;\n}\nconst ssh = connectionNode.ssh;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
change connection alive check logic
|
141,908
|
30.11.2020 21:43:27
| -28,800
|
9a78d629df8594d10021dd7e064a3bd00d9a2e30
|
hide connect end error
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -78,7 +78,7 @@ export class ConnectionManager {\nif (connection && (connection.connection.state == 'authenticated' || connection.connection.authorized)) {\nconst sql = connectionNode.database ? `use \\`${connectionNode.database}\\`` : `SHOW STATUS WHERE variable_name = 'Max_used_connections';`;\ntry {\n- await QueryUnit.queryPromise(connection.connection, sql)\n+ await QueryUnit.queryPromise(connection.connection, sql,false)\nresolve(connection.connection);\nreturn;\n} catch (err) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -20,12 +20,14 @@ export class QueryUnit {\npublic static readonly maxTableCount = Global.getConfig<number>(ConfigKey.MAX_TABLE_COUNT);\n- public static queryPromise<T>(connection: mysql.Connection, sql: string): Promise<T> {\n+ public static queryPromise<T>(connection: mysql.Connection, sql: string,showError=true): Promise<T> {\nreturn new Promise((resolve, reject) => {\nconnection.query(sql, (err: mysql.MysqlError, rows) => {\nif (err) {\n+ if(showError){\nConsole.log(`Execute sql fail : ${sql}`);\nConsole.log(err);\n+ }\nreject(err);\n} else {\nresolve(rows);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
hide connect end error
|
141,908
|
01.12.2020 21:11:10
| -28,800
|
346db9c87ed512a137cf8fdd1d3408ade64fe2fb
|
fix export Predcure fail
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"name\": \"vscode-mysql-client2\",\n\"displayName\": \"MySQL\",\n\"description\": \"MySQL Client for vscode\",\n- \"version\": \"2.8.3\",\n+ \"version\": \"2.8.4\",\n\"publisher\": \"cweijan\",\n\"icon\": \"resources/logo.png\",\n\"engines\": {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getFunctionDump.ts",
"new_path": "src/service/dump/mysql/getFunctionDump.ts",
"diff": "@@ -30,14 +30,14 @@ async function getFunctionDump(\n// we create a multi query here so we can query all at once rather than in individual connections\nconst getSchemaMultiQuery: Array<string> = [];\n- if(getSchemaMultiQuery.length==0){\n- return [];\n- }\n-\nFunctions.forEach(proc => {\ngetSchemaMultiQuery.push(`SHOW CREATE Function \\`${proc.Name}\\`;`);\n});\n+ if(getSchemaMultiQuery.length==0){\n+ return [];\n+ }\n+\nconst result = await connection.multiQuery<ShowCreateFunction>(\ngetSchemaMultiQuery.join('\\n'),\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/mysql/getProcedureDump.ts",
"new_path": "src/service/dump/mysql/getProcedureDump.ts",
"diff": "@@ -30,15 +30,14 @@ async function getProcedureDump(\n// we create a multi query here so we can query all at once rather than in individual connections\nconst getSchemaMultiQuery: Array<string> = [];\n- if(getSchemaMultiQuery.length==0){\n- return [];\n- }\n-\n-\nprocedures.forEach(proc => {\ngetSchemaMultiQuery.push(`SHOW CREATE PROCEDURE \\`${proc.Name}\\`;`);\n});\n+ if(getSchemaMultiQuery.length==0){\n+ return [];\n+ }\n+\nconst result = await connection.multiQuery<ShowCreateProcedure>(\ngetSchemaMultiQuery.join('\\n'),\n);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix export Predcure fail
|
141,908
|
05.12.2020 00:20:03
| -28,800
|
7768e5adcc842215f493960c76016fd0a5e340e6
|
bind comman to view
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"title\": \"Add Column\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.column.up\",\n+ \"title\": \"Move Column Up\",\n+ \"category\": \"MySQL\"\n+ },\n+ {\n+ \"command\": \"mysql.column.down\",\n+ \"title\": \"Move Column Down\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.table.source\",\n\"title\": \"Show Table Source\",\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.view.source\",\n+ \"title\": \"Show View Source\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.count.sql\",\n\"title\": \"Show Count\",\n},\n{\n\"command\": \"mysql.name.copy\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline@-1\"\n},\n{\n\"command\": \"mysql.table.source\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline@0\"\n},\n{\n\"command\": \"mysql.table.show\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/ \",\n\"group\": \"1_inline@2\"\n},\n{\n\"command\": \"mysql.count.sql\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline@3\"\n},\n{\n},\n{\n\"command\": \"mysql.data.export\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline1@2\"\n},\n{\n\"command\": \"mysql.struct.export\",\n- \"when\": \"view == github.cweijan.mysql && viewItem == table\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline1@3\"\n},\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -67,8 +67,8 @@ ADD\npublic async showSource() {\nQueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE TABLE \\`${this.database}\\`.\\`${this.table}\\``)\n- .then((procedDtail) => {\n- QueryUnit.showSQLTextDocument(procedDtail[0]['Create Table']);\n+ .then((sourceResule) => {\n+ QueryUnit.showSQLTextDocument(sourceResule[0]['Create Table']);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewNode.ts",
"new_path": "src/model/main/viewNode.ts",
"diff": "@@ -7,12 +7,21 @@ import { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { QueryUnit } from \"../../service/queryUnit\";\nimport { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\nimport { TableNode } from \"./tableNode\";\n+import sqlFormatter = require('sql-formatter');\nexport class ViewNode extends TableNode {\npublic iconPath: string = path.join(Constants.RES_PATH, \"icon/view.png\");\npublic contextValue: string = ModelType.VIEW;\n+ public async showSource() {\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE VIEW \\`${this.database}\\`.\\`${this.table}\\``)\n+ .then((sourceResule) => {\n+ const sql =`DROP VIEW ${this.table};${sourceResule[0]['Create View']}`\n+ QueryUnit.showSQLTextDocument(sqlFormatter.format(sql));\n+ });\n+ }\n+\npublic drop() {\nUtil.confirm(`Are you want to drop view ${this.table} ? `, async () => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dump/abstractDumpService.ts",
"new_path": "src/service/dump/abstractDumpService.ts",
"diff": "@@ -6,6 +6,7 @@ import { DatabaseNode } from \"../../model/database/databaseNode\";\nimport format = require('date-format');\nimport path = require('path');\nimport { TableNode } from \"../../model/main/tableNode\";\n+import { ViewNode } from \"@/model/main/viewNode\";\nexport abstract class AbstractDumpService {\n@@ -13,7 +14,7 @@ export abstract class AbstractDumpService {\nlet tables = []\n- if (node instanceof TableNode) {\n+ if (node instanceof TableNode || node instanceof ViewNode) {\ntables = [node.table]\n} else {\nconst tableList = DatabaseCache.getTableListOfDatabase(node.id);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
bind comman to view
|
141,908
|
06.12.2020 13:44:27
| -28,800
|
dc4055b1cdb313e20c314b5490baa58a1a81a9f1
|
Support change column position
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"command\": \"mysql.column.up\",\n\"title\": \"Move Column Up\",\n- \"category\": \"MySQL\"\n+ \"category\": \"MySQL\",\n+ \"icon\": {\n+ \"light\": \"resources/light/up.png\",\n+ \"dark\": \"resources/dark/up.png\"\n+ }\n},\n{\n\"command\": \"mysql.column.down\",\n\"title\": \"Move Column Down\",\n- \"category\": \"MySQL\"\n+ \"category\": \"MySQL\",\n+ \"icon\": {\n+ \"light\": \"resources/light/down.png\",\n+ \"dark\": \"resources/dark/down.png\"\n+ }\n},\n{\n\"command\": \"mysql.table.source\",\n\"when\": \"view == github.cweijan.mysql && viewItem == tableGroup\",\n\"group\": \"inline\"\n},\n+ {\n+ \"command\": \"mysql.column.up\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == column\",\n+ \"group\": \"inline@0\"\n+ },\n+ {\n+ \"command\": \"mysql.column.down\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == column\",\n+ \"group\": \"inline@2\"\n+ },\n{\n\"command\": \"mysql.column.changeName\",\n\"when\": \"view == github.cweijan.mysql && viewItem == column\",\n- \"group\": \"inline\"\n+ \"group\": \"inline@4\"\n},\n{\n\"command\": \"mysql.name.copy\",\n"
},
{
"change_type": "ADD",
"old_path": "resources/dark/down.png",
"new_path": "resources/dark/down.png",
"diff": "Binary files /dev/null and b/resources/dark/down.png differ\n"
},
{
"change_type": "ADD",
"old_path": "resources/dark/up.png",
"new_path": "resources/dark/up.png",
"diff": "Binary files /dev/null and b/resources/dark/up.png differ\n"
},
{
"change_type": "ADD",
"old_path": "resources/light/down.png",
"new_path": "resources/light/down.png",
"diff": "Binary files /dev/null and b/resources/light/down.png differ\n"
},
{
"change_type": "ADD",
"old_path": "resources/light/up.png",
"new_path": "resources/light/up.png",
"diff": "Binary files /dev/null and b/resources/light/up.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -107,6 +107,12 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.column.changeName\": (columnNode: ColumnNode) => {\ncolumnNode.changeColumnName();\n},\n+ \"mysql.column.up\": (columnNode: ColumnNode) => {\n+ columnNode.moveUp();\n+ },\n+ \"mysql.column.down\": (columnNode: ColumnNode) => {\n+ columnNode.moveDown();\n+ },\n\"mysql.column.add\": (tableNode: TableNode) => {\ntableNode.addColumnTemplate();\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -36,16 +36,16 @@ export class TableNode extends Node implements CopyAble {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\nlet columnNodes = DatabaseCache.getColumnListOfTable(this.id);\n- if (columnNodes && !isRresh) {\n+ if (columnNodes && !isRresh && this.collapsibleState != vscode.TreeItemCollapsibleState.Expanded) {\nreturn columnNodes;\n}\nreturn QueryUnit.queryPromise<ColumnMeta[]>(await ConnectionManager.getConnection(this), `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength,COLUMN_DEFAULT defaultValue,EXTRA extra FROM information_schema.columns WHERE table_schema = '${this.database}' AND table_name = '${this.table}' ORDER BY ORDINAL_POSITION;`)\n.then((columns) => {\n- columnNodes = columns.map<ColumnNode>((column) => {\n+ columnNodes = columns.map<ColumnNode>((column, index) => {\nif (column && column.key == \"PRI\") {\nMockRunner.primaryKeyMap[this.getConnectId()] = column.name\n}\n- return new ColumnNode(this.table, column, this.info);\n+ return new ColumnNode(this.table, column, this, index);\n});\nDatabaseCache.setColumnListOfTable(this.id, columnNodes);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnNode.ts",
"new_path": "src/model/other/columnNode.ts",
"diff": "@@ -16,7 +16,7 @@ export class ColumnNode extends Node implements CopyAble {\npublic type: string;\npublic contextValue: string = ModelType.COLUMN;\npublic isPrimaryKey = false;\n- constructor(private readonly table: string, readonly column: ColumnMeta, readonly info: Node) {\n+ constructor(private readonly table: string, readonly column: ColumnMeta, readonly info: Node, readonly index: number) {\nsuper(column.name)\nthis.init(info)\nthis.type = `${this.column.type}`\n@@ -83,4 +83,27 @@ export class ColumnNode extends Node implements CopyAble {\n}\n+ public async moveDown() {\n+ const columns = (await this.info.getChildren()) as ColumnNode[]\n+ const afterColumnNode = columns[this.index + 1];\n+ if (!afterColumnNode) {\n+ vscode.window.showErrorMessage(\"Column is at last.\")\n+ return;\n+ }\n+ const sql = `ALTER TABLE ${this.database}.${this.table} MODIFY COLUMN ${this.column.name} ${this.column.type} AFTER ${afterColumnNode.column.name};`\n+ await QueryUnit.queryPromise(await ConnectionManager.getConnection(this), sql)\n+ DbTreeDataProvider.refresh()\n+ }\n+ public async moveUp() {\n+ const columns = (await this.info.getChildren()) as ColumnNode[]\n+ const beforeColumnNode = columns[this.index - 1];\n+ if (!beforeColumnNode) {\n+ vscode.window.showErrorMessage(\"Column is at first.\")\n+ return;\n+ }\n+ const sql = `ALTER TABLE ${this.database}.${this.table} MODIFY COLUMN ${beforeColumnNode.column.name} ${beforeColumnNode.column.type} AFTER ${this.column.name};`\n+ await QueryUnit.queryPromise(await ConnectionManager.getConnection(this), sql)\n+ DbTreeDataProvider.refresh()\n+ }\n+\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support change column position
|
141,902
|
17.12.2020 03:55:29
| -28,800
|
878d860b5d7e4c83f723d8304d913b2a83b52c7c
|
Add tailwindcss, postcss package and its configurations
|
[
{
"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+ \"postcss\": \"^8.2.1\",\n+ \"postcss-loader\": \"^4.1.0\",\n\"style-loader\": \"^1.2.1\",\n+ \"tailwindcss\": \"^2.0.2\",\n\"ts-loader\": \"^7.0.5\",\n\"typescript\": \"^3.8.3\",\n\"url-loader\": \"^4.1.0\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "postcss.config.js",
"diff": "+module.exports = {\n+ plugins: [\n+ require('tailwindcss')\n+ ],\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/main.js",
"new_path": "src/vue/main.js",
"diff": "@@ -4,6 +4,7 @@ import ElementUI from 'element-ui';\nimport VueRouter from 'vue-router'\nimport '@/../public/theme/auto.css'\n+import \"tailwindcss/tailwind.css\"\n// import 'element-ui/lib/theme-chalk/index.css';\nVue.use(VueRouter)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tailwind.config.js",
"diff": "+module.exports = {\n+ purge: [\"./src/vue/**/*.vue\", \"./src/vue/**/*.js\"],\n+ darkMode: false, // or 'media' or 'class'\n+ theme: {\n+ extend: {},\n+ },\n+ variants: {},\n+ plugins: [],\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -60,7 +60,7 @@ module.exports = [\nmodule: {\nrules: [\n{ test: /\\.vue$/, loader: 'vue-loader', options: { loaders: { css: [\"vue-style-loader\", \"css-loader\"] } } },\n- { test: /(\\.css|\\.cssx)$/, use: [\"vue-style-loader\", \"css-loader\"] },\n+ { test: /(\\.css|\\.cssx)$/, use: [\"vue-style-loader\", \"css-loader\", { loader: \"postcss-loader\" }] },\n{ test: /\\.(woff2?|eot|ttf|otf)(\\?.*)?$/, loader: 'url-loader', options: { limit: 80000 } }\n]\n},\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add tailwindcss, postcss package and its configurations
|
141,902
|
18.12.2020 19:20:00
| -28,800
|
e8441589977d55751ad1680f73ed06a7b8061357
|
Improve connect page; remove some unused code
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<template>\n- <div class=\"container\" id='app'>\n- <h1>Connect to MySQL server</h1>\n- <blockquote class=\"panel\" id=\"error\" v-if=\"error\">\n- <p class=\"panel__text\">\n- Connection error! <span id=\"errorMessage\" v-text=\"errorMessage\"></span><br />\n- </p>\n+ <div class=\"container flex flex-col mx-auto\">\n+ <h1 class=\"py-4 text-2xl\">Connect to MySQL server</h1>\n+\n+ <!-- ERRORS SHOWS HERE -->\n+ <blockquote class=\"p-3 mb-2 panel\" id=\"error\" v-if=\"error\">\n+ <section class=\"panel__text\">\n+ <div class=\"block font-bold\">Connection error!</div>\n+ <span id=\"errorMessage\" v-text=\"errorMessage\"></span>\n+ </section>\n</blockquote>\n- <el-row>\n- <div>\n- <div class=\"field field__input\">\n- <strong>name:</strong>\n- <input class=\"field__input\" placeholder=\"connection name, can be empty\" v-model=\"connectionOption.name\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>host:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.host\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>port:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.port\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>username:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.user\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>password:</strong>\n- <input class=\"field__input\" type=\"password\" v-model=\"connectionOption.password\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>includeDatabases:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.includeDatabases\" placeholder=\"default is all databases\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>excludeDatabases:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.excludeDatabases\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>timezone:</strong>\n- <input class=\"field__input\" placeholder=\"+HH:MM\" v-model=\"connectionOption.timezone\" />\n- </div>\n- </div>\n- </el-row>\n- <el-row>\n- <div class=\"field field__input\">\n- Global:\n- <el-switch v-model=\"connectionOption.global\"></el-switch>\n- </div>\n- </el-row>\n- <el-row>\n- <div class=\"field field__input\">\n- usingSSH:\n- <el-switch v-model=\"connectionOption.usingSSH\"></el-switch>\n- </div>\n+\n+ <!-- CONNECTION NAME -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-name\">Connection Name</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-name\"\n+ placeholder=\"The name of connection, it can be empty\"\n+ v-model=\"connectionOption.name\"\n+ />\n+ </section>\n+\n+ <!-- HOST -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-host\">Host</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-host\"\n+ placeholder=\"The host of connection\"\n+ required\n+ v-model=\"connectionOption.host\"\n+ />\n+ </section>\n+\n+ <!-- PORT -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-port\">Port</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-port\"\n+ placeholder=\"The port of connection\"\n+ required\n+ type=\"number\"\n+ v-model=\"connectionOption.port\"\n+ />\n+ </section>\n+\n+ <!-- USER -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-user\">Username</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-user\"\n+ placeholder=\"Username\"\n+ required\n+ v-model=\"connectionOption.user\"\n+ />\n+ </section>\n+\n+ <!-- PASSWORD -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-password\">Password</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-password\"\n+ placeholder=\"Password\"\n+ type=\"password\"\n+ v-model=\"connectionOption.password\"\n+ />\n+ </section>\n+\n+ <!-- DATABASES -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"databases\">Databases</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"databases\"\n+ placeholder=\"Default is all databases\"\n+ v-model=\"connectionOption.database\"\n+ />\n+ </section>\n+\n+ <!-- EXCLUDED DATABASES -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"excluded-databases\">Excluded Databases</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"excluded-databases\"\n+ placeholder=\"Databases to excluded\"\n+ v-model=\"connectionOption.excludeDatabases\"\n+ />\n+ </section>\n+\n+ <!-- TIMEZONE -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"timezone\">Timezone</label>\n+ <input class=\"w-full field__input\" id=\"timezone\" placeholder=\"+HH:MM\" v-model=\"connectionOption.timezone\" />\n+ </section>\n+\n+ <!-- GLOBAL? -->\n+ <section class=\"flex items-center mb-2\">\n+ <label class=\"mr-2 font-bold\" for=\"global\">Global</label>\n+ <el-switch id=\"global\" v-model=\"connectionOption.global\"></el-switch>\n+ </section>\n+\n+ <!-- SSH? -->\n+ <section class=\"flex items-center mb-2\">\n+ <label class=\"mr-2 font-bold\" for=\"ssh-connection\">Using SSH</label>\n+ <el-switch id=\"ssh-connection\" v-model=\"connectionOption.usingSSH\"></el-switch>\n+ </section>\n+\n+ <!-- SSH CONNECTION FIELDS -->\n<div v-if=\"connectionOption.usingSSH\">\n- <div class=\"field field__input\">\n- <strong>ssh-host:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.ssh.host\" />\n- </div>\n- <div class=\"field field__input\">\n- <strong>ssh-port:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.ssh.port\" />\n- </div>\n- <div class=\"field field__input\">\n- <strong>ssh-username:</strong>\n- <input class=\"field__input\" v-model=\"connectionOption.ssh.username\" />\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>type:</strong>\n- <select v-model=\"type\">\n- <option value=\"password\">password</option>\n- <option value=\"privateKey\">privateKey</option>\n+ <!-- SSH HOST -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-host\">SSH Host</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-host\"\n+ placeholder=\"SSH Host\"\n+ required\n+ v-model=\"connectionOption.ssh.host\"\n+ />\n+ </section>\n+\n+ <!-- SSH PORT -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-port\">SSH Port</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-port\"\n+ placeholder=\"SSH Port\"\n+ required\n+ type=\"number\"\n+ v-model=\"connectionOption.ssh.port\"\n+ />\n+ </section>\n+\n+ <!-- SSH USERNAME -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-username\">SSH Username</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-username\"\n+ placeholder=\"SSH Username\"\n+ required\n+ v-model=\"connectionOption.ssh.username\"\n+ />\n+ </section>\n+\n+ <!-- SELECT SSH PASSWORD TYPE -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-type\">Type</label>\n+ <select class=\"w-full field__input\" v-model=\"type\">\n+ <option class=\"p-1\" value=\"password\">Password</option>\n+ <option class=\"p-1\" value=\"privateKey\">Private Key</option>\n</select>\n- </div>\n- </div>\n+ </section>\n+\n<div v-if=\"type == 'password'\">\n- <div class=\"field field__input\">\n- <strong>password:</strong>\n- <input class=\"field__input\" type=\"password\" v-model=\"connectionOption.ssh.password\" />\n- </div>\n- </div>\n- <div v-if=\"type=='privateKey'\">\n- <div>\n- <div class=\"field field__input\">\n- <strong>privateKeyPath:</strong>\n- <input class=\"field__input\" placeholder=\"input your private key path\" v-model=\"connectionOption.ssh.privateKeyPath\" />\n- </div>\n- </div>\n- <div>\n- <div class=\"field field__input\">\n- <strong>passphrase:</strong>\n- <input class=\"field__input\" type=\"passphrase\" v-model=\"connectionOption.ssh.passphrase\" />\n+ <!-- SSH PASSWORD -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-password\">Password</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-password\"\n+ placeholder=\"Password\"\n+ required\n+ type=\"password\"\n+ v-model=\"connectionOption.ssh.password\"\n+ />\n+ </section>\n+ </div>\n+ <div v-else>\n+ <!-- SSH PRIVATE KEY PATH -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-private-key-path\">Private Key Path</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-private-key-path\"\n+ placeholder=\"Private Key Path\"\n+ v-model=\"connectionOption.ssh.privateKeyPath\"\n+ />\n+ </section>\n+ <!-- SSH PASSPHRASE -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-passphrase\">Passphrase</label>\n+ <input\n+ class=\"w-full field__input\"\n+ id=\"connection-ssh-passphrase\"\n+ placeholder=\"Passphrase\"\n+ type=\"passphrase\"\n+ v-model=\"connectionOption.ssh.passphrase\"\n+ />\n+ </section>\n</div>\n</div>\n- </div>\n- </div>\n- </el-row>\n<div id=\"fields\" data-type=\"none\"></div>\n<button class=\"button button--primary\" @click=\"tryConnect\">Connect</button>\n-\n</div>\n</template>\n<script>\n-import { getVscodeEvent } from \"../util/vscode\";\n-let vscodeEvent;\n+import { getVscodeEvent } from \"../util/vscode\"\n+let vscodeEvent\nexport default {\n- name: \"connect\",\n+ name: \"Connect\",\ndata() {\nreturn {\nconnectionOption: {\n@@ -139,26 +223,26 @@ export default {\nssh: {\nhost: \"\",\nport: 22,\n- username: \"root\"\n- }\n+ username: \"root\",\n+ },\n},\ntype: \"password\",\ndatabaseType: \"mysql\",\nerror: false,\n- errorMessage: \"\"\n- };\n+ errorMessage: \"\",\n+ }\n},\nmounted() {\n- vscodeEvent = getVscodeEvent();\n+ vscodeEvent = getVscodeEvent()\nvscodeEvent\n- .on(\"edit\", node => {\n- this.connectionOption = node;\n+ .on(\"edit\", (node) => {\n+ this.connectionOption = node\n})\n- .on(\"error\", err => {\n- this.error = true;\n- this.errorMessage = err;\n- });\n- vscodeEvent.emit(\"route-\" + this.$route.name);\n+ .on(\"error\", (err) => {\n+ this.error = true\n+ this.errorMessage = err\n+ })\n+ vscodeEvent.emit(\"route-\" + this.$route.name)\n},\ndestroyed() {\nvscodeEvent.destroy()\n@@ -167,23 +251,15 @@ export default {\ntryConnect() {\nvscodeEvent.emit(\"connecting\", {\ndatabaseType: this.databaseType,\n- connectionOption: this.connectionOption\n- });\n- }\n+ connectionOption: this.connectionOption,\n+ })\n+ },\n+ },\n}\n-};\n</script>\n<style scoped>\n-.container {\n- margin: auto;\n- padding-left: 24px;\n- padding-right: 24px;\n- max-width: 1000px;\n- box-sizing: border-box;\n-}\n-\n-.tab {\n+/* .tab {\nborder-bottom: 1px solid var(--vscode-dropdown-border);\ndisplay: flex;\npadding: 0;\n@@ -206,31 +282,12 @@ export default {\n.tab__item--active {\ncolor: var(--vscode-panelTitle-activeForeground);\nborder-bottom-color: var(--vscode-panelTitle-activeForeground);\n-}\n-\n-.field {\n- padding: 1em 0;\n-}\n-\n-.field--checkbox {\n- display: flex;\n- justify-content: flex-end;\n- flex-direction: row-reverse;\n- align-items: center;\n-}\n-\n-.field__label {\n- display: block;\n- margin: 2px 0;\n- cursor: pointer;\n-}\n-\n-.field--checkbox .field__label {\n- margin: 2px 4px;\n-}\n+} */\n-.field input {\n- width: 50vw;\n+input::-webkit-outer-spin-button,\n+input::-webkit-inner-spin-button {\n+ -webkit-appearance: none;\n+ margin: 0;\n}\n.field__input {\n@@ -242,15 +299,17 @@ export default {\n}\n.field__input:focus {\n- border-color: var(--vscode-focusBorder);\n+ border-color: inherit;\noutline: 0;\n}\n.button {\nwidth: auto;\n- padding: 2px 14px;\n+ padding: 4px 14px;\nborder: 0;\ndisplay: inline-block;\n+ outline: none;\n+ @apply font-bold;\ncursor: pointer;\n}\n@@ -264,8 +323,6 @@ export default {\n}\n.panel {\n- margin: 0 7px 0 5px;\n- padding: 0 16px 0 10px;\nborder-left-width: 5px;\nborder-left-style: solid;\nbackground: var(--vscode-textBlockQuote-background);\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Improve connect page; remove some unused code
|
141,902
|
18.12.2020 19:21:04
| -28,800
|
d4e9a431d7dec06146b6b6d1cc5350733b263d51
|
Formatted by prettier
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/App.vue",
"new_path": "src/vue/App.vue",
"diff": "</template>\n<script>\n-import { getVscodeEvent } from \"./util/vscode\";\n+import { getVscodeEvent } from \"./util/vscode\"\n-const vscodeEvent = getVscodeEvent();\n+const vscodeEvent = getVscodeEvent()\nexport default {\nname: \"App\",\nmounted() {\n- vscodeEvent.on(\"route\", path => {\n+ vscodeEvent.on(\"route\", (path) => {\nif (this.$route.name == path) {\n- vscodeEvent.emit(\"route-\" + this.$route.name);\n+ vscodeEvent.emit(\"route-\" + this.$route.name)\n} else {\n- this.$router.push(\"/\" + path);\n+ this.$router.push(\"/\" + path)\n}\n- });\n- vscodeEvent.emit(\"init\");\n+ })\n+ vscodeEvent.emit(\"init\")\n},\ndestroyed() {\n- vscodeEvent.destroy();\n+ vscodeEvent.destroy()\n+ },\n}\n-};\n</script>\n-\n-<style>\n-body{\n- padding: 0;\n-}\n-</style>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Formatted by prettier
|
141,908
|
19.12.2020 20:12:51
| -28,800
|
5ba9c8420463a67db5e5dfecfb72bbec107dca19
|
fix id duplicate
|
[
{
"change_type": "MODIFY",
"old_path": "src/provider/treeDataProvider.ts",
"new_path": "src/provider/treeDataProvider.ts",
"diff": "@@ -92,13 +92,19 @@ export class DbTreeDataProvider implements vscode.TreeDataProvider<Node> {\nlet workspaceConnections = this.context.globalState.get<{ [key: string]: Node }>(CacheKey.ConectionsKey, {});\nconst connections = { ...globalConnections, ...workspaceConnections };\n+ // temp duplicate id solution\n+ const idMap = {};\nreturn Object.keys(connections).map(key => {\nconst connection = new ConnectionNode(key, connections[key]);\n+ idMap[connection.id] = true;\nif (typeof connections[key].global == \"undefined\") {\n// Compatible with older versions, will remove in the feature\nconnections[key].global = true;\n}\n+ if (idMap[connection.id]) {\n+ idMap[connection.id] = idMap[connection.id] + new Date().getTime()\n+ }\nreturn connection;\n})\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
fix id duplicate
|
141,908
|
21.12.2020 22:42:55
| -28,800
|
836279a978482ac9cc6c12ffa36a19ef4ab33320
|
Change result title
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -78,7 +78,7 @@ export class QueryPage {\n})\nhandler.on(\"init\", () => {\nif (queryParam.res?.table) {\n- handler.panel.title = queryParam.res.table\n+ handler.panel.title = `${queryParam.res.table} @${queryParam.res.database}`\n}\nqueryParam.res.dbInfo={...ConnectionManager.getLastConnectionOption(),command:null,info:null }\nqueryParam.res.transId=Trans.transId;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Change result title
|
141,908
|
21.12.2020 23:13:15
| -28,800
|
b15be1265d2ac3814b0123c758a36464a66cf607
|
Update user display
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -22,10 +22,10 @@ export class UserGroup extends DatabaseNode {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\nlet userNodes = [];\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT DISTINCT USER FROM mysql.user;`)\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT host,user FROM mysql.user;`)\n.then((tables) => {\nuserNodes = tables.map<UserNode>((table) => {\n- return new UserNode(table.USER, this.info);\n+ return new UserNode(table.user,table.host, this.info);\n});\nreturn userNodes;\n})\n@@ -46,8 +46,8 @@ export class UserNode extends Node implements CopyAble {\npublic contextValue = ModelType.USER;\npublic iconPath = path.join(Constants.RES_PATH, \"icon/user.svg\")\n- constructor(readonly username: string, readonly info: Node) {\n- super(username)\n+ constructor(readonly username: string,readonly host:string, readonly info: Node) {\n+ super(`${username}@${host}`)\nthis.init(info)\nthis.command = {\ncommand: \"mysql.user.sql\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update user display
|
141,908
|
21.12.2020 23:59:44
| -28,800
|
9281a22d07af8b6a557d91c670402b43da1aec8a
|
Support save query.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.query.add\",\n+ \"title\": \"Create Query\",\n+ \"icon\": {\n+ \"light\": \"resources/light/add.svg\",\n+ \"dark\": \"resources/dark/add.svg\"\n+ },\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.diagram.open\",\n\"title\": \"Open Diagram\",\n\"when\": \"view == github.cweijan.mysql && viewItem == diagramGroup\",\n\"group\": \"2_mysql@0\"\n},\n+ {\n+ \"command\": \"mysql.query.add\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == queryGroup\",\n+ \"group\": \"2_mysql@0\"\n+ },\n{\n\"command\": \"mysql.refresh\",\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n\"when\": \"view == github.cweijan.mysql && viewItem == diagramGroup\",\n\"group\": \"inline@0\"\n},\n+ {\n+ \"command\": \"mysql.query.add\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == queryGroup\",\n+ \"group\": \"inline@0\"\n+ },\n{\n\"command\": \"mysql.template.user\",\n\"when\": \"view == github.cweijan.mysql && viewItem == userGroup\",\n},\n\"devDependencies\": {\n\"@types/mockjs\": \"^1.0.2\",\n- \"@types/node\": \"^7.10.10\",\n+ \"@types/node\": \"^12.12.6\",\n\"@types/ssh2\": \"^0.5.43\",\n\"@types/vscode\": \"1.38.0\",\n\"cardinal\": \"^2.1.1\",\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/icon/select.svg",
"diff": "+<?xml version=\"1.0\"?>\n+<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:svgjs=\"http://svgjs.com/svgjs\" version=\"1.1\" width=\"512\" height=\"512\" x=\"0\" y=\"0\" viewBox=\"0 0 24 24\" style=\"enable-background:new 0 0 512 512\" xml:space=\"preserve\" class=\"\"><g><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m12 11c-2.408 0-5-.626-5-2s2.592-2 5-2 5 .626 5 2-2.592 2-5 2zm0-3c-2.625 0-4 .743-4 1s1.375 1 4 1 4-.743 4-1-1.375-1-4-1z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m12 17c-2.408 0-5-.626-5-2v-6c0-.276.224-.5.5-.5s.5.224.5.5v6c0 .257 1.375 1 4 1s4-.743 4-1v-6c0-.276.224-.5.5-.5s.5.224.5.5v6c0 1.374-2.592 2-5 2z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m12 14c-2.408 0-5-.626-5-2 0-.276.224-.5.5-.5s.5.224.5.5c0 .257 1.375 1 4 1s4-.743 4-1c0-.276.224-.5.5-.5s.5.224.5.5c0 1.374-2.592 2-5 2z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m.77 15c-.229 0-.435-.158-.487-.39-.188-.832-.283-1.71-.283-2.61 0-6.617 5.383-12 12-12 3.8 0 7.409 1.83 9.653 4.895.163.223.115.536-.108.699-.223.164-.536.114-.699-.108-2.056-2.809-5.364-4.486-8.846-4.486-6.065 0-11 4.935-11 11 0 .827.087 1.631.258 2.39.061.27-.108.537-.378.598-.037.008-.074.012-.11.012z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m12 24c-3.829 0-7.454-1.853-9.695-4.957-.162-.224-.111-.537.112-.698.225-.163.536-.112.698.112 2.055 2.845 5.376 4.543 8.885 4.543 6.065 0 11-4.935 11-11 0-.838-.089-1.641-.266-2.384-.064-.269.102-.539.371-.602.271-.065.539.102.602.371.194.819.293 1.699.293 2.615 0 6.617-5.383 12-12 12z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m2.55 24c-.274 0-.497-.221-.5-.495l-.05-5c-.001-.133.051-.262.145-.356.094-.096.222-.149.355-.149h5c.276 0 .5.224.5.5s-.224.5-.5.5h-4.495l.045 4.495c.003.276-.218.502-.495.505-.001 0-.003 0-.005 0z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/><path xmlns=\"http://www.w3.org/2000/svg\" d=\"m21.5 6h-5c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h4.5v-4.5c0-.276.224-.5.5-.5s.5.224.5.5v5c0 .276-.224.5-.5.5z\" fill=\"#f1f1f1\" data-original=\"#000000\" style=\"\"/></g></svg>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "resources/icon/sync.svg",
"diff": "+<svg id=\"_x31_px\" enable-background=\"new 0 0 24 24\" height=\"512\" viewBox=\"0 0 24 24\" width=\"512\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"m12 11c-2.408 0-5-.626-5-2s2.592-2 5-2 5 .626 5 2-2.592 2-5 2zm0-3c-2.625 0-4 .743-4 1s1.375 1 4 1 4-.743 4-1-1.375-1-4-1z\"/><path d=\"m12 17c-2.408 0-5-.626-5-2v-6c0-.276.224-.5.5-.5s.5.224.5.5v6c0 .257 1.375 1 4 1s4-.743 4-1v-6c0-.276.224-.5.5-.5s.5.224.5.5v6c0 1.374-2.592 2-5 2z\"/><path d=\"m12 14c-2.408 0-5-.626-5-2 0-.276.224-.5.5-.5s.5.224.5.5c0 .257 1.375 1 4 1s4-.743 4-1c0-.276.224-.5.5-.5s.5.224.5.5c0 1.374-2.592 2-5 2z\"/><path d=\"m.77 15c-.229 0-.435-.158-.487-.39-.188-.832-.283-1.71-.283-2.61 0-6.617 5.383-12 12-12 3.8 0 7.409 1.83 9.653 4.895.163.223.115.536-.108.699-.223.164-.536.114-.699-.108-2.056-2.809-5.364-4.486-8.846-4.486-6.065 0-11 4.935-11 11 0 .827.087 1.631.258 2.39.061.27-.108.537-.378.598-.037.008-.074.012-.11.012z\"/><path d=\"m12 24c-3.829 0-7.454-1.853-9.695-4.957-.162-.224-.111-.537.112-.698.225-.163.536-.112.698.112 2.055 2.845 5.376 4.543 8.885 4.543 6.065 0 11-4.935 11-11 0-.838-.089-1.641-.266-2.384-.064-.269.102-.539.371-.602.271-.065.539.102.602.371.194.819.293 1.699.293 2.615 0 6.617-5.383 12-12 12z\"/><path d=\"m2.55 24c-.274 0-.497-.221-.5-.495l-.05-5c-.001-.133.051-.262.145-.356.094-.096.222-.149.355-.149h5c.276 0 .5.224.5.5s-.224.5-.5.5h-4.495l.045 4.495c.003.276-.218.502-.495.505-.001 0-.003 0-.005 0z\"/><path d=\"m21.5 6h-5c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h4.5v-4.5c0-.276.224-.5.5-.5s.5.224.5.5v5c0 .276-.224.5-.5.5z\"/></svg>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -50,6 +50,7 @@ export enum ModelType {\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+ QUERY_GROUP = \"queryGroup\",QUERY = \"query\",\nDIAGRAM_GROUP = \"diagramGroup\", DIAGRAM = \"diagram\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/filesManager.ts",
"new_path": "src/common/filesManager.ts",
"diff": "@@ -33,7 +33,7 @@ export class FileManager {\nconst recordPath = `${this.storagePath}/${fileName}`;\nthis.check(path.resolve(recordPath, '..'))\nif (!fs.existsSync(this.storagePath)) {\n- fs.mkdirSync(this.storagePath);\n+ fs.mkdirSync(this.storagePath,{recursive:true});\n}\nif (model == FileModel.WRITE) {\nfs.writeFileSync(recordPath, `${content}`, { encoding: 'utf8' });\n@@ -62,7 +62,7 @@ export class FileManager {\n.reduce((prevPath, folder) => {\nconst currentPath = path.join(prevPath, folder, path.sep);\nif (!fs.existsSync(currentPath)) {\n- fs.mkdirSync(currentPath);\n+ fs.mkdirSync(currentPath,{recursive:true});\n}\nreturn currentPath;\n}, '');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -25,6 +25,8 @@ import { FileManager } from \"./common/filesManager\";\nimport { ConnectionManager } from \"./service/connectionManager\";\nimport { DiagramNode } from \"./model/diagram/diagramNode\";\nimport { DiagramGroup } from \"./model/diagram/diagramGroup\";\n+import { QueryNode } from \"./model/query/queryNode\";\n+import { QueryGroup } from \"./model/query/queryGroup\";\nexport function activate(context: vscode.ExtensionContext) {\n@@ -86,6 +88,12 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.changeTableName\": (tableNode: TableNode) => {\ntableNode.changeTableName();\n},\n+ \"mysql.query.open\": (queryNode: QueryNode) => {\n+ queryNode.open()\n+ },\n+ \"mysql.query.add\": (queryGroup: QueryGroup) => {\n+ queryGroup.add();\n+ },\n\"mysql.index.template\": (tableNode: TableNode) => {\ntableNode.indexTemplate();\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -18,6 +18,7 @@ import { NodeUtil } from '../nodeUtil';\nimport { DiagramGroup } from \"../diagram/diagramGroup\";\nimport { OverviewService } from \"../../view/overview/overviewService\";\nimport { ServiceManager } from \"../../service/serviceManager\";\n+import { QueryGroup } from \"../query/queryGroup\";\nexport class DatabaseNode extends Node implements CopyAble {\n@@ -38,6 +39,7 @@ export class DatabaseNode extends Node implements CopyAble {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\nreturn [new TableGroup(this.info),\nnew ViewGroup(this.info),\n+ new QueryGroup(this.info),\nnew DiagramGroup(this.info),\nnew ProcedureGroup(this.info),\nnew FunctionGroup(this.info),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/diagram/diagramGroup.ts",
"new_path": "src/model/diagram/diagramGroup.ts",
"diff": "@@ -12,23 +12,6 @@ import { DiagramNode } from \"./diagramNode\";\nimport { Global } from \"../../common/global\";\nexport class DiagramGroup extends Node {\n- public openAdd() {\n- ViewManager.createWebviewPanel({\n- path: \"app\", title: \"new\",\n- iconPath: Global.getExtPath(\"resources\", \"icon\", \"diagram.svg\"),\n- splitView: false, eventHandler: (handler) => {\n- handler.on(\"init\", () => {\n- handler.emit('route', 'selector')\n- }).on(\"route-selector\", async () => {\n- handler.emit(\"selector-load\", await this.getTableInfos())\n- }).on(\"save\", ({ name, data }) => {\n- const diagramPath = `diagram/${this.getConnectId()}_${this.database}/${name}.json`;\n- FileManager.record(diagramPath, data, FileModel.WRITE)\n- DbTreeDataProvider.refresh()\n- })\n- }\n- })\n- }\npublic contextValue = ModelType.DIAGRAM_GROUP;\npublic iconPath = path.join(Constants.RES_PATH, \"icon/diagram.svg\")\n@@ -46,6 +29,23 @@ export class DiagramGroup extends Node {\nreturn readdirSync(path).map(fileName => new DiagramNode(fileName.replace(/\\.[^/.]+$/, \"\"), this))\n}\n+ public openAdd() {\n+ ViewManager.createWebviewPanel({\n+ path: \"app\", title: \"new\",\n+ iconPath: Global.getExtPath(\"resources\", \"icon\", \"diagram.svg\"),\n+ splitView: false, eventHandler: (handler) => {\n+ handler.on(\"init\", () => {\n+ handler.emit('route', 'selector')\n+ }).on(\"route-selector\", async () => {\n+ handler.emit(\"selector-load\", await this.getTableInfos())\n+ }).on(\"save\", ({ name, data }) => {\n+ const diagramPath = `diagram/${this.getConnectId()}_${this.database}/${name}.json`;\n+ FileManager.record(diagramPath, data, FileModel.WRITE)\n+ DbTreeDataProvider.refresh()\n+ })\n+ }\n+ })\n+ }\npublic async getData() {\nconst nodeDataArray = await this.getTableInfos()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/query/queryGroup.ts",
"diff": "+import * as vscode from \"vscode\";\n+import { ModelType, Constants } from \"@/common/constants\";\n+import * as path from \"path\";\n+import { Node } from \"../interface/node\";\n+import { QueryNode } from \"./queryNode\";\n+import { FileManager } from \"@/common/filesManager\";\n+import { existsSync, mkdirSync, readdirSync, writeFileSync } from \"fs\";\n+import { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\n+\n+export class QueryGroup extends Node {\n+ public contextValue = ModelType.QUERY_GROUP;\n+ public iconPath = path.join(Constants.RES_PATH, \"icon/select.svg\")\n+ private storePath: string;\n+ constructor(readonly info: Node) {\n+ super(\"Query\")\n+ this.init(info)\n+ this.storePath = `${FileManager.storagePath}/query/${this.getConnectId()}_${this.database}`;\n+ }\n+\n+ public async getChildren(isRresh: boolean = false): Promise<Node[]> {\n+ if (!existsSync(this.storePath)) {\n+ return []\n+ }\n+ return readdirSync(this.storePath).map(fileName => new QueryNode(fileName.replace(/\\.[^/.]+$/, \"\"), this))\n+ }\n+\n+ public add() {\n+ if (!existsSync(this.storePath)) {\n+ mkdirSync(this.storePath,{recursive:true});\n+ }\n+ vscode.window.showInputBox({ placeHolder: \"queryName\" }).then(res => {\n+ if (res) {\n+ const sqlPath = `${this.storePath}/${res}.sql`\n+ writeFileSync(sqlPath, '')\n+ DbTreeDataProvider.refresh(this)\n+ }\n+ })\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/query/queryNode.ts",
"diff": "+import * as vscode from \"vscode\";\n+import { ModelType, Constants } from \"@/common/constants\";\n+import { FileManager } from \"@/common/filesManager\";\n+import { QueryUnit } from \"@/service/queryUnit\";\n+import { readFileSync } from \"fs\";\n+import * as path from \"path\";\n+import { TreeItemCollapsibleState, window } from \"vscode\";\n+import { Node } from \"../interface/node\";\n+\n+export class QueryNode extends Node {\n+ public contextValue = ModelType.QUERY;\n+ public iconPath = path.join(Constants.RES_PATH, \"icon/select.svg\")\n+ constructor(public name: string, readonly info: Node) {\n+ super(name)\n+ this.init(info)\n+ this.collapsibleState = TreeItemCollapsibleState.None\n+ this.command = {\n+ command: \"mysql.query.open\",\n+ title: \"Open Query\",\n+ arguments: [this, true],\n+ }\n+ }\n+\n+ public async open() {\n+ await vscode.window.showTextDocument(\n+ await vscode.workspace.openTextDocument(this.getFilePath())\n+ );\n+ }\n+\n+ private getFilePath(): string {\n+ return `${FileManager.storagePath}/query/${this.getConnectId()}_${this.database}/${this.name}.sql`;\n+ }\n+\n+\n+}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support save query.
|
141,908
|
22.12.2020 09:12:51
| -28,800
|
06aca135b564453d57d8e286ee4cbf2a2fd61fa2
|
Support enter to connect
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "@@ -243,6 +243,11 @@ export default {\nthis.errorMessage = err\n})\nvscodeEvent.emit(\"route-\" + this.$route.name)\n+ window.onkeydown=e=>{\n+ if(e.key==\"Enter\" && e.target.tagName==\"INPUT\"){\n+ this.tryConnect()\n+ }\n+ }\n},\ndestroyed() {\nvscodeEvent.destroy()\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support enter to connect
|
141,908
|
22.12.2020 09:31:28
| -28,800
|
86e0ab09a3cc3d547b7ffe9be31677d11cb62bd1
|
Trim code, support rename query
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"category\": \"MySQL\"\n},\n+ {\n+ \"command\": \"mysql.query.rename\",\n+ \"title\": \"Rename Query\",\n+ \"category\": \"MySQL\"\n+ },\n{\n\"command\": \"mysql.diagram.open\",\n\"title\": \"Open Diagram\",\n\"when\": \"view == github.cweijan.mysql && viewItem == queryGroup\",\n\"group\": \"2_mysql@0\"\n},\n+ {\n+ \"command\": \"mysql.query.rename\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem == query\",\n+ \"group\": \"2_mysql@0\"\n+ },\n{\n\"command\": \"mysql.refresh\",\n\"when\": \"view == github.cweijan.mysql && viewItem == connection\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -41,6 +41,8 @@ export function activate(context: vscode.ExtensionContext) {\n}\n}),\n...initCommand({\n+ // util\n+ ...{\n\"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n[CommandKey.Refresh]: () => { serviceManager.provider.init(); },\n[CommandKey.RecordHistory]: (sql: string, costTime: number) => {\n@@ -49,33 +51,52 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.setting.open\": () => {\nserviceManager.settingService.open();\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- \"mysql.db.active\": () => {\n- serviceManager.provider.activeDb();\n+ \"mysql.server.info\": (connectionNode: ConnectionNode) => {\n+ serviceManager.statusService.show(connectionNode)\n},\n- \"mysql.mock.table\": (tableNode: TableNode) => {\n- serviceManager.mockRunner.create(tableNode)\n+ \"mysql.name.copy\": (copyAble: CopyAble) => {\n+ copyAble.copyName();\n},\n- \"mysql.mock.run\": () => {\n- serviceManager.mockRunner.runMock()\n},\n+ // connection\n+ ...{\n\"mysql.connection.add\": () => {\nserviceManager.connectService.openConnect(serviceManager.provider)\n},\n\"mysql.connection.edit\": (connectionNode: ConnectionNode) => {\nserviceManager.connectService.openConnect(serviceManager.provider, connectionNode)\n},\n+ \"mysql.connection.delete\": (connectionNode: ConnectionNode) => {\n+ connectionNode.deleteConnection(context);\n+ },\n\"mysql.host.copy\": (connectionNode: ConnectionNode) => {\nconnectionNode.copyName();\n},\n+ },\n+ // externel data\n+ ...{\n+ \"mysql.data.export\": (node: DatabaseNode | TableNode) => {\n+ serviceManager.dumpService.dump(node, true)\n+ },\n+ \"mysql.struct.export\": (node: DatabaseNode | TableNode) => {\n+ serviceManager.dumpService.dump(node, false)\n+ },\n+ \"mysql.data.import\": (node: DatabaseNode | ConnectionNode) => {\n+ vscode.window.showOpenDialog({ filters: { Sql: ['sql'] }, canSelectMany: false, openLabel: \"Select sql file to import\", canSelectFiles: true, canSelectFolders: false }).then((filePath) => {\n+ if (filePath) {\n+ serviceManager.importService.import(filePath[0].fsPath, node)\n+ }\n+ });\n+ },\n+ },\n+ // database\n+ ...{\n+ \"mysql.db.active\": () => {\n+ serviceManager.provider.activeDb();\n+ },\n+ \"mysql.db.truncate\": (databaseNode: DatabaseNode) => {\n+ databaseNode.truncateDb();\n+ },\n\"mysql.database.add\": (connectionNode: ConnectionNode) => {\nconnectionNode.createDatabase();\n},\n@@ -85,8 +106,52 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.db.overview\": (databaseNode: DatabaseNode) => {\ndatabaseNode.openOverview();\n},\n- \"mysql.changeTableName\": (tableNode: TableNode) => {\n- tableNode.changeTableName();\n+ },\n+ // mock\n+ ...{\n+ \"mysql.mock.table\": (tableNode: TableNode) => {\n+ serviceManager.mockRunner.create(tableNode)\n+ },\n+ \"mysql.mock.run\": () => {\n+ serviceManager.mockRunner.runMock()\n+ },\n+ },\n+ // user node\n+ ...{\n+ \"mysql.change.user\": (userNode: UserNode) => {\n+ userNode.changePasswordTemplate();\n+ },\n+ \"mysql.user.grant\": (userNode: UserNode) => {\n+ userNode.grandTemplate();\n+ },\n+ \"mysql.user.sql\": (userNode: UserNode) => {\n+ userNode.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+ if (typeof sql != 'string') { sql = null; }\n+ QueryUnit.runQuery(sql);\n+ },\n+ \"mysql.query.switch\": async (databaseOrConnectionNode: DatabaseNode | ConnectionNode) => {\n+ if (databaseOrConnectionNode) {\n+ await databaseOrConnectionNode.newQuery();\n+ } else {\n+ FileManager.show(`sql/${new Date().getTime()}.sql`)\n+ }\n},\n\"mysql.query.open\": (queryNode: QueryNode) => {\nqueryNode.open()\n@@ -94,24 +159,33 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.query.add\": (queryGroup: QueryGroup) => {\nqueryGroup.add();\n},\n- \"mysql.index.template\": (tableNode: TableNode) => {\n- tableNode.indexTemplate();\n+ \"mysql.query.rename\": (queryNode: QueryNode) => {\n+ queryNode.rename()\n+ },\n+ \"mysql.count.sql\": (tableNode: TableNode) => {\n+ tableNode.countSql()\n+ },\n},\n+ // table node\n+ ...{\n\"mysql.table.truncate\": (tableNode: TableNode) => {\ntableNode.truncateTable();\n},\n- \"mysql.db.truncate\": (databaseNode: DatabaseNode) => {\n- databaseNode.truncateDb();\n- },\n\"mysql.table.drop\": (tableNode: TableNode) => {\ntableNode.dropTable();\n},\n\"mysql.table.source\": (tableNode: TableNode) => {\nif (tableNode) { tableNode.showSource(); }\n},\n+ \"mysql.changeTableName\": (tableNode: TableNode) => {\n+ tableNode.changeTableName();\n+ },\n\"mysql.table.show\": (tableNode: TableNode) => {\nif (tableNode) { tableNode.openInNew(); }\n},\n+ },\n+ // column node\n+ ...{\n\"mysql.column.changeName\": (columnNode: ColumnNode) => {\ncolumnNode.changeColumnName();\n},\n@@ -130,41 +204,14 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.column.drop\": (columnNode: ColumnNode) => {\ncolumnNode.dropColumnTemplate();\n},\n- \"mysql.connection.delete\": (connectionNode: ConnectionNode) => {\n- connectionNode.deleteConnection(context);\n- },\n- \"mysql.runQuery\": (sql) => {\n- if (typeof sql != 'string') { sql = null; }\n- QueryUnit.runQuery(sql);\n- },\n- \"mysql.query.switch\": async (databaseOrConnectionNode: DatabaseNode | ConnectionNode) => {\n- if (databaseOrConnectionNode) {\n- await databaseOrConnectionNode.newQuery();\n- } else {\n- FileManager.show(`sql/${new Date().getTime()}.sql`)\n- }\n- },\n- \"mysql.count.sql\": (tableNode: TableNode) => {\n- tableNode.countSql()\n},\n+ // template\n+ ...{\n\"mysql.template.sql\": (tableNode: TableNode, run: boolean) => {\ntableNode.selectSqlTemplate(run);\n},\n- \"mysql.name.copy\": (copyAble: CopyAble) => {\n- copyAble.copyName();\n- },\n- \"mysql.data.import\": (node: DatabaseNode | ConnectionNode) => {\n- vscode.window.showOpenDialog({ filters: { Sql: ['sql'] }, canSelectMany: false, openLabel: \"Select sql file to import\", canSelectFiles: true, canSelectFolders: false }).then((filePath) => {\n- if (filePath) {\n- serviceManager.importService.import(filePath[0].fsPath, node)\n- }\n- });\n- },\n- \"mysql.data.export\": (node: DatabaseNode | TableNode) => {\n- serviceManager.dumpService.dump(node, true)\n- },\n- \"mysql.struct.export\": (node: DatabaseNode | TableNode) => {\n- serviceManager.dumpService.dump(node, false)\n+ \"mysql.index.template\": (tableNode: TableNode) => {\n+ tableNode.indexTemplate();\n},\n\"mysql.template.delete\": (tableNode: TableNode) => {\ntableNode.deleteSqlTemplate();\n@@ -175,6 +222,9 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.copy.update\": (tableNode: TableNode) => {\ntableNode.updateSqlTemplate();\n},\n+ },\n+ // show source\n+ ...{\n\"mysql.show.procedure\": (procedureNode: ProcedureNode) => {\nprocedureNode.showSource();\n},\n@@ -184,9 +234,9 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.show.trigger\": (triggerNode: TriggerNode) => {\ntriggerNode.showSource();\n},\n- \"mysql.user.sql\": (userNode: UserNode) => {\n- userNode.selectSqlTemplate();\n},\n+ // create template\n+ ...{\n\"mysql.template.table\": (tableGroup: TableGroup) => {\ntableGroup.createTemplate();\n},\n@@ -205,6 +255,9 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.template.user\": (userGroup: UserGroup) => {\nuserGroup.createTemplate();\n},\n+ },\n+ // drop template\n+ ...{\n\"mysql.delete.user\": (userNode: UserNode) => {\nuserNode.drop();\n},\n@@ -214,20 +267,12 @@ export function activate(context: vscode.ExtensionContext) {\n\"mysql.delete.procedure\": (procedureNode: ProcedureNode) => {\nprocedureNode.drop();\n},\n- \"mysql.server.info\": (connectionNode: ConnectionNode) => {\n- serviceManager.statusService.show(connectionNode)\n- },\n\"mysql.delete.function\": (functionNode: FunctionNode) => {\nfunctionNode.drop();\n},\n\"mysql.delete.trigger\": (triggerNode: TriggerNode) => {\ntriggerNode.drop();\n},\n- \"mysql.change.user\": (userNode: UserNode) => {\n- userNode.changePasswordTemplate();\n- },\n- \"mysql.user.grant\": (userNode: UserNode) => {\n- userNode.grandTemplate();\n},\n}),\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -57,10 +57,10 @@ export class DatabaseNode extends Node implements CopyAble {\nQueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP DATABASE \\`${this.database}\\``).then(() => {\nDatabaseCache.clearDatabaseCache(`${this.getConnectId()}`)\nDbTreeDataProvider.refresh();\n- vscode.window.showInformationMessage(`Delete database ${this.database} success!`)\n+ vscode.window.showInformationMessage(`Drop database ${this.database} success!`)\n})\n} else {\n- vscode.window.showInformationMessage(`Cancel delete database ${this.database}!`)\n+ vscode.window.showInformationMessage(`Cancel drop database ${this.database}!`)\n}\n})\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/query/queryNode.ts",
"new_path": "src/model/query/queryNode.ts",
"diff": "@@ -2,10 +2,11 @@ import * as vscode from \"vscode\";\nimport { ModelType, Constants } from \"@/common/constants\";\nimport { FileManager } from \"@/common/filesManager\";\nimport { QueryUnit } from \"@/service/queryUnit\";\n-import { readFileSync } from \"fs\";\n+import { readFileSync, renameSync } from \"fs\";\nimport * as path from \"path\";\nimport { TreeItemCollapsibleState, window } from \"vscode\";\nimport { Node } from \"../interface/node\";\n+import { DbTreeDataProvider } from \"@/provider/treeDataProvider\";\nexport class QueryNode extends Node {\npublic contextValue = ModelType.QUERY;\n@@ -27,8 +28,17 @@ export class QueryNode extends Node {\n);\n}\n- private getFilePath(): string {\n- return `${FileManager.storagePath}/query/${this.getConnectId()}_${this.database}/${this.name}.sql`;\n+ public async rename() {\n+ vscode.window.showInputBox({ placeHolder: \"Input new name\" }).then(newName => {\n+ if (newName) {\n+ renameSync(this.getFilePath(),this.getFilePath(newName))\n+ DbTreeDataProvider.refresh(this.info)\n+ }\n+ })\n+ }\n+\n+ private getFilePath(newName?: string): string {\n+ return `${FileManager.storagePath}/query/${this.getConnectId()}_${this.database}/${newName || this.name}.sql`;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Trim code, support rename query
|
141,908
|
28.12.2020 21:54:14
| -28,800
|
e29086ad1166f79f53f599c127d241469701ad3c
|
Add pager and resign button
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-col>\n</el-row>\n<div class=\"toolbar\">\n- <el-input v-model=\"table.search\" size=\"small\" placeholder=\"Input To Search Data\" style=\"width:200px\" />\n- <el-button @click=\"exportData()\" type=\"primary\" size=\"small\" icon=\"el-icon-share\" circle title=\"Export\"></el-button>\n- <el-button type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"small\" circle @click=\"insertRequest\">\n+ <div style=\"display:inline-block\">\n+ <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"100\" :page-sizes=\"[100,200,300,400,500,1000]\" layout=\"prev,sizes, next, jumper\" :total=\"1000\">\n+ </el-pagination>\n+ </div>\n+ <el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" />\n+ <el-button @click=\"exportData()\" type=\"primary\" size=\"mini\" icon=\"el-icon-share\" circle title=\"Export\"></el-button>\n+ <el-button type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\">\n</el-button>\n<el-popover placement=\"bottom\" title=\"Select columns to show\" width=\"200\" trigger=\"click\">\n<el-checkbox-group v-model=\"toolbar.showColumns\">\n{{ column.name }}\n</el-checkbox>\n</el-checkbox-group>\n- <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"small\" slot=\"reference\">\n+ <el-button icon=\"el-icon-search\" circle title=\"Select columns to show\" size=\"mini\" slot=\"reference\">\n</el-button>\n</el-popover>\n- <el-button type=\"success\" size=\"small\" icon=\"el-icon-s-help\" circle title=\"Count\" @click='count(toolbar.sql);'></el-button>\n- <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"small\" icon=\"el-icon-refresh\" circle> </el-button>\n- <el-button type=\"danger\" size=\"small\" icon=\"el-icon-caret-right\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n- <template v-if=\"result.primaryKey && (toolbar.row[result.primaryKey]||toolbar.show)\">\n- <el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"small\" icon=\"el-icon-edit\" title=\"edit\" circle>\n+ <el-button type=\"success\" size=\"mini\" icon=\"el-icon-s-help\" circle title=\"Count\" @click='count(toolbar.sql);'></el-button>\n+ <el-button @click=\"resetFilter\" title=\"Reset filter\" type=\"warning\" size=\"mini\" icon=\"el-icon-refresh\" circle> </el-button>\n+ <el-button type=\"danger\" size=\"mini\" icon=\"el-icon-caret-right\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n+ <el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!selectRow\">\n</el-button>\n- <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"small\" title=\"copy\" icon=\"el-icon-document-copy\" circle>\n+ <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"mini\" title=\"copy\" icon=\"el-icon-document-copy\" circle :disabled=\"!selectRow\">\n</el-button>\n- <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"small\" icon=\"el-icon-delete\" circle>\n+ <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle :disabled=\"!selectRow\">\n</el-button>\n- </template>\n</div>\n<div v-if=\"info.visible \">\n<div v-if=\"info.error\" class=\"info-panel\" style=\"color:red !important\" v-html=\"info.message\"></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\" @table-body-scroll=\"(_,e)=>scrollChange(e)\" :height=\"remainHeight\" width=\"100vh\" stripe @select-all=\"toolbar.show=true\" :edit-config=\"{trigger: 'click', mode: 'cell',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 @select-all=\"toolbar.show=true\" :edit-config=\"{trigger: 'click', mode: 'cell',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-table-column type=\"checkbox\" width=\"40\" fixed=\"left\" />\n<ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\" />\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</ux-table-column>\n</ux-grid>\n<!-- talbe result -->\n- <el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"small\">\n+ <el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"mini\">\n<el-form ref=\"infoForm\" :model=\"update.currentNew\" :inline=\"true\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n<template>\nInsert</el-button>\n</span>\n</el-dialog>\n- <el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"30%\" top=\"3vh\" size=\"small\">\n+ <el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"30%\" top=\"3vh\" size=\"mini\">\n<el-form :model=\"exportOption\">\n<el-form-item label=\"Export File Type\">\n<el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n</template>\n<script>\n-import { getVscodeEvent } from \"../util/vscode\";\n-let vscodeEvent;\n+import { getVscodeEvent } from \"../util/vscode\"\n+let vscodeEvent\nexport default {\nname: \"App\",\n@@ -135,8 +137,6 @@ export default {\npage: {\npageNum: 1,\npageSize: -1,\n- isEnd: false,\n- lock: false,\n},\ntable: {\nsearch: \"\",\n@@ -173,116 +173,99 @@ export default {\ncurrentNew: {},\nprimary: null,\n},\n- };\n+ }\n},\nmounted() {\nconst handlerData = (data, sameTable) => {\nif (data.dbInfo) {\n- this.dbInfo = data.dbInfo;\n+ this.dbInfo = data.dbInfo\n}\n- this.result = data;\n- this.toolbar.sql = data.sql;\n+ this.result = data\n+ this.toolbar.sql = data.sql\nif (sameTable) {\n- this.clear();\n+ this.clear()\n} else {\n- this.reset();\n+ this.reset()\n+ }\n}\n- };\nconst handlerCommon = (res) => {\n- this.editor.loading = false;\n- this.editor.visible = false;\n- this.info.visible = true;\n- this.info.message = res.message;\n+ this.editor.loading = false\n+ this.editor.visible = false\n+ this.info.visible = true\n+ this.info.message = res.message\n// this.$message({ type: 'success', message: `EXECUTE ${res.sql} SUCCESS, affectedRows:${res.affectedRows}` });\n- };\n- vscodeEvent = getVscodeEvent();\n+ }\n+ vscodeEvent = getVscodeEvent()\nwindow.onfocus = () => {\nvscodeEvent.emit(\"showInfo\", {\ntable: this.result.table,\nrow: this.result.data.length - 1,\ncol: this.columnCount,\n- });\n- vscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime });\n- };\n+ })\n+ vscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime })\n+ }\nwindow.addEventListener(\"message\", ({ data }) => {\n- if (!data) return;\n- console.log(data);\n- const response = data.content;\n- this.table.loading = false;\n+ if (!data) return\n+ console.log(data)\n+ const response = data.content\n+ this.table.loading = false\nif (response && response.costTime) {\n- this.toolbar.costTime = response.costTime;\n- vscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime });\n+ this.toolbar.costTime = response.costTime\n+ vscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime })\n}\nvscodeEvent.emit(\"showInfo\", {\ntable: this.result.table,\nrow: this.result.data.length - 1,\ncol: this.columnCount,\n- });\n+ })\nswitch (data.type) {\ncase \"RUN\":\n- this.toolbar.sql = response.sql;\n- this.table.loading = response.transId != this.result.transId;\n- break;\n+ this.toolbar.sql = response.sql\n+ this.table.loading = response.transId != this.result.transId\n+ break\ncase \"DATA\":\n- handlerData(response);\n- break;\n+ handlerData(response)\n+ break\ncase \"NEXT_PAGE\":\n- if (response.data && response.data.length > 0) {\n- this.result.data.push(...response.data);\n- } else {\n- this.page.isEnd = true;\n- }\n- setTimeout(() => {\n- this.page.lock = false;\n- }, 100);\n- break;\n+ this.result.data = response.data\n+ this.toolbar.sql = response.sql\n+ break\ncase \"DML\":\ncase \"DDL\":\n- handlerCommon(response);\n- this.info.error = false;\n- this.info.needRefresh = false;\n- this.refresh();\n- break;\n+ handlerCommon(response)\n+ this.info.error = false\n+ this.info.needRefresh = false\n+ this.refresh()\n+ break\ncase \"ERROR\":\n- handlerCommon(response);\n- this.info.error = true;\n- break;\n+ handlerCommon(response)\n+ this.info.error = true\n+ break\ncase \"MESSAGE\":\nif (response.message) {\nif (response.success) {\n- this.$message.success(response.message);\n+ this.$message.success(response.message)\n} else {\n- this.$message.error(response.message);\n+ this.$message.error(response.message)\n}\n}\n- this.refresh();\n- break;\n+ this.refresh()\n+ break\ndefault:\n- this.$message(JSON.stringify(data));\n+ this.$message(JSON.stringify(data))\n}\n- });\n- vscodeEvent.emit(\"init\");\n+ })\n+ vscodeEvent.emit(\"init\")\nwindow.addEventListener(\"keyup\", (event) => {\nif (event.key == \"c\" && event.ctrlKey) {\n- document.execCommand(\"copy\");\n+ document.execCommand(\"copy\")\n}\n- });\n+ })\n},\nmethods: {\noutput(obj) {\n- console.log(obj);\n- },\n- scrollChange(event) {\n- const table = event.target;\n- if (\n- table.scrollHeight -\n- table.scrollTop -\n- document.documentElement.clientHeight <=\n- 50\n- ) {\n- this.nextPage();\n- }\n+ console.log(obj)\n},\nconfirmExport() {\nvscodeEvent.emit(\"export\", {\n@@ -290,88 +273,70 @@ export default {\n...this.exportOption,\nsql: this.result.sql,\n},\n- });\n- this.exportOption.visible = false;\n+ })\n+ this.exportOption.visible = false\n},\nexportData() {\n- this.exportOption.visible = true;\n+ this.exportOption.visible = true\n},\nfilter(event, column) {\n- let inputvalue = \"\" + event.target.value;\n+ let inputvalue = \"\" + event.target.value\n- let filterSql =\n- this.result.sql.replace(/\\n/, \" \").replace(\";\", \" \") + \" \";\n+ let filterSql = this.result.sql.replace(/\\n/, \" \").replace(\";\", \" \") + \" \"\n- let existsCheck = new RegExp(\n- `(WHERE|AND)?\\\\s*\\`?${column}\\`?\\\\s*(=|is)\\\\s*.+?\\\\s`,\n- \"igm\"\n- );\n+ let existsCheck = new RegExp(`(WHERE|AND)?\\\\s*\\`?${column}\\`?\\\\s*(=|is)\\\\s*.+?\\\\s`, \"igm\")\nif (inputvalue) {\n- const condition =\n- inputvalue.toLowerCase() === \"null\"\n- ? `${column} is null`\n- : `\\`${column}\\`='${inputvalue}'`;\n+ const condition = inputvalue.toLowerCase() === \"null\" ? `${column} is null` : `\\`${column}\\`='${inputvalue}'`\nif (existsCheck.exec(filterSql)) {\n// condition present\n- filterSql = filterSql.replace(existsCheck, `$1 ${condition} `);\n+ filterSql = filterSql.replace(existsCheck, `$1 ${condition} `)\n} else if (filterSql.match(/\\bwhere\\b/gi)) {\n//have where\n- filterSql = filterSql.replace(\n- /\\b(where)\\b/gi,\n- `\\$1 ${condition} AND `\n- );\n+ filterSql = filterSql.replace(/\\b(where)\\b/gi, `\\$1 ${condition} AND `)\n} else {\n//have not where\n- filterSql = filterSql.replace(\n- new RegExp(`(from\\\\s*.+?)\\\\s`, \"ig\"),\n- `\\$1 WHERE ${condition} `\n- );\n+ filterSql = filterSql.replace(new RegExp(`(from\\\\s*.+?)\\\\s`, \"ig\"), `\\$1 WHERE ${condition} `)\n}\n} else {\n// empty value, clear filter\n- let beforeAndCheck = new RegExp(\n- `\\\\b${column}\\\\b\\\\s*(=|is)\\\\s*.+?\\\\s*AND`,\n- \"igm\"\n- );\n+ let beforeAndCheck = new RegExp(`\\\\b${column}\\\\b\\\\s*(=|is)\\\\s*.+?\\\\s*AND`, \"igm\")\nif (beforeAndCheck.exec(filterSql)) {\n- filterSql = filterSql.replace(beforeAndCheck, \"\");\n+ filterSql = filterSql.replace(beforeAndCheck, \"\")\n} else {\n- filterSql = filterSql.replace(existsCheck, \" \");\n+ filterSql = filterSql.replace(existsCheck, \" \")\n}\n}\n- this.execute(filterSql + \";\");\n+ this.execute(filterSql + \";\")\n},\nresetFilter() {\n- this.execute(\n- this.result.sql.replace(/where.+?\\b(order|limit|group)\\b/gi, \"$1\")\n- );\n+ this.execute(this.result.sql.replace(/where.+?\\b(order|limit|group)\\b/gi, \"$1\"))\n},\nsort(row) {\nlet sortSql = this.result.sql\n.replace(/\\n/, \" \")\n.replace(\";\", \"\")\n.replace(/order by .+? (desc|asc)?/gi, \"\")\n- .replace(/\\s?(limit.+)?$/i, ` ORDER BY ${row.prop} ${row.order} \\$1 `);\n- this.execute(sortSql + \";\");\n+ .replace(/\\s?(limit.+)?$/i, ` ORDER BY ${row.prop} ${row.order} \\$1 `)\n+ this.execute(sortSql + \";\")\n},\ninsertRequest() {\n- this.editor.visible = true;\n- this.update.primary = null;\n- this.update.currentNew = {};\n+ this.editor.visible = true\n+ this.update.primary = null\n+ this.update.currentNew = {}\n},\nwrapQuote(columnName, value) {\nif (value === \"\") {\n- return \"null\";\n+ return \"null\"\n}\nif (/\\(.*?\\)/.exec(value)) {\n- return value;\n+ return value\n}\nif (typeof value == \"string\") {\n- value = value.replace(/'/g, \"\\\\'\");\n+ value = value.replace(/'/g, \"\\\\'\")\n}\n- const type = this.getTypeByColumn(columnName).toLowerCase();\n+ const type = this.getTypeByColumn(columnName).toLowerCase()\nswitch (type) {\ncase \"varchar\":\ncase \"char\":\n@@ -381,103 +346,92 @@ export default {\ncase \"datetime\":\ncase \"set\":\ncase \"json\":\n- return `'${value}'`;\n+ return `'${value}'`\ndefault:\n- if (\n- type.indexOf(\"text\") !== -1 ||\n- type.indexOf(\"blob\") !== -1 ||\n- type.indexOf(\"binary\") !== -1\n- ) {\n- return `'${value}'`;\n+ if (type.indexOf(\"text\") !== -1 || type.indexOf(\"blob\") !== -1 || type.indexOf(\"binary\") !== -1) {\n+ return `'${value}'`\n}\n}\n- return value;\n+ return value\n},\ngetTypeByColumn(key) {\n- if (!this.result.columnList) return;\n+ if (!this.result.columnList) return\nfor (const column of this.result.columnList) {\nif (column.name === key) {\n- return column.simpleType;\n+ return column.simpleType\n}\n}\n},\nconfirmInsert() {\n- let columns = \"\";\n- let values = \"\";\n+ let columns = \"\"\n+ let values = \"\"\nfor (const key in this.update.currentNew) {\n- if (this.getTypeByColumn(key) == null) continue;\n- const newEle = this.update.currentNew[key];\n+ if (this.getTypeByColumn(key) == null) continue\n+ const newEle = this.update.currentNew[key]\nif (newEle != null) {\n- columns += `\\`${key}\\`,`;\n- values += `${this.wrapQuote(key, newEle)},`;\n+ columns += `\\`${key}\\`,`\n+ values += `${this.wrapQuote(key, newEle)},`\n}\n}\nif (values) {\n- const insertSql = `INSERT INTO ${this.result.table}(${columns.replace(\n+ const insertSql = `INSERT INTO ${this.result.table}(${columns.replace(/,$/, \"\")}) VALUES(${values.replace(\n/,$/,\n\"\"\n- )}) VALUES(${values.replace(/,$/, \"\")})`;\n- this.execute(insertSql);\n+ )})`\n+ this.execute(insertSql)\n} else {\n- this.$message(\"Not any input, update fail!\");\n+ this.$message(\"Not any input, update fail!\")\n}\n},\nconfirmUpdate() {\nif (!this.result.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, update fail!\")\n+ return\n}\n- let change = \"\";\n+ let change = \"\"\nfor (const key in this.update.currentNew) {\n- if (this.getTypeByColumn(key) == null) continue;\n- const oldEle = this.update.current[key];\n- const newEle = this.update.currentNew[key];\n+ if (this.getTypeByColumn(key) == null) continue\n+ const oldEle = this.update.current[key]\n+ const newEle = this.update.currentNew[key]\nif (oldEle !== newEle) {\n- change += `\\`${key}\\`=${this.wrapQuote(key, newEle)},`;\n+ change += `\\`${key}\\`=${this.wrapQuote(key, newEle)},`\n}\n}\nif (change) {\n- const updateSql = `UPDATE ${this.result.table} SET ${change.replace(\n- /,$/,\n- \"\"\n- )} WHERE ${this.result.primaryKey}=${this.wrapQuote(\n- this.result.primaryKey,\n- this.update.primary\n- )}`;\n- this.execute(updateSql);\n+ const updateSql = `UPDATE ${this.result.table} SET ${change.replace(/,$/, \"\")} WHERE ${\n+ this.result.primaryKey\n+ }=${this.wrapQuote(this.result.primaryKey, this.update.primary)}`\n+ this.execute(updateSql)\n} else {\n- this.$message(\"Not any change, update fail!\");\n+ this.$message(\"Not any change, update fail!\")\n}\n},\nupdateEdit(row, column, event) {\nif (row.isFilter) {\n- return;\n+ return\n}\n- if (\n- column && column.type == \"checkbox\" &&\n- this.$refs.dataTable.getCheckboxRecords().length == 0\n- ) {\n- this.toolbar.row = {};\n- return;\n+ if (column && column.type == \"checkbox\" && this.$refs.dataTable.getCheckboxRecords().length == 0) {\n+ this.toolbar.row = {}\n+ return\n}\n- this.toolbar.row = row;\n+ this.toolbar.row = row\nthis.update = {\ncurrent: row,\ncurrentNew: this.clone(row),\nprimary: row[this.result.primaryKey],\n- };\n+ }\nif (this.result.data.length > 24 && column.type != \"checkbox\") {\n// this.openEdit();\n}\n},\nopenEdit(row) {\n- this.editor.visible = true;\n+ this.editor.visible = true\n},\nopenCopy(row) {\n- this.updateEdit(row);\n- this.update.currentNew[this.result.primaryKey] = null;\n- this.update.primary = null;\n- this.editor.visible = true;\n+ this.updateEdit(row)\n+ this.update.currentNew[this.result.primaryKey] = null\n+ this.update.primary = null\n+ this.editor.visible = true\n},\ndeleteConfirm(primaryValue) {\nthis.$confirm(\"Are you sure you want to delete this data?\", \"Warning\", {\n@@ -486,230 +440,200 @@ export default {\ntype: \"warning\",\n})\n.then(() => {\n- let checkboxRecords = this.$refs.dataTable.getCheckboxRecords();\n+ let checkboxRecords = this.$refs.dataTable.getCheckboxRecords()\nif (checkboxRecords.length > 0) {\ncheckboxRecords = checkboxRecords\n- .filter(\n- (checkboxRecord) =>\n- checkboxRecord[this.result.primaryKey] != null\n- )\n- .map((checkboxRecord) =>\n- this.wrapQuote(\n- this.result.primaryKey,\n- checkboxRecord[this.result.primaryKey]\n- )\n- );\n+ .filter((checkboxRecord) => checkboxRecord[this.result.primaryKey] != null)\n+ .map((checkboxRecord) => this.wrapQuote(this.result.primaryKey, checkboxRecord[this.result.primaryKey]))\n}\nconst deleteSql =\ncheckboxRecords.length > 0\n- ? `DELETE FROM ${this.result.table} WHERE ${\n- this.result.primaryKey\n- } in (${checkboxRecords.join(\",\")})`\n- : `DELETE FROM ${this.result.table} WHERE ${\n- this.result.primaryKey\n- }=${this.wrapQuote(this.result.primaryKey, primaryValue)}`;\n- this.execute(deleteSql);\n+ ? `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey} in (${checkboxRecords.join(\",\")})`\n+ : `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey}=${this.wrapQuote(\n+ this.result.primaryKey,\n+ primaryValue\n+ )}`\n+ this.execute(deleteSql)\n})\n.catch((e) => {\nif (e) {\n- this.$message.error(e);\n+ this.$message.error(e)\n} else {\n- this.$message({ type: \"warning\", message: \"Delete canceled\" });\n+ this.$message({ type: \"warning\", message: \"Delete canceled\" })\n}\n- });\n+ })\n},\ntableRowClassName({ row, rowIndex }) {\n- if (!this.result.primaryKey || !this.update.primary) return \"\";\n+ if (!this.result.primaryKey || !this.update.primary) return \"\"\nif (row[this.result.primaryKey] === this.update.primary) {\n- return \"edit-row\";\n+ return \"edit-row\"\n}\n- return \"\";\n+ return \"\"\n},\ncomputeWidth(key, index, keyIndex, value) {\n- if (this.table.widthItem[keyIndex]) return this.table.widthItem[keyIndex];\n- if (!index) index = 0;\n- if (!this.result.data[index] || index > 10) return 70;\n+ if (this.table.widthItem[keyIndex]) return this.table.widthItem[keyIndex]\n+ if (!index) index = 0\n+ if (!this.result.data[index] || index > 10) return 70\nif (!value) {\n- value = this.result.data[index][key];\n+ value = this.result.data[index][key]\n}\n- var dynamic = value ? (value + \"\").length * 10 : (key + \"\").length * 10;\n- if (dynamic > 600) dynamic = 600;\n- if (dynamic < 70) dynamic = 70;\n- var nextDynamic = this.computeWidth(key, index + 1, keyIndex);\n- if (dynamic < nextDynamic) dynamic = nextDynamic;\n- this.table.widthItem[keyIndex] = dynamic;\n- return dynamic;\n+ var dynamic = value ? (value + \"\").length * 10 : (key + \"\").length * 10\n+ if (dynamic > 600) dynamic = 600\n+ if (dynamic < 70) dynamic = 70\n+ var nextDynamic = this.computeWidth(key, index + 1, keyIndex)\n+ if (dynamic < nextDynamic) dynamic = nextDynamic\n+ this.table.widthItem[keyIndex] = dynamic\n+ return dynamic\n},\ncelledit(row, column, cell, event) {\nif (row.isFilter) {\n- return;\n+ return\n}\n- cell.contentEditable = true;\n+ cell.contentEditable = true\nif (this.result.primaryKey) {\n- this.update.primary = row[this.result.primaryKey];\n+ this.update.primary = row[this.result.primaryKey]\n}\n},\nrefresh() {\nif (this.result.sql) {\n- this.execute(this.result.sql);\n+ this.execute(this.result.sql)\n}\n},\ncount(sql) {\n- this.info.visible = false;\n- let countSql = sql\n- .replace(/select (.+?) from/i, \"SELECT count(*) FROM\")\n- .replace(/\\blimit\\b.+$/gi, \"\");\n- this.execute(countSql);\n+ this.info.visible = false\n+ let countSql = sql.replace(/select (.+?) from/i, \"SELECT count(*) FROM\").replace(/\\blimit\\b.+$/gi, \"\")\n+ this.execute(countSql)\n},\nexecute(sql) {\n- if (!sql) return;\n+ if (!sql) return\nvscodeEvent.emit(\"execute\", {\nsql: sql.replace(/ +/gi, \" \"),\ndbInfo: this.dbInfo,\n- });\n- this.table.loading = true;\n+ })\n+ this.table.loading = true\n},\ndeleteTemplate() {\n- this.result.sql = `DELETE FROM [table] WHERE id= `;\n+ this.result.sql = `DELETE FROM [table] WHERE id= `\n},\ndataformat0(origin) {\n- if (origin == null) return null;\n+ if (origin == null) return null\nif (origin.hasOwnProperty(\"type\")) {\n- return String.fromCharCode.apply(null, new Uint16Array(origin.data));\n+ return String.fromCharCode.apply(null, new Uint16Array(origin.data))\n}\n- return origin;\n+ return origin\n},\nwrap(origin) {\nif (origin == null) {\n- return origin;\n+ return origin\n}\n- if (\n- origin.match(/\\b[-\\.]\\b/gi) ||\n- origin.match(/^(if|key|desc|length)$/i)\n- ) {\n- return `\\`${origin}\\``;\n+ if (origin.match(/\\b[-\\.]\\b/gi) || origin.match(/^(if|key|desc|length)$/i)) {\n+ return `\\`${origin}\\``\n}\n- return origin;\n+ return origin\n},\n- nextPage() {\n- if (this.page.isEnd || this.page.lock) return;\n-\n- if (!this.result.sql.match(/\\blimit\\b/i)) {\n- this.page.isEnd = true;\n- return;\n- }\n-\n+ changePage(pageNum, jump) {\nif (!this.result.sql.match(/^\\s*select/i)) {\n- return;\n+ return\n}\nvscodeEvent.emit(\"next\", {\nsql: this.result.sql,\n- pageNum: ++this.page.pageNum,\n+ pageNum: jump ? pageNum : this.page.pageNum + pageNum,\npageSize: this.page.pageSize,\n- });\n- this.table.loading = true;\n- this.page.lock = true;\n+ })\n+ this.table.loading = true\n},\ndataformat(origin) {\nif (origin == undefined || origin == null) {\n- return \"<b>(NULL)</b>\";\n+ return \"<b>(NULL)</b>\"\n}\n- const preFormat = this.dataformat0(origin);\n- if (preFormat != origin) return preFormat;\n+ const preFormat = this.dataformat0(origin)\n+ if (preFormat != origin) return preFormat\n- return origin;\n+ return origin\n},\nclone(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)) {\n- objClone[key] = this.dataformat0(obj[key]);\n+ objClone[key] = this.dataformat0(obj[key])\n}\n}\n}\n- return objClone;\n+ return objClone\n},\ninitShowColumn() {\n- const fields = this.result.fields;\n- if (!fields) return;\n- this.toolbar.showColumns = [];\n+ const fields = this.result.fields\n+ if (!fields) return\n+ this.toolbar.showColumns = []\nfor (let i = 0; i < fields.length; i++) {\n- if (!fields[i].name) continue;\n- this.toolbar.showColumns.push(fields[i].name.toLowerCase());\n+ if (!fields[i].name) continue\n+ this.toolbar.showColumns.push(fields[i].name.toLowerCase())\n}\n},\n// show call when load same table data\nclear() {\n// reset page\n- this.page.pageNum = 1;\n- this.page.isEnd = false;\n- this.page.lock = false;\n- this.page.pageSize = this.result.pageSize;\n+ this.page.pageNum = 1\n+ this.page.pageSize = this.result.pageSize\n// info\nif (this.info.needRefresh) {\n- this.info.visible = false;\n+ this.info.visible = false\n} else {\n- this.info.needRefresh = true;\n+ this.info.needRefresh = true\n}\n// loading\n- this.table.loading = false;\n+ this.table.loading = false\n// toolbar\n- this.toolbar.row = {};\n+ this.toolbar.row = {}\n},\n// show call when change table\nreset() {\n- this.clear();\n+ this.clear()\n// table\n- this.table.widthItem = {};\n- this.initShowColumn();\n+ this.table.widthItem = {}\n+ this.initShowColumn()\n// add filter row\nif (this.result.columnList) {\n- this.result.data.unshift({ isFilter: true, content: \"\" });\n+ this.result.data.unshift({ isFilter: true, content: \"\" })\n}\n// toolbar\nif (!this.result.sql.match(/\\bwhere\\b/gi)) {\n- this.toolbar.filter = {};\n- this.$refs.dataTable.clearSort();\n+ this.toolbar.filter = {}\n+ this.$refs.dataTable.clearSort()\n}\n},\n},\ncomputed: {\ncolumnCount() {\n- if (this.result.data == undefined || this.result.data[0] == undefined)\n- return 0;\n- return Object.keys(this.result.data[0]).length;\n+ if (this.result.data == undefined || this.result.data[0] == undefined) return 0\n+ return Object.keys(this.result.data[0]).length\n},\neditorTilte() {\nif (this.update.primary == null) {\n- return \"Insert To \" + this.result.table;\n+ return \"Insert To \" + this.result.table\n}\n- return (\n- \"Edit For \" +\n- this.result.table +\n- \" : \" +\n- this.result.primaryKey +\n- \"=\" +\n- this.update.primary\n- );\n+ return \"Edit For \" + this.result.table + \" : \" + this.result.primaryKey + \"=\" + this.update.primary\n},\nremainHeight() {\n- return window.outerHeight - 250;\n+ return window.outerHeight - 250\n},\n+ selectRow() {\n+ return this.result.primaryKey && (this.toolbar.row[this.result.primaryKey] || this.toolbar.show)\n},\n-};\n+ },\n+}\n</script>\n<style>\nbody {\n/* background-color: var(--vscode-editor-background); */\nbackground-color: #f8f6f6;\n- font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\",\n- \"Microsoft YaHei\", Arial, sans-serif;\n+ font-family: \"Helvetica Neue\", Helvetica, \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei\", Arial, sans-serif;\npadding: 0;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add pager and resign button
|
141,908
|
28.12.2020 21:58:58
| -28,800
|
012cf7da5bfc76a80ae4b15d9e8e1054d776ee80
|
Update page theme
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/auto.css",
"new_path": "public/theme/auto.css",
"diff": "@@ -1281,7 +1281,7 @@ body {\n}\n.el-pagination .btn-next, .el-pagination .btn-prev {\n- background: center center no-repeat #FFF;\n+ background: center center no-repeat var(--vscode-editor-background);\nbackground-size: 16px;\ncursor: pointer;\nmargin: 0;\n@@ -2533,7 +2533,7 @@ body {\n}\n.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {\n- background-color: #F5F7FA\n+ background-color: var(--second-bg-color);\n}\n.el-select-dropdown__item.selected {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update page theme
|
141,908
|
28.12.2020 22:26:06
| -28,800
|
849ccacccae267eaaa64530cbedaabb3e35af9b9
|
Fix tree view not sync when delete
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/functionGroup.ts",
"new_path": "src/model/main/functionGroup.ts",
"diff": "@@ -26,7 +26,7 @@ export class FunctionGroup extends Node {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${this.database}' and ROUTINE_TYPE='FUNCTION'`)\n.then((tables) => {\ntableNodes = tables.map<FunctionNode>((table) => {\n- return new FunctionNode(table.ROUTINE_NAME, this.info);\n+ return new FunctionNode(table.ROUTINE_NAME, this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedureGroup.ts",
"new_path": "src/model/main/procedureGroup.ts",
"diff": "@@ -26,7 +26,7 @@ export class ProcedureGroup extends Node {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${this.database}' and ROUTINE_TYPE='PROCEDURE'`)\n.then((tables) => {\ntableNodes = tables.map<Node>((table) => {\n- return new ProcedureNode(table.ROUTINE_NAME, this.info);\n+ return new ProcedureNode(table.ROUTINE_NAME, this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -27,7 +27,7 @@ export class TableGroup extends Node {\n`SELECT table_comment comment,TABLE_NAME tableName FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${this.database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`)\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new TableNode(table.tableName, table.comment, this.info);\n+ return new TableNode(table.tableName, table.comment, this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/triggerGroup.ts",
"new_path": "src/model/main/triggerGroup.ts",
"diff": "@@ -27,7 +27,7 @@ export class TriggerGroup extends Node {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${this.database}'`)\n.then((tables) => {\ntableNodes = tables.map<TriggerNode>((table) => {\n- return new TriggerNode(table.TRIGGER_NAME, this.info);\n+ return new TriggerNode(table.TRIGGER_NAME, this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -28,7 +28,7 @@ export class ViewGroup extends Node {\n`SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${this.database}' LIMIT ${QueryUnit.maxTableCount}`)\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new ViewNode(table.TABLE_NAME, '', this.info);\n+ return new ViewNode(table.TABLE_NAME, '', this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix tree view not sync when delete
|
141,908
|
29.12.2020 10:48:49
| -28,800
|
f3143fbde12b7d98fc811b6ee4ef29de057c926a
|
Support export as csv
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -3,28 +3,28 @@ import { ExportService } from \"./exportService\";\nimport { FieldInfo } from \"mysql2\";\nimport * as fs from \"fs\";\nimport { Console } from \"../../common/Console\";\n-import { ExportOption } from \"./exportOption\";\n+import { ExportOption, ExportType } from \"./exportOption\";\nexport abstract class AbstractExportService implements ExportService {\npublic export(exportOption: ExportOption): void {\n- const randomFileName=`${new Date().getTime()}.xlsx`\n+ const randomFileName = `${new Date().getTime()}.${exportOption.type}`\n- vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'xlsx': ['xlsx'] } }).then((filePath) => {\n+ vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'file': [exportOption.type] } }).then((filePath) => {\nif (filePath) {\nexportOption.exportPath = filePath.fsPath;\nif (exportOption.withOutLimit) {\nexportOption.sql = exportOption.sql.replace(/\\blimit\\b.+/gi, \"\")\n}\n- this.exportExcel(exportOption)\n+ this.exportData(exportOption)\n}\n})\n}\n- protected abstract exportExcel(exportOption:ExportOption): void;\n+ protected abstract exportData(exportOption: ExportOption): void;\nprotected exportByNodeXlsx(filePath: string, fields: FieldInfo[], rows: any) {\n- Console.log(\"start export data...\")\n+ Console.log(\"start export data to excel...\")\nconst nodeXlsx = require('node-xlsx');\nfs.writeFileSync(filePath, nodeXlsx.build([{\nname: \"sheet1\",\n@@ -42,4 +42,18 @@ export abstract class AbstractExportService implements ExportService {\nConsole.log(\"export success!\")\n}\n+ protected exportToCsv(filePath: string, fields: FieldInfo[], rows: any) {\n+ Console.log(\"start export data to csv...\")\n+ let csvContent=\"\";\n+ for (const row of rows) {\n+ for (const key in row) {\n+ csvContent+=`${row[key]},`\n+ }\n+ csvContent=csvContent.replace(/.$/,\"\")+\"\\n\"\n+ }\n+ fs.writeFileSync(filePath, csvContent);\n+ Console.log(\"export success!\")\n+ }\n+\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportOption.ts",
"new_path": "src/service/export/exportOption.ts",
"diff": "@@ -6,5 +6,5 @@ export class ExportOption {\n}\nexport enum ExportType {\n- excel = \"excel\", sql = \"sql\"\n+ excel = \"excel\", sql = \"sql\", csv = \"csv\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/mysqlExportService.ts",
"new_path": "src/service/export/mysqlExportService.ts",
"diff": "@@ -2,11 +2,11 @@ import { FieldInfo } from \"mysql2\";\nimport { Console } from \"../../common/Console\";\nimport { ConnectionManager } from \"../connectionManager\";\nimport { AbstractExportService } from \"./abstractExportService\";\n-import { ExportOption } from \"./exportOption\";\n+import { ExportOption, ExportType } from \"./exportOption\";\nexport class MysqlExportService extends AbstractExportService {\n- protected async exportExcel(exportOption: ExportOption) {\n+ protected async exportData(exportOption: ExportOption) {\nconst filePath = exportOption.exportPath\nconst sql = exportOption.sql\n@@ -16,7 +16,15 @@ export class MysqlExportService extends AbstractExportService {\nConsole.log(err)\nreturn;\n}\n+ switch (exportOption.type) {\n+ case ExportType.excel:\nsuper.exportByNodeXlsx(filePath, fields, rows);\n+ break;\n+ case ExportType.csv:\n+ super.exportToCsv(filePath, fields, rows);\n+ break;\n+ }\n+\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-form :model=\"exportOption\">\n<el-form-item label=\"Export File Type\">\n<el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n+ <el-radio v-model=\"exportOption.type\" label=\"csv\">Csv</el-radio>\n</el-form-item>\n<el-form-item label=\"With Out Limit\">\n<el-switch v-model=\"exportOption.withOutLimit\"></el-switch>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support export as csv
|
141,908
|
29.12.2020 11:21:37
| -28,800
|
459648122ef2abce8cb7c6975508dc80f8e79b2c
|
Support export data as sql
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -3,10 +3,11 @@ import { ExportService } from \"./exportService\";\nimport { FieldInfo } from \"mysql2\";\nimport * as fs from \"fs\";\nimport { Console } from \"../../common/Console\";\n-import { ExportOption, ExportType } from \"./exportOption\";\n+import { ExportContext, ExportType } from \"./exportContext\";\nexport abstract class AbstractExportService implements ExportService {\n- public export(exportOption: ExportOption): void {\n+\n+ public export(exportOption: ExportContext): void {\nconst randomFileName = `${new Date().getTime()}.${exportOption.type}`\nvscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'file': [exportOption.type] } }).then((filePath) => {\n@@ -21,10 +22,49 @@ export abstract class AbstractExportService implements ExportService {\n}\n- protected abstract exportData(exportOption: ExportOption): void;\n+ protected abstract exportData(exportOption: ExportContext): void;\n+\n+ protected delegateExport(context: ExportContext, rows: any, fields: FieldInfo[]) {\n+ const filePath = context.exportPath;\n+ Console.log(`start export data to ${context.type}...`)\n+ switch (context.type) {\n+ case ExportType.excel:\n+ this.exportByNodeXlsx(filePath, fields, rows);\n+ break;\n+ case ExportType.csv:\n+ this.exportToCsv(filePath, fields, rows);\n+ break;\n+ case ExportType.sql:\n+ this.exportToSql(context);\n+ break;\n+ }\n+ Console.log(`export ${context.type} success, path is ${context.exportPath}!`)\n+ }\n+\n+ private exportToSql(exportContext: ExportContext) {\n+\n+ const {rows,exportPath}=exportContext;\n+ if (rows.length == 0) {\n+ // show waraing\n+ return;\n+ }\n+\n+ let sql = ``;\n+ for (const row of rows) {\n+ let columns = \"\";\n+ let values = \"\";\n+ for (const key in row) {\n+ columns += `\\`${key}\\`,`\n+ values += `'${row[key]}',`\n+ }\n+ sql += `insert into ${exportContext.table}(${columns.replace(/.$/, '')}) values(${values.replace(/.$/, '')});\\n`\n+ }\n+ fs.writeFileSync(exportPath, sql);\n+\n+\n+ }\n- protected exportByNodeXlsx(filePath: string, fields: FieldInfo[], rows: any) {\n- Console.log(\"start export data to excel...\")\n+ private exportByNodeXlsx(filePath: string, fields: FieldInfo[], rows: any) {\nconst nodeXlsx = require('node-xlsx');\nfs.writeFileSync(filePath, nodeXlsx.build([{\nname: \"sheet1\",\n@@ -39,11 +79,9 @@ export abstract class AbstractExportService implements ExportService {\n})\n]\n}]), \"binary\");\n- Console.log(\"export success!\")\n}\n- protected exportToCsv(filePath: string, fields: FieldInfo[], rows: any) {\n- Console.log(\"start export data to csv...\")\n+ private exportToCsv(filePath: string, fields: FieldInfo[], rows: any) {\nlet csvContent = \"\";\nfor (const row of rows) {\nfor (const key in row) {\n@@ -52,7 +90,6 @@ export abstract class AbstractExportService implements ExportService {\ncsvContent = csvContent.replace(/.$/, \"\") + \"\\n\"\n}\nfs.writeFileSync(filePath, csvContent);\n- Console.log(\"export success!\")\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/export/exportContext.ts",
"diff": "+export class ExportContext {\n+ type: ExportType;\n+ withOutLimit: boolean;\n+ table:string;\n+ sql: string;\n+ exportPath: string;\n+ /**\n+ * fields, from intenel\n+ */\n+ fields: any[];\n+ /**\n+ * result,from intenel\n+ */\n+ rows:any;\n+}\n+\n+export enum ExportType {\n+ excel = \"excel\", sql = \"sql\", csv = \"csv\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/service/export/exportOption.ts",
"new_path": null,
"diff": "-export class ExportOption {\n- type: ExportType;\n- withOutLimit: boolean;\n- sql: string;\n- exportPath: string;\n-}\n-\n-export enum ExportType {\n- excel = \"excel\", sql = \"sql\", csv = \"csv\"\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportService.ts",
"new_path": "src/service/export/exportService.ts",
"diff": "-import { ExportOption } from \"./exportOption\";\n+import { ExportContext } from \"./exportContext\";\nexport interface ExportService {\n- export(exportOption:ExportOption): void;\n+ export(exportOption:ExportContext): void;\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/mysqlExportService.ts",
"new_path": "src/service/export/mysqlExportService.ts",
"diff": "@@ -2,13 +2,12 @@ import { FieldInfo } from \"mysql2\";\nimport { Console } from \"../../common/Console\";\nimport { ConnectionManager } from \"../connectionManager\";\nimport { AbstractExportService } from \"./abstractExportService\";\n-import { ExportOption, ExportType } from \"./exportOption\";\n+import { ExportContext, ExportType } from \"./exportContext\";\nexport class MysqlExportService extends AbstractExportService {\n- protected async exportData(exportOption: ExportOption) {\n+ protected async exportData(exportOption: ExportContext) {\n- const filePath = exportOption.exportPath\nconst sql = exportOption.sql\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nconnection.query(sql, (err, rows, fields?: FieldInfo[]) => {\n@@ -16,15 +15,9 @@ export class MysqlExportService extends AbstractExportService {\nConsole.log(err)\nreturn;\n}\n- switch (exportOption.type) {\n- case ExportType.excel:\n- super.exportByNodeXlsx(filePath, fields, rows);\n- break;\n- case ExportType.csv:\n- super.exportToCsv(filePath, fields, rows);\n- break;\n- }\n-\n+ exportOption.fields=fields;\n+ exportOption.rows=rows;\n+ super.delegateExport(exportOption,rows,fields)\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-form-item label=\"Export File Type\">\n<el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n<el-radio v-model=\"exportOption.type\" label=\"csv\">Csv</el-radio>\n+ <el-radio v-model=\"exportOption.type\" label=\"sql\">Sql</el-radio>\n</el-form-item>\n<el-form-item label=\"With Out Limit\">\n<el-switch v-model=\"exportOption.withOutLimit\"></el-switch>\n@@ -272,6 +273,7 @@ export default {\noption: {\n...this.exportOption,\nsql: this.result.sql,\n+ table:this.result.table\n},\n})\nthis.exportOption.visible = false\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support export data as sql
|
141,908
|
29.12.2020 11:59:56
| -28,800
|
6884021efc31181260fa30dfb3ab4156a656bf0d
|
Enhance UX/UI
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -4,19 +4,25 @@ import { FieldInfo } from \"mysql2\";\nimport * as fs from \"fs\";\nimport { Console } from \"../../common/Console\";\nimport { ExportContext, ExportType } from \"./exportContext\";\n+import { ProgressLocation } from \"vscode\";\nexport abstract class AbstractExportService implements ExportService {\n- public export(exportOption: ExportContext): void {\n- const randomFileName = `${new Date().getTime()}.${exportOption.type}`\n+ public export(context: ExportContext): void {\n+ const randomFileName = `${new Date().getTime()}.${context.type}`\n- vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'file': [exportOption.type] } }).then((filePath) => {\n+ vscode.window.showSaveDialog({ saveLabel: \"Select export file path\", defaultUri: vscode.Uri.file(randomFileName), filters: { 'file': [context.type] } }).then((filePath) => {\nif (filePath) {\n- exportOption.exportPath = filePath.fsPath;\n- if (exportOption.withOutLimit) {\n- exportOption.sql = exportOption.sql.replace(/\\blimit\\b.+/gi, \"\")\n+ context.exportPath = filePath.fsPath;\n+ if (context.withOutLimit) {\n+ context.sql = context.sql.replace(/\\blimit\\b.+/gi, \"\")\n}\n- this.exportData(exportOption)\n+ vscode.window.withProgress({ title: `Start exporting data to ${context.type}...`, location: ProgressLocation.Notification }, () => {\n+ return new Promise((resolve)=>{\n+ context.done=resolve\n+ this.exportData(context)\n+ })\n+ })\n}\n})\n}\n@@ -26,7 +32,6 @@ export abstract class AbstractExportService implements ExportService {\nprotected delegateExport(context: ExportContext, rows: any, fields: FieldInfo[]) {\nconst filePath = context.exportPath;\n- Console.log(`start export data to ${context.type}...`)\nswitch (context.type) {\ncase ExportType.excel:\nthis.exportByNodeXlsx(filePath, fields, rows);\n@@ -38,7 +43,13 @@ export abstract class AbstractExportService implements ExportService {\nthis.exportToSql(context);\nbreak;\n}\n- Console.log(`export ${context.type} success, path is ${context.exportPath}!`)\n+ context.done()\n+ vscode.window.showInformationMessage(`export ${context.type} success, path is ${context.exportPath}!`, 'Open').then(action => {\n+ if (action) {\n+ vscode.commands.executeCommand('vscode.open', vscode.Uri.file(context.exportPath));\n+ }\n+ })\n+\n}\nprivate exportToSql(exportContext: ExportContext) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportContext.ts",
"new_path": "src/service/export/exportContext.ts",
"diff": "@@ -5,13 +5,17 @@ export class ExportContext {\nsql: string;\nexportPath: string;\n/**\n- * fields, from intenel\n+ * intenel: fields\n*/\nfields: any[];\n/**\n- * result,from intenel\n+ * intenel: result\n*/\nrows:any;\n+ /**\n+ * intenel: trigger when export done\n+ */\n+ done: (value?: any) => void;\n}\nexport enum ExportType {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-button>\n<el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle :disabled=\"!selectRow\">\n</el-button>\n- <el-button @click=\"exportData()\" type=\"primary\" size=\"mini\" icon=\"el-icon-share\" circle title=\"Export\"></el-button>\n- <el-button type=\"danger\" size=\"mini\" icon=\"el-icon-caret-right\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n+ <el-button @click=\"exportData()\" 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\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n<div style=\"display:inline-block\">\n- <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"100\" :page-sizes=\"[100,200,300,400,500,1000]\" layout=\"prev,sizes, next, jumper\" :total=\"1000\">\n+ <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"100\" :page-sizes=\"[100,200,300,400,500,1000]\" :layout=\"page.total?'total,prev,sizes, next, jumper':'prev,sizes, next, jumper'\" :total=\"page.total\">\n</el-pagination>\n</div>\n</div>\n<el-radio v-model=\"exportOption.type\" label=\"csv\">Csv</el-radio>\n<el-radio v-model=\"exportOption.type\" label=\"sql\">Sql</el-radio>\n</el-form-item>\n- <el-form-item label=\"With Out Limit\">\n+ <el-form-item label=\"Remove Limit\">\n<el-switch v-model=\"exportOption.withOutLimit\"></el-switch>\n</el-form-item>\n</el-form>\n@@ -138,6 +138,7 @@ export default {\npage: {\npageNum: 1,\npageSize: -1,\n+ total:null\n},\ntable: {\nsearch: \"\",\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Enhance UX/UI
|
141,908
|
29.12.2020 13:26:05
| -28,800
|
faa84ed3425c5c6c43d9a28a7bf54d78f7ffe23a
|
Support show total
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -104,7 +104,7 @@ export class QueryPage {\nconst sql = params.sql\nconst connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\nQueryUnit.queryPromise(connection, sql).then((rows) => {\n- handler.emit('count', { data: rows })\n+ handler.emit('COUNT', { data: rows[0].count })\n})\n}).on(OperateType.export, (params) => {\nthis.exportService.export(params.option)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-button @click=\"exportData()\" 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\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n<div style=\"display:inline-block\">\n- <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @current-change=\"page=>changePage(page,true)\" @next-click=\"()=>changePage(1)\" @prev-click=\"()=>changePage(-1)\" :current-page.sync=\"page.pageNum\" :small=\"true\" :page-size=\"100\" :page-sizes=\"[100,200,300,400,500,1000]\" :layout=\"page.total?'total,prev,sizes, next, jumper':'prev,sizes, next, jumper'\" :total=\"page.total\">\n+ <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @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?'total,prev,sizes, next, jumper':'prev,sizes, next, jumper'\" :total=\"page.total\">\n</el-pagination>\n</div>\n</div>\n@@ -138,7 +138,7 @@ export default {\npage: {\npageNum: 1,\npageSize: -1,\n- total:null\n+ total: null,\n},\ntable: {\nsearch: \"\",\n@@ -233,6 +233,9 @@ export default {\nthis.result.data = response.data\nthis.toolbar.sql = response.sql\nbreak\n+ case \"COUNT\":\n+ this.page.total=parseInt(response.data)\n+ break\ncase \"DML\":\ncase \"DDL\":\nhandlerCommon(response)\n@@ -274,7 +277,7 @@ export default {\noption: {\n...this.exportOption,\nsql: this.result.sql,\n- table:this.result.table\n+ table: this.result.table,\n},\n})\nthis.exportOption.visible = false\n@@ -501,7 +504,7 @@ export default {\n},\ncount(sql) {\nthis.info.visible = false\n- let countSql = sql.replace(/select (.+?) from/i, \"SELECT count(*) FROM\").replace(/\\blimit\\b.+$/gi, \"\")\n+ let countSql = sql.replace(/select (.+?) from/i, \"SELECT count(*) count FROM\").replace(/\\blimit\\b.+$/gi, \"\")\nvscodeEvent.emit(\"count\", { sql: countSql })\n},\nexecute(sql) {\n@@ -580,6 +583,7 @@ export default {\n// reset page\nthis.page.pageNum = 1\nthis.page.pageSize = this.result.pageSize\n+ this.page.total=null\n// info\nif (this.info.needRefresh) {\nthis.info.visible = false\n"
},
{
"change_type": "RENAME",
"old_path": "src/vue/result/result.css",
"new_path": "src/vue/result/index.css",
"diff": ""
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show total
|
141,908
|
29.12.2020 13:38:37
| -28,800
|
6d67e24b1deb27bb95011c2b53f035ae90b0cb8b
|
Support export as json
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/export/abstractExportService.ts",
"new_path": "src/service/export/abstractExportService.ts",
"diff": "@@ -39,6 +39,9 @@ export abstract class AbstractExportService implements ExportService {\ncase ExportType.csv:\nthis.exportToCsv(filePath, fields, rows);\nbreak;\n+ case ExportType.json:\n+ this.exportToJson(context);\n+ break;\ncase ExportType.sql:\nthis.exportToSql(context);\nbreak;\n@@ -52,6 +55,10 @@ export abstract class AbstractExportService implements ExportService {\n}\n+ private exportToJson(context: ExportContext) {\n+ fs.writeFileSync(context.exportPath, JSON.stringify(context.rows,null,2));\n+ }\n+\nprivate exportToSql(exportContext: ExportContext) {\nconst { rows, exportPath } = exportContext;\n@@ -100,7 +107,7 @@ export abstract class AbstractExportService implements ExportService {\n}\ncsvContent = csvContent.replace(/.$/, \"\") + \"\\n\"\n}\n- fs.writeFileSync(filePath, csvContent);\n+ fs.writeFileSync(filePath, csvContent, { encoding: \"utf8\" });\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/export/exportContext.ts",
"new_path": "src/service/export/exportContext.ts",
"diff": "@@ -19,5 +19,5 @@ export class ExportContext {\n}\nexport enum ExportType {\n- excel = \"excel\", sql = \"sql\", csv = \"csv\"\n+ excel = \"xlsx\", sql = \"sql\", csv = \"csv\",json = \"json\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-dialog :title=\"'Export Option'\" :visible.sync=\"exportOption.visible\" width=\"30%\" top=\"3vh\" size=\"mini\">\n<el-form :model=\"exportOption\">\n<el-form-item label=\"Export File Type\">\n- <el-radio v-model=\"exportOption.type\" label=\"excel\">Excel</el-radio>\n- <el-radio v-model=\"exportOption.type\" label=\"csv\">Csv</el-radio>\n- <el-radio v-model=\"exportOption.type\" label=\"sql\">Sql</el-radio>\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=\"'Json'\" value=\"json\"></el-option>\n+ <el-option :label=\"'Csv'\" value=\"csv\"> </el-option>\n+ </el-select>\n</el-form-item>\n<el-form-item label=\"Remove Limit\">\n<el-switch v-model=\"exportOption.withOutLimit\"></el-switch>\n@@ -160,7 +163,7 @@ export default {\nexportOption: {\nvisible: false,\nloading: false,\n- type: \"excel\",\n+ type: \"xlsx\",\nwithOutLimit: true,\n},\ninfo: {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support export as json
|
141,908
|
30.12.2020 13:34:14
| -28,800
|
c082844a16db0d96d6999570c722eff653bc6d7f
|
Remeber pagesize
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -108,6 +108,8 @@ export class QueryPage {\n})\n}).on(OperateType.export, (params) => {\nthis.exportService.export(params.option)\n+ }).on('changePageSize', (pageSize) => {\n+ Global.updateConfig(ConfigKey.DEFAULT_LIMIT, pageSize)\n})\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-button @click=\"exportData()\" 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\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\n<div style=\"display:inline-block\">\n- <el-pagination @size-change=\"size=>{page.pageSize=size;changePage(0);}\" @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?'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,200,300,400,500,1000]\" :layout=\"page.total?'sizes,prev,pager, next, total, jumper':'sizes,prev, next, jumper'\" :total=\"page.total\">\n</el-pagination>\n</div>\n</div>\n@@ -319,6 +319,11 @@ export default {\nthis.execute(filterSql + \";\")\n},\n+ changePageSize(size){\n+ this.page.pageSize=size;\n+ vscodeEvent.emit(\"changePageSize\",size)\n+ this.changePage(0);\n+ },\nsort(row) {\nlet sortSql = this.result.sql\n.replace(/\\n/, \" \")\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Remeber pagesize
|
141,908
|
31.12.2020 11:29:52
| -28,800
|
4d7106d2ceb6bd0e9598c024b98a57fd26d093f0
|
Enhance update UX
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<el-button type=\"success\" size=\"mini\" icon=\"el-icon-s-help\" circle title=\"Count\" @click='count(toolbar.sql);'></el-button>\n<el-button type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\">\n</el-button>\n- <el-button @click=\"openEdit(toolbar.row)\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!selectRow\">\n+ <el-button @click=\"openEdit\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!toolbar.show\">\n</el-button>\n- <el-button @click.stop=\"openCopy(toolbar.row)\" type=\"info\" size=\"mini\" title=\"copy\" icon=\"el-icon-document-copy\" circle :disabled=\"!selectRow\">\n+ <el-button @click.stop=\"openCopy\" type=\"info\" size=\"mini\" title=\"copy\" icon=\"el-icon-document-copy\" circle :disabled=\"!toolbar.show\">\n</el-button>\n- <el-button @click=\"deleteConfirm(toolbar.row[result.primaryKey])\" title=\"delete\" type=\"danger\" size=\"mini\" icon=\"el-icon-delete\" circle :disabled=\"!selectRow\">\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=\"exportData()\" 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\" title=\"Execute Sql\" circle @click='info.visible = false;execute(toolbar.sql);'></el-button>\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 @select-all=\"toolbar.show=true\" :edit-config=\"{trigger: 'click', mode: 'cell',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=\"{ 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\" />\n<ux-table-column type=\"index\" width=\"40\" :seq-method=\"({row,rowIndex})=>(rowIndex||!row.isFilter)?rowIndex:undefined\" />\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=\"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=\"update.currentNew[scope.column.title]\" @keypress.enter.native=\"confirmUpdate\"></el-input>\n+ <el-input v-if=\"!scope.row.isFilter\" v-model=\"scope.row[scope.column.title]\" @keypress.enter.native=\"confirmUpdate(scope.row)\"></el-input>\n</template>\n</ux-table-column>\n</ux-grid>\n- <!-- talbe result -->\n+ <!-- table result -->\n<el-dialog ref=\"editDialog\" :title=\"editorTilte\" :visible.sync=\"editor.visible\" width=\"90%\" top=\"3vh\" size=\"mini\">\n<el-form ref=\"infoForm\" :model=\"update.currentNew\" :inline=\"true\">\n<el-form-item :prop=\"column.name\" :key=\"column.name\" v-for=\"column in result.columnList\" size=\"mini\">\n</el-form>\n<span slot=\"footer\" class=\"dialog-footer\">\n<el-button @click=\"editor.visible = false\">Cancel</el-button>\n- <el-button v-if=\"update.primary!=null\" type=\"primary\" :loading=\"editor.loading\" @click=\"confirmUpdate\">\n+ <el-button v-if=\"update.currentNew[result.primaryKey]!=null\" type=\"primary\" :loading=\"editor.loading\" @click=\"confirmUpdate(update.currentNew)\">\nUpdate</el-button>\n- <el-button v-if=\"update.primary==null\" type=\"primary\" :loading=\"editor.loading\" @click=\"confirmInsert\">\n+ <el-button v-if=\"update.currentNew[result.primaryKey]==null\" type=\"primary\" :loading=\"editor.loading\" @click=\"confirmInsert(update.currentNew)\">\nInsert</el-button>\n</span>\n</el-dialog>\n@@ -174,7 +174,7 @@ export default {\nneedRefresh: true,\n},\nupdate: {\n- current: {},\n+ current: null,\ncurrentNew: {},\nprimary: null,\n},\n@@ -215,6 +215,7 @@ export default {\nconsole.log(data)\nconst response = data.content\nthis.table.loading = false\n+ this.update.current = null\nif (response && response.costTime) {\nthis.toolbar.costTime = response.costTime\nvscodeEvent.emit(\"showCost\", { cost: this.toolbar.costTime })\n@@ -272,9 +273,6 @@ export default {\n})\n},\nmethods: {\n- output(obj) {\n- console.log(obj)\n- },\nconfirmExport() {\nvscodeEvent.emit(\"export\", {\noption: {\n@@ -320,9 +318,9 @@ export default {\nthis.execute(filterSql + \";\")\n},\nchangePageSize(size) {\n- this.page.pageSize=size;\n+ this.page.pageSize = size\nvscodeEvent.emit(\"changePageSize\", size)\n- this.changePage(0);\n+ this.changePage(0)\n},\nsort(row) {\nlet sortSql = this.result.sql\n@@ -394,16 +392,19 @@ export default {\nthis.$message(\"Not any input, update fail!\")\n}\n},\n- confirmUpdate() {\n+ confirmUpdate(row) {\nif (!this.result.primaryKey) {\nthis.$message.error(\"This table has not primary key, update fail!\")\nreturn\n}\n+ const currentNew = row ? row : this.update.currentNew\n+ const primary = this.update.current[this.result.primaryKey]\nlet change = \"\"\n- for (const key in this.update.currentNew) {\n+ console.log(\"update\")\n+ for (const key in currentNew) {\nif (this.getTypeByColumn(key) == null) continue\nconst oldEle = this.update.current[key]\n- const newEle = this.update.currentNew[key]\n+ const newEle = currentNew[key]\nif (oldEle !== newEle) {\nchange += `\\`${key}\\`=${this.wrapQuote(key, newEle)},`\n}\n@@ -411,59 +412,43 @@ export default {\nif (change) {\nconst updateSql = `UPDATE ${this.result.table} SET ${change.replace(/,$/, \"\")} WHERE ${\nthis.result.primaryKey\n- }=${this.wrapQuote(this.result.primaryKey, this.update.primary)}`\n+ }=${this.wrapQuote(this.result.primaryKey, primary)}`\nthis.execute(updateSql)\n} else {\nthis.$message(\"Not any change, update fail!\")\n}\n},\nupdateEdit(row, column, event) {\n- if (row.isFilter) {\n- return\n- }\n- if (column && column.type == \"checkbox\" && this.$refs.dataTable.getCheckboxRecords().length == 0) {\n- this.toolbar.row = {}\n+ if (row.isFilter || this.update.current) {\nreturn\n}\n- this.toolbar.row = row\n- this.update = {\n- current: row,\n- currentNew: this.clone(row),\n- primary: row[this.result.primaryKey],\n- }\n- if (this.result.data.length > 24 && column.type != \"checkbox\") {\n- // this.openEdit();\n- }\n+ this.update.current = { ...row }\n},\nopenEdit(row) {\nthis.editor.visible = true\n+ this.update.currentNew={...this.update.current}\n},\n- openCopy(row) {\n- this.updateEdit(row)\n+ openCopy() {\n+ this.update.currentNew={...this.update.current}\nthis.update.currentNew[this.result.primaryKey] = null\nthis.update.primary = null\nthis.editor.visible = true\n},\n- deleteConfirm(primaryValue) {\n+ deleteConfirm() {\nthis.$confirm(\"Are you sure you want to delete this data?\", \"Warning\", {\nconfirmButtonText: \"OK\",\ncancelButtonText: \"Cancel\",\ntype: \"warning\",\n})\n.then(() => {\n- let checkboxRecords = this.$refs.dataTable.getCheckboxRecords()\n- if (checkboxRecords.length > 0) {\n- checkboxRecords = checkboxRecords\n+ let checkboxRecords = this.$refs.dataTable\n+ .getCheckboxRecords()\n.filter((checkboxRecord) => checkboxRecord[this.result.primaryKey] != null)\n.map((checkboxRecord) => this.wrapQuote(this.result.primaryKey, checkboxRecord[this.result.primaryKey]))\n- }\nconst deleteSql =\n- checkboxRecords.length > 0\n+ checkboxRecords.length > 1\n? `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey} in (${checkboxRecords.join(\",\")})`\n- : `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey}=${this.wrapQuote(\n- this.result.primaryKey,\n- primaryValue\n- )}`\n+ : `DELETE FROM ${this.result.table} WHERE ${this.result.primaryKey}=${checkboxRecords[0]}`\nthis.execute(deleteSql)\n})\n.catch((e) => {\n@@ -601,8 +586,12 @@ export default {\n// loading\nthis.table.loading = false\n// toolbar\n+ this.toolbar.show = false\nthis.toolbar.row = {}\n},\n+ selectionChange(selection) {\n+ this.toolbar.show = this.result.primaryKey && selection.length > 0\n+ },\n// show call when change table\nreset() {\nthis.clear()\n@@ -626,7 +615,7 @@ export default {\nreturn Object.keys(this.result.data[0]).length\n},\neditorTilte() {\n- if (this.update.primary == null) {\n+ if (this.update.currentNew[this.result.primaryKey] == null) {\nreturn \"Insert To \" + this.result.table\n}\nreturn \"Edit For \" + this.result.table + \" : \" + this.result.primaryKey + \"=\" + this.update.primary\n@@ -634,9 +623,6 @@ export default {\nremainHeight() {\nreturn window.outerHeight - 250\n},\n- selectRow() {\n- return this.result.primaryKey && (this.toolbar.row[this.result.primaryKey] || this.toolbar.show)\n- },\n},\n}\n</script>\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Enhance update UX
|
141,908
|
31.12.2020 11:34:05
| -28,800
|
a4b6f3f204a77ca782d9ce0bce3209a51f2bdfc5
|
Remember connection info
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -64,6 +64,7 @@ export class QueryPage {\n}\n}\n+ const dbOption = ConnectionManager.getLastConnectionOption();\nViewManager.createWebviewPanel({\nsinglePage: true,\nsplitView: this.isActiveSql(),\n@@ -80,7 +81,6 @@ export class QueryPage {\nif (queryParam.res?.table) {\nhandler.panel.title = `${queryParam.res.table}@${queryParam.res.database}`\n}\n- queryParam.res.dbInfo = { ...ConnectionManager.getLastConnectionOption(), command: null, info: null }\nqueryParam.res.transId = Trans.transId;\nhandler.emit(queryParam.type, queryParam.res)\n}).on(\"showCost\", ({ cost }) => {\n@@ -93,17 +93,16 @@ export class QueryPage {\nif (!queryParam.singlePage) {\nthis.hodlder.set(params.sql.trim(), title)\n}\n- QueryUnit.runQuery(params.sql, params.dbInfo);\n+ QueryUnit.runQuery(params.sql, dbOption);\n}).on(OperateType.next, async (params) => {\nconst sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\n- const connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\n+ const connection = await ConnectionManager.getConnection(dbOption)\nQueryUnit.queryPromise(connection, sql).then((rows) => {\nhandler.emit(MessageType.NEXT_PAGE, { sql, data: rows })\n})\n}).on('count', async (params) => {\n- const sql = params.sql\n- const connection = await ConnectionManager.getConnection(ConnectionManager.getLastConnectionOption())\n- QueryUnit.queryPromise(connection, sql).then((rows) => {\n+ const connection = await ConnectionManager.getConnection(dbOption)\n+ QueryUnit.queryPromise(connection, params.sql).then((rows) => {\nhandler.emit('COUNT', { data: rows[0].count })\n})\n}).on(OperateType.export, (params) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -128,7 +128,6 @@ export default {\nname: \"App\",\ndata() {\nreturn {\n- dbInfo: {},\nresult: {\ndata: [],\nsql: \"\",\n@@ -182,9 +181,6 @@ export default {\n},\nmounted() {\nconst handlerData = (data, sameTable) => {\n- if (data.dbInfo) {\n- this.dbInfo = data.dbInfo\n- }\nthis.result = data\nthis.toolbar.sql = data.sql\n@@ -503,8 +499,7 @@ export default {\nexecute(sql) {\nif (!sql) return\nvscodeEvent.emit(\"execute\", {\n- sql: sql.replace(/ +/gi, \" \"),\n- dbInfo: this.dbInfo,\n+ sql: sql.replace(/ +/gi, \" \")\n})\nthis.table.loading = true\n},\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Remember connection info
|
141,908
|
31.12.2020 12:36:50
| -28,800
|
ce0a63fcb1092b47f3fd2a1aba5a20bfcfab5db0
|
Add require hint
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<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=\"scope.column.title\" placement=\"left-start\">\n- <span v-text=\"scope.column.title\">\n+ <span>\n+ <span v-if=\"result.columnList[index].nullable != 'YES'\" style=\"color: #f94e4e; position: relative; top: .2em;\">\n+ *\n+ </span>\n{{ scope.column.title }}\n</span>\n</el-tooltip>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add require hint
|
141,908
|
31.12.2020 13:34:07
| -28,800
|
cde8bfd35b1e2d717f796b0ef12016029381358a
|
Auto show count
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"integer\",\n\"default\": 100,\n\"description\": \"Default limit of query sql.\"\n+ },\n+ \"vscode-mysql.showTotal\": {\n+ \"type\": \"boolean\",\n+ \"default\": true,\n+ \"description\": \"Show total on result view.\"\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -27,6 +27,7 @@ export enum ConfigKey {\nENABLE_DELIMITER = \"enableDelimiter\",\nLOAD_META_ON_CONNECT = \"loadMetaOnConnect\",\nDEFAULT_LIMIT = \"defaultSelectLimit\",\n+ SHOW_TOTAL = \"showTotal\",\n}\nexport enum CommandKey {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -129,6 +129,11 @@ export class QueryPage {\nconst fields = queryParam.res.fields;\nconst conn = queryParam.connection;\nif (!fields || fields.length == 0) { return; }\n+\n+ let mark = {};\n+ for (const field of fields) {\n+ mark[field.orgTable] = true\n+ }\nconst tableName = fields[0].orgTable;\nconst database = fields[0].schema || fields[0].db;\nif (tableName == null || conn == null) { return; }\n@@ -144,6 +149,7 @@ export class QueryPage {\n});\nqueryParam.res.primaryKey = primaryKey;\nqueryParam.res.columnList = columnList;\n+ queryParam.res.tableCount = Object.keys(mark).length;\n}\nqueryParam.res.table = tableName;\nqueryParam.res.database = conn.database;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/queryResponse.ts",
"new_path": "src/view/result/queryResponse.ts",
"diff": "@@ -20,6 +20,7 @@ export class DataResponse {\npublic data: any[];\npublic fields: mysql.FieldInfo[];\npublic pageSize: number;\n+ public tableCount: number;\n}\nexport class ErrorResponse {\npublic sql: string;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-row>\n<div class=\"toolbar\">\n<el-input v-model=\"table.search\" size=\"mini\" placeholder=\"Input To Search Data\" style=\"width:200px\" :clearable=\"true\" />\n- <el-button type=\"success\" size=\"mini\" icon=\"el-icon-s-help\" circle title=\"Count\" @click='count(toolbar.sql);'></el-button>\n<el-button type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\">\n</el-button>\n<el-button @click=\"openEdit\" type=\"primary\" size=\"mini\" icon=\"el-icon-edit\" title=\"edit\" circle :disabled=\"!toolbar.show\">\n@@ -141,6 +140,7 @@ export default {\ncolumnList: null,\ndatabase: null,\ntable: null,\n+ tableCount: null,\npageSize: null,\n},\npage: {\n@@ -195,6 +195,9 @@ export default {\n} else {\nthis.reset()\n}\n+ if(this.result.tableCount==1){\n+ this.count()\n+ }\n}\nconst handlerCommon = (res) => {\nthis.editor.loading = false\n@@ -496,10 +499,10 @@ export default {\nthis.execute(this.result.sql)\n}\n},\n- count(sql) {\n+ count() {\n+ if(!this.result.table)return;\nthis.info.visible = false\n- let countSql = sql.replace(/select (.+?) from/i, \"SELECT count(*) count FROM\").replace(/\\blimit\\b.+$/gi, \"\")\n- vscodeEvent.emit(\"count\", { sql: countSql })\n+ vscodeEvent.emit(\"count\", { sql: `SELECT count(*) count FROM ${this.result.table}` })\n},\nexecute(sql) {\nif (!sql) return\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Auto show count
|
141,908
|
04.01.2021 10:42:05
| -28,800
|
138370eabb73e8d9a233af056e2999624fc77478
|
Show count when size is zero.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<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\" 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?'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,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>\n</div>\n</div>\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Show count when size is zero.
|
141,908
|
04.01.2021 10:56:39
| -28,800
|
94276022704acc09bf9695ee2e17af2f08c86dec
|
better result view
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "</el-tooltip>\n</template>\n<template slot-scope=\"scope\">\n- <el-input 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+ <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</el-input>\n<span v-if=\"!scope.row.isFilter\" v-html='dataformat(scope.row[scope.column.title])'></span>\n</template>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/umyui.css",
"new_path": "src/vue/result/umyui.css",
"diff": ".plx-body--column.col--edit,\n.plx-body--column.col--index,\n.plx-body--column.col--checkbox,\n-.plx-table .plx-table--border-line{\n+/* header */\n+.plx-table .plx-table--header-wrapper .plx-table--header-border-line{\nborder: 1px solid var(--vscode-textBlockQuote-background) !important;\n}\nborder: 1px solid var(--vscode-textBlockQuote-background) !important;\n}\n-.plx-table .plx-table--header-wrapper .plx-table--header-border-line {\n- border-bottom: 1px solid #7d8084 !important;\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+/* table edit input */\n.plx-body--column.col--actived input{\nborder-color: var(--vscode-editor-foreground) !important;\n}\n-.plx-header--column {\n- border-radius: 3px;\n- border: 1px solid #121820 !important;\n-}\n-\n.plx-table.border--full .plx-table--header-wrapper,\n.plx-table--body-wrapper {\nbackground: var(--vscode-editor-background) !important;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
better result view
|
141,908
|
04.01.2021 11:05:44
| -28,800
|
102ef0b80f22304bd9633cfe061c38c20e4dfa0d
|
Fix update fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -395,7 +395,7 @@ export default {\n}\n},\nupdateEdit(row, column, event) {\n- if (row.isFilter || this.update.current) {\n+ if (row.isFilter) {\nreturn\n}\nthis.update.current = { ...row }\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix update fail.
|
141,908
|
04.01.2021 11:09:02
| -28,800
|
e976dee282b456ccdae8a9cacb917dbc49b88d55
|
Update input border.
|
[
{
"change_type": "MODIFY",
"old_path": "public/theme/auto.css",
"new_path": "public/theme/auto.css",
"diff": "--input-color: var(--vscode-tab-activeForeground);\n--primary-color: var(--vscode-tab-activeForeground);\n--second-color: var(--vscode-input-placeholderForeground);\n- --border-color: var(--vscode-textBlockQuote-background);\n- --border-color: rgb(26, 25, 25);\n+ --border-color: var(--vscode-button-background);\n--bg-color: var(--vscode-editor-background);\n--second-bg-color: var(--vscode-editorSuggestWidget-background);\n}\n@@ -2590,7 +2589,7 @@ body {\n}\n.el-select:hover .el-input__inner {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-select .el-input__inner {\n@@ -6272,7 +6271,7 @@ body {\n}\n.el-slider__runway.disabled .el-slider__button {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-slider__runway.disabled .el-slider__button-wrapper.dragging, .el-slider__runway.disabled .el-slider__button-wrapper.hover, .el-slider__runway.disabled .el-slider__button-wrapper:hover {\n@@ -6473,7 +6472,7 @@ body {\n}\n.el-slider.is-vertical.el-slider--with-input .el-slider__input:hover .el-input-number__decrease, .el-slider.is-vertical.el-slider--with-input .el-slider__input:hover .el-input-number__increase {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-slider.is-vertical.el-slider--with-input .el-slider__input:active .el-input-number__decrease, .el-slider.is-vertical.el-slider--with-input .el-slider__input:active .el-input-number__increase {\n@@ -10445,12 +10444,12 @@ body {\n.el-step__head.is-process {\ncolor: var(--editor-color);;\n- border-color: var(--editor-color);\n+ border-color: var(--border-color);\n}\n.el-step__head.is-wait {\ncolor: var(--editor-color);\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-step__head.is-success {\n@@ -11610,7 +11609,7 @@ body {\n.el-cascader:not(.is-disabled):hover .el-input__inner {\ncursor: pointer;\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner {\n@@ -12239,7 +12238,7 @@ body {\n}\n.el-textarea__inner:hover {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-textarea__inner:focus {\n@@ -12391,7 +12390,7 @@ body {\n}\n.el-input__inner:hover {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-input.is-active .el-input__inner, .el-input__inner:focus {\n@@ -14236,7 +14235,7 @@ body {\n.el-checkbox__input.is-disabled .el-checkbox__inner::after {\ncursor: not-allowed;\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-checkbox__input.is-disabled .el-checkbox__inner + .el-checkbox__label {\n@@ -14249,7 +14248,7 @@ body {\n}\n.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner {\n@@ -14259,7 +14258,7 @@ body {\n.el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner::before {\nbackground-color: var(--editor-color);\n- border-color: var(--editor-color)\n+ border-color: var(--border-color)\n}\n.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update input border.
|
141,908
|
04.01.2021 11:41:57
| -28,800
|
3257b6459335811391317ec0c7916c93e171af2e
|
Support view comment
|
[
{
"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=\"scope.column.title\" placement=\"left-start\">\n+ <el-tooltip class=\"item\" effect=\"dark\" :content=\"result.columnList[index].comment?result.columnList[index].comment:scope.column.title\" placement=\"left-start\">\n<span>\n<span v-if=\"result.columnList[index].nullable != 'YES'\" style=\"color: #f94e4e; position: relative; top: .2em;\">\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/view.css",
"new_path": "src/vue/result/view.css",
"diff": "@@ -38,6 +38,10 @@ body {\n/* umyui */\n+.plx-header--column.col--ellipsis>.plx-cell .plx-cell--title{\n+font-weight: 400;\n+}\n+\n.plx-cell .el-input input{\npadding: 10px;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support view comment
|
141,908
|
04.01.2021 11:54:30
| -28,800
|
bd1663e8b3d05776b820fffd8e5b2255066be870
|
Update new panel title
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -54,10 +54,10 @@ export class QueryPage {\n}\n- let title = queryParam.singlePage ? \"Query\" : \"Query\" + new Date().getTime();\n+ let type = queryParam.singlePage ? \"Query\" : \"Query\" + new Date().getTime();\nconst olderTitle = this.hodlder.get(queryParam.res.sql);\nif (olderTitle) {\n- title = olderTitle\n+ type = olderTitle\nqueryParam.singlePage = false\nif (queryParam.type == MessageType.DATA) {\nthis.hodlder.delete(queryParam.res.sql)\n@@ -68,7 +68,7 @@ export class QueryPage {\nViewManager.createWebviewPanel({\nsinglePage: true,\nsplitView: this.isActiveSql(),\n- path: 'result', title,\n+ path: 'result', title:'Query', type,\niconPath: Global.getExtPath(\"resources\", \"icon\", \"query.svg\"),\neventHandler: async (handler) => {\nhandler.panel.onDidChangeViewState(e => {\n@@ -91,7 +91,7 @@ export class QueryPage {\nthis.statusBar.show()\n}).on(OperateType.execute, (params) => {\nif (!queryParam.singlePage) {\n- this.hodlder.set(params.sql.trim(), title)\n+ this.hodlder.set(params.sql.trim(), type)\n}\nQueryUnit.runQuery(params.sql, dbOption);\n}).on(OperateType.next, async (params) => {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/viewManager.ts",
"new_path": "src/view/viewManager.ts",
"diff": "@@ -9,6 +9,7 @@ export class ViewOption {\npublic iconPath?: string;\npublic path: string;\npublic title: string;\n+ public type?: string;\npublic splitView: boolean = false;\n/**\n* keep single page by viewType\n@@ -61,11 +62,14 @@ export class ViewManager {\nif (typeof (viewOption.singlePage) == 'undefined') { viewOption.singlePage = true }\nif (typeof (viewOption.killHidden) == 'undefined') { viewOption.killHidden = true }\n+ if(!viewOption.type){\n+ viewOption.type=viewOption.title\n+ }\nif (!viewOption.singlePage) {\n- viewOption.title = viewOption.title + new Date().getTime()\n+ viewOption.type = viewOption.type + new Date().getTime()\n}\n- const currentStatus = this.viewStatu[viewOption.title]\n+ const currentStatus = this.viewStatu[viewOption.type]\nif (viewOption.singlePage && currentStatus) {\nif (viewOption.killHidden && currentStatus.instance?.visible == false) {\ncurrentStatus.instance.dispose()\n@@ -79,7 +83,7 @@ export class ViewManager {\n}\n}\nconst webviewPanel = vscode.window.createWebviewPanel(\n- viewOption.title,\n+ viewOption.type,\nviewOption.title,\n{\nviewColumn: viewOption.splitView ? vscode.ViewColumn.Two : vscode.ViewColumn.One,\n@@ -88,7 +92,7 @@ export class ViewManager {\n{ enableScripts: true, retainContextWhenHidden: true },\n);\nconst newStatus = { creating: true, instance: webviewPanel, eventEmitter: new EventEmitter() }\n- this.viewStatu[viewOption.title] = newStatus\n+ this.viewStatu[viewOption.type] = newStatus\nconst targetPath = `${this.webviewPath}/${viewOption.path}.html`;\nfs.readFile(targetPath, 'utf8', async (err, data) => {\nif (err) {\n@@ -106,7 +110,7 @@ export class ViewManager {\nwebviewPanel.webview.html = this.buildPath(data, webviewPanel.webview, contextPath);\nwebviewPanel.onDidDispose(() => {\n- this.viewStatu[viewOption.title] = null\n+ this.viewStatu[viewOption.type] = null\n})\nif (viewOption.eventHandler) {\nviewOption.eventHandler(new Hanlder(webviewPanel, newStatus.eventEmitter))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/umyui.css",
"new_path": "src/vue/result/umyui.css",
"diff": "border-color: var(--vscode-editor-foreground) !important;\n}\n+.col--gutter,\n.plx-table.border--full .plx-table--header-wrapper,\n.plx-table--body-wrapper {\nbackground: var(--vscode-editor-background) !important;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update new panel title
|
141,908
|
04.01.2021 15:14:54
| -28,800
|
2e8fd8dd3a0b97d573328f5b540056359fa85777
|
Add i18n of chinese.
|
[
{
"change_type": "MODIFY",
"old_path": "CHANGELOG.md",
"new_path": "CHANGELOG.md",
"diff": "- Better result view border color.\n- Remember page size.\n- Fix sql formatter could not be detect comment correctly.\n+- Add i18n of chinese.\n# 2.9.0 2020/12/31\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -91,4 +91,3 @@ OpenSetting -> extensions -> Mysql\n- Sync table struct from diffrent connection.\n- Better Intetllisense sql.\n-- Add i18n.\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "i18n.js",
"diff": "+const p=require('./package.json')\n+const content={}\n+for (const command of p.contributes.commands) {\n+ const key = command.command.replace(\"mysql\", 'command');\n+ content[key]=command.title;\n+ command.title=`%${key}%`\n+}\n+console.log(JSON.stringify(content))\n+console.log('--------------------------------------------')\n+console.log(JSON.stringify(p.contributes.commands))\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"commands\": [\n{\n\"command\": \"mysql.history.open\",\n- \"title\": \"Open History\",\n+ \"title\": \"%command.history.open%\",\n\"category\": \"MySQL\",\n\"icon\": \"resources/icon/history.svg\"\n},\n{\n\"command\": \"mysql.setting.open\",\n- \"title\": \"Open Setting\",\n+ \"title\": \"%command.setting.open%\",\n\"category\": \"MySQL\",\n\"icon\": \"resources/icon/settings.svg\"\n},\n{\n\"command\": \"mysql.refresh\",\n- \"title\": \"Refresh\",\n+ \"title\": \"%command.refresh%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/refresh.svg\",\n},\n{\n\"command\": \"mysql.host.copy\",\n- \"title\": \"Copy Host\",\n+ \"title\": \"%command.host.copy%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.name.copy\",\n- \"title\": \"Copy Name\",\n+ \"title\": \"%command.name.copy%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.diagram.add\",\n- \"title\": \"Create Diagram\",\n+ \"title\": \"%command.diagram.add%\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n\"dark\": \"resources/dark/add.svg\"\n},\n{\n\"command\": \"mysql.query.add\",\n- \"title\": \"Create Query\",\n+ \"title\": \"%command.query.add%\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n\"dark\": \"resources/dark/add.svg\"\n},\n{\n\"command\": \"mysql.query.rename\",\n- \"title\": \"Rename Query\",\n+ \"title\": \"%command.query.rename%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.diagram.open\",\n- \"title\": \"Open Diagram\",\n+ \"title\": \"%command.diagram.open%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.diagram.drop\",\n- \"title\": \"Drop Diagram\",\n+ \"title\": \"%command.diagram.drop%\",\n\"category\": \"MySQL\",\n\"icon\": \"resources/icon/criss-cross.svg\"\n},\n{\n\"command\": \"mysql.connection.add\",\n- \"title\": \"Add Connection\",\n+ \"title\": \"%command.connection.add%\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n\"dark\": \"resources/dark/add.svg\"\n},\n{\n\"command\": \"mysql.connection.edit\",\n- \"title\": \"Edit Connection\",\n+ \"title\": \"%command.connection.edit%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.server.info\",\n- \"title\": \"Server Status\",\n+ \"title\": \"%command.server.info%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.connection.delete\",\n- \"title\": \"Delete Connection\",\n+ \"title\": \"%command.connection.delete%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.database.add\",\n- \"title\": \"New Database\",\n+ \"title\": \"%command.database.add%\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n\"dark\": \"resources/dark/add.svg\"\n},\n{\n\"command\": \"mysql.db.overview\",\n- \"title\": \"Overview\",\n+ \"title\": \"%command.db.overview%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.db.drop\",\n- \"title\": \"Drop Database\",\n+ \"title\": \"%command.db.drop%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.runQuery\",\n- \"title\": \"Run MySQL Query\",\n+ \"title\": \"%command.runQuery%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/run.png\",\n},\n{\n\"command\": \"mysql.query.switch\",\n- \"title\": \"Open Query\",\n+ \"title\": \"%command.query.switch%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/query.svg\",\n},\n{\n\"command\": \"mysql.template.sql\",\n- \"title\": \"Select SQL\",\n+ \"title\": \"%command.template.sql%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.template.delete\",\n- \"title\": \"Delete SQL\",\n+ \"title\": \"%command.template.delete%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.data.import\",\n- \"title\": \"Import Sql\",\n+ \"title\": \"%command.data.import%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.data.export\",\n- \"title\": \"Export Data\",\n+ \"title\": \"%command.data.export%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.struct.export\",\n- \"title\": \"Export Struct\",\n+ \"title\": \"%command.struct.export%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.copy.insert\",\n- \"title\": \"Insert SQL\",\n+ \"title\": \"%command.copy.insert%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.copy.update\",\n- \"title\": \"Update SQL\",\n+ \"title\": \"%command.copy.update%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.db.active\",\n- \"title\": \"Change Active Database\",\n+ \"title\": \"%command.db.active%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.table.truncate\",\n- \"title\": \"Truncate Table\",\n+ \"title\": \"%command.table.truncate%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.db.truncate\",\n- \"title\": \"Truncate Database\",\n+ \"title\": \"%command.db.truncate%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.table.drop\",\n- \"title\": \"Drop table\",\n+ \"title\": \"%command.table.drop%\",\n\"category\": \"MySQL\",\n\"icon\": \"resources/icon/criss-cross.svg\"\n},\n{\n\"command\": \"mysql.mock.run\",\n- \"title\": \"Start Generate\",\n+ \"title\": \"%command.mock.run%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/run.png\",\n},\n{\n\"command\": \"mysql.mock.table\",\n- \"title\": \"Generate Mock Data\",\n+ \"title\": \"%command.mock.table%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.changeTableName\",\n- \"title\": \"Change Name\",\n+ \"title\": \"%command.changeTableName%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/edit.svg\",\n},\n{\n\"command\": \"mysql.index.template\",\n- \"title\": \"Index Manage\",\n+ \"title\": \"%command.index.template%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.column.changeName\",\n- \"title\": \"Change Column Name\",\n+ \"title\": \"%command.column.changeName%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/edit.svg\",\n},\n{\n\"command\": \"mysql.column.add\",\n- \"title\": \"Add Column\",\n+ \"title\": \"%command.column.add%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.column.up\",\n- \"title\": \"Move Column Up\",\n+ \"title\": \"%command.column.up%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/up.png\",\n},\n{\n\"command\": \"mysql.column.down\",\n- \"title\": \"Move Column Down\",\n+ \"title\": \"%command.column.down%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/down.png\",\n},\n{\n\"command\": \"mysql.table.source\",\n- \"title\": \"Show Table Source\",\n+ \"title\": \"%command.table.source%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.view.source\",\n- \"title\": \"Show View Source\",\n+ \"title\": \"%command.view.source%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.count.sql\",\n- \"title\": \"Show Count\",\n+ \"title\": \"%command.count.sql%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.table.show\",\n- \"title\": \"Open In New Panel\",\n+ \"title\": \"%command.table.show%\",\n\"category\": \"MySQL\",\n\"icon\": \"resources/icon/analysis.svg\"\n},\n{\n\"command\": \"mysql.column.update\",\n- \"title\": \"Modify Column\",\n+ \"title\": \"%command.column.update%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.column.drop\",\n- \"title\": \"Drop column\",\n+ \"title\": \"%command.column.drop%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.template.table\",\n- \"title\": \"Create New Table\",\n+ \"title\": \"%command.template.table%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.template.view\",\n- \"title\": \"Create New View\",\n+ \"title\": \"%command.template.view%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.template.procedure\",\n- \"title\": \"Create New Procedure\",\n+ \"title\": \"%command.template.procedure%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.template.trigger\",\n- \"title\": \"Create New Trigger\",\n+ \"title\": \"%command.template.trigger%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.template.function\",\n- \"title\": \"Create New Function\",\n+ \"title\": \"%command.template.function%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.template.user\",\n- \"title\": \"Create New User\",\n+ \"title\": \"%command.template.user%\",\n\"category\": \"MySQL\",\n\"icon\": {\n\"light\": \"resources/light/add.svg\",\n},\n{\n\"command\": \"mysql.delete.user\",\n- \"title\": \"Drop User\",\n+ \"title\": \"%command.delete.user%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.user.grant\",\n- \"title\": \"Grant Privileges\",\n+ \"title\": \"%command.user.grant%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.change.user\",\n- \"title\": \"Change User Password\",\n+ \"title\": \"%command.change.user%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.delete.view\",\n- \"title\": \"Drop View\",\n+ \"title\": \"%command.delete.view%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.delete.procedure\",\n- \"title\": \"Drop Procedure\",\n+ \"title\": \"%command.delete.procedure%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.delete.function\",\n- \"title\": \"Drop Function\",\n+ \"title\": \"%command.delete.function%\",\n\"category\": \"MySQL\"\n},\n{\n\"command\": \"mysql.delete.trigger\",\n- \"title\": \"Drop Trigger\",\n+ \"title\": \"%command.delete.trigger%\",\n\"category\": \"MySQL\"\n}\n],\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "package.nls.json",
"diff": "+{\n+ \"command.history.open\": \"Open History\",\n+ \"command.setting.open\": \"Open Setting\",\n+ \"command.refresh\": \"Refresh\",\n+ \"command.host.copy\": \"Copy Host\",\n+ \"command.name.copy\": \"Copy Name\",\n+ \"command.diagram.add\": \"Create Diagram\",\n+ \"command.query.add\": \"Create Query\",\n+ \"command.query.rename\": \"Rename Query\",\n+ \"command.diagram.open\": \"Open Diagram\",\n+ \"command.diagram.drop\": \"Drop Diagram\",\n+ \"command.connection.add\": \"Add Connection\",\n+ \"command.connection.edit\": \"Edit Connection\",\n+ \"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.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+ \"command.table.drop\": \"Drop table\",\n+ \"command.mock.run\": \"Start Generate\",\n+ \"command.mock.table\": \"Generate Mock Data\",\n+ \"command.changeTableName\": \"Change Name\",\n+ \"command.index.template\": \"Index Manage\",\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+ \"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+ \"command.template.table\": \"Create New Table\",\n+ \"command.template.view\": \"Create New View\",\n+ \"command.template.procedure\": \"Create New Procedure\",\n+ \"command.template.trigger\": \"Create New Trigger\",\n+ \"command.template.function\": \"Create New Function\",\n+ \"command.template.user\": \"Create New User\",\n+ \"command.delete.user\": \"Drop User\",\n+ \"command.user.grant\": \"Grant Privileges\",\n+ \"command.change.user\": \"Change User Password\",\n+ \"command.delete.view\": \"Drop View\",\n+ \"command.delete.procedure\": \"Drop Procedure\",\n+ \"command.delete.function\": \"Drop Function\",\n+ \"command.delete.trigger\": \"Drop Trigger\"\n+}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add i18n of chinese.
|
141,908
|
04.01.2021 16:02:34
| -28,800
|
7c6847290d71f24e45c2647f3db9ab65760af8cd
|
Init donate button
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "import { extname, basename } from \"path\";\n-import { StatusBarAlignment, StatusBarItem, window } from \"vscode\";\n+import { env, StatusBarAlignment, StatusBarItem, Uri, window } from \"vscode\";\nimport { MessageType, OperateType, ConfigKey } from \"../../common/constants\";\nimport { Node } from \"../../model/interface/node\";\nimport { ColumnNode } from \"../../model/other/columnNode\";\n@@ -109,6 +109,8 @@ export class QueryPage {\nthis.exportService.export(params.option)\n}).on('changePageSize', (pageSize) => {\nGlobal.updateConfig(ConfigKey.DEFAULT_LIMIT, pageSize)\n+ }).on('openCoffee', () => {\n+ env.openExternal(Uri.parse('https://www.buymeacoffee.com/cweijan'));\n})\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "<div id=\"app\">\n<div class=\"hint\">\n<el-row>\n- <el-col :span=\"16\">\n+ <el-col :span=\"18\">\n<el-input type=\"textarea\" :autosize=\"{ minRows:3, maxRows:5}\" v-model=\"toolbar.sql\" style=\"width:100%\">\n</el-input>\n</el-col>\n</el-row>\n<div class=\"toolbar\">\n+ <el-button size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n+ <el-button size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n+ <el-button 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 type=\"info\" title=\"Insert new row\" icon=\"el-icon-circle-plus-outline\" size=\"mini\" circle @click=\"insertRequest\">\n</el-button>\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>\n</div>\n+ <el-button size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n+ <el-button size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n+ <el-button size=\"mini\" icon=\"el-icon-loading\" title=\"Buy the author a cup of coffee\" circle @click='openCoffee'></el-button>\n</div>\n<div v-if=\"info.visible \">\n<div v-if=\"info.error\" class=\"info-panel\" style=\"color:red !important\" v-html=\"info.message\"></div>\n@@ -252,6 +258,9 @@ export default {\n})\n},\nmethods: {\n+ openCoffee(){\n+ vscodeEvent.emit(\"openCoffee\")\n+ },\nconfirmExport(exportOption) {\nvscodeEvent.emit(\"export\", {\noption: {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init donate button
|
141,908
|
05.01.2021 11:33:42
| -28,800
|
c854f90ab1968be29e08be31871339985bb5e3d5
|
Support chose ssh cipher
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/sshConfig.ts",
"new_path": "src/model/interface/sshConfig.ts",
"diff": "@@ -10,5 +10,9 @@ export interface SSHConfig {\nprivateKeyPath?: string;\nprivateKey?: Buffer;\npassphrase?: string;\n+ algorithms?: Algorithms;\n}\n+export interface Algorithms {\n+ cipher?: string[];\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/connect/abstractConnectService.ts",
"new_path": "src/view/connect/abstractConnectService.ts",
"diff": "@@ -19,6 +19,9 @@ export abstract class AbstractConnectService {\nnode = { ...connectionNode, isGlobal: connectionNode.global !== false }\nif (node.ssh) {\nnode.ssh.tunnelPort = null\n+ if(!node.ssh.algorithms){\n+ node.ssh.algorithms={ cipher:[] }\n+ }\n}\n}\nViewManager.createWebviewPanel({\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<!-- CONNECTION NAME -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-name\">Connection Name</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-name\"\n- placeholder=\"The name of connection, it can be empty\"\n- v-model=\"connectionOption.name\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-name\" placeholder=\"The name of connection, it can be empty\" v-model=\"connectionOption.name\" />\n</section>\n<!-- HOST -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-host\">Host</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-host\"\n- placeholder=\"The host of connection\"\n- required\n- v-model=\"connectionOption.host\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-host\" placeholder=\"The host of connection\" required v-model=\"connectionOption.host\" />\n</section>\n<!-- PORT -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-port\">Port</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-port\"\n- placeholder=\"The port of connection\"\n- required\n- type=\"number\"\n- v-model=\"connectionOption.port\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-port\" placeholder=\"The port of connection\" required type=\"number\" v-model=\"connectionOption.port\" />\n</section>\n<!-- USER -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-user\">Username</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-user\"\n- placeholder=\"Username\"\n- required\n- v-model=\"connectionOption.user\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-user\" placeholder=\"Username\" required v-model=\"connectionOption.user\" />\n</section>\n<!-- PASSWORD -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-password\">Password</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-password\"\n- placeholder=\"Password\"\n- type=\"password\"\n- v-model=\"connectionOption.password\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-password\" placeholder=\"Password\" type=\"password\" v-model=\"connectionOption.password\" />\n</section>\n<!-- DATABASES -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"databases\">Databases</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"databases\"\n- placeholder=\"Default is all databases\"\n- v-model=\"connectionOption.database\"\n- />\n+ <input class=\"w-full field__input\" id=\"databases\" placeholder=\"Default is all databases\" v-model=\"connectionOption.database\" />\n</section>\n<!-- EXCLUDED DATABASES -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"excluded-databases\">Excluded Databases</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"excluded-databases\"\n- placeholder=\"Databases to excluded\"\n- v-model=\"connectionOption.excludeDatabases\"\n- />\n+ <input class=\"w-full field__input\" id=\"excluded-databases\" placeholder=\"Databases to excluded\" v-model=\"connectionOption.excludeDatabases\" />\n</section>\n<!-- TIMEZONE -->\n<!-- SSH HOST -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-host\">SSH Host</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-host\"\n- placeholder=\"SSH Host\"\n- required\n- v-model=\"connectionOption.ssh.host\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-host\" placeholder=\"SSH Host\" required v-model=\"connectionOption.ssh.host\" />\n</section>\n<!-- SSH PORT -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-port\">SSH Port</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-port\"\n- placeholder=\"SSH Port\"\n- required\n- type=\"number\"\n- v-model=\"connectionOption.ssh.port\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-port\" placeholder=\"SSH Port\" required type=\"number\" v-model=\"connectionOption.ssh.port\" />\n</section>\n<!-- SSH USERNAME -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-username\">SSH Username</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-username\"\n- placeholder=\"SSH Username\"\n- required\n- v-model=\"connectionOption.ssh.username\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-username\" placeholder=\"SSH Username\" required v-model=\"connectionOption.ssh.username\" />\n+ </section>\n+\n+ <!-- SSH CIPHER -->\n+ <section class=\"mb-2\">\n+ <label class=\"block font-bold\" for=\"connection-ssh-username\">SSH Cipher</label>\n+ <el-select v-model=\"connectionOption.ssh.algorithms.cipher[0]\" placeholder=\"Default\">\n+ <el-option value=\"aes128-cbc\">aes128-cbc</el-option>\n+ <el-option value=\"aes192-cbc\">aes192-cbc</el-option>\n+ <el-option value=\"aes256-cbc\">aes256-cbc</el-option>\n+ <el-option value=\"3des-cbc\">3des-cbc</el-option>\n+ <el-option value=\"aes128-ctr\">aes128-ctr</el-option>\n+ <el-option value=\"aes192-ctr\">aes192-ctr</el-option>\n+ <el-option value=\"aes256-ctr\">aes256-ctr</el-option>\n+ </el-select>\n</section>\n<!-- SELECT SSH PASSWORD TYPE -->\n<!-- SSH PASSWORD -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-password\">Password</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-password\"\n- placeholder=\"Password\"\n- required\n- type=\"password\"\n- v-model=\"connectionOption.ssh.password\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-password\" placeholder=\"Password\" required type=\"password\" v-model=\"connectionOption.ssh.password\" />\n</section>\n</div>\n<div v-else>\n<!-- SSH PRIVATE KEY PATH -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-private-key-path\">Private Key Path</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-private-key-path\"\n- placeholder=\"Private Key Path\"\n- v-model=\"connectionOption.ssh.privateKeyPath\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-private-key-path\" placeholder=\"Private Key Path\" v-model=\"connectionOption.ssh.privateKeyPath\" />\n</section>\n<!-- SSH PASSPHRASE -->\n<section class=\"mb-2\">\n<label class=\"block font-bold\" for=\"connection-ssh-passphrase\">Passphrase</label>\n- <input\n- class=\"w-full field__input\"\n- id=\"connection-ssh-passphrase\"\n- placeholder=\"Passphrase\"\n- type=\"passphrase\"\n- v-model=\"connectionOption.ssh.passphrase\"\n- />\n+ <input class=\"w-full field__input\" id=\"connection-ssh-passphrase\" placeholder=\"Passphrase\" type=\"passphrase\" v-model=\"connectionOption.ssh.passphrase\" />\n</section>\n</div>\n</div>\n@@ -224,6 +161,9 @@ export default {\nhost: \"\",\nport: 22,\nusername: \"root\",\n+ algorithms: {\n+ cipher: [],\n+ },\n},\n},\ntype: \"password\",\n@@ -243,7 +183,7 @@ export default {\nthis.errorMessage = err\n})\nvscodeEvent.emit(\"route-\" + this.$route.name)\n- window.onkeydown=e=>{\n+ window.onkeydown = (e) => {\nif (e.key == \"Enter\" && e.target.tagName == \"INPUT\") {\nthis.tryConnect()\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support chose ssh cipher
|
141,908
|
05.01.2021 14:31:46
| -28,800
|
ed92ab68456a1f8491acc5a69e1435fa202980a9
|
Update null column render.
|
[
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -520,7 +520,7 @@ export default {\n},\ndataformat(origin) {\nif (origin == undefined || origin == null) {\n- return \"<b>(NULL)</b>\"\n+ return \"<span class='null-column'>(NULL)</span>\"\n}\nconst preFormat = this.dataformat0(origin)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/umyui.css",
"new_path": "src/vue/result/umyui.css",
"diff": "border: none !important;\n}\n+.null-column{\n+ color: #666;\n+ font-weight: 400;\n+}\n+\n/* table edit input */\n.plx-body--column.col--actived input{\nborder-color: var(--vscode-editor-foreground) !important;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update null column render.
|
141,908
|
05.01.2021 15:20:43
| -28,800
|
048001a3ace1c2576e43c5b0b4f7ec44a3b2dfea
|
Init db type.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -46,6 +46,23 @@ export enum Confirm {\nYES = \"YES\", NO = \"NO\"\n}\n+export enum DatabaseType{\n+ MYSQL=\"mysql\",\n+ /**\n+ * https://www.npmjs.com/package/pg pg-hstore\n+ */\n+ PG=\"postgresql\",ORACLE=\"oracle\",\n+ /**\n+ * https://www.npmjs.com/package/mssql\n+ * https://www.npmjs.com/package/tedious\n+ */\n+ MSSQL=\"SqlServer\",\n+ /**\n+ * https://www.npmjs.com/package/sqlite3\n+ */\n+ SQLite=\"SQLite\"\n+}\n+\nexport enum ModelType {\nCONNECTION = \"connection\", DATABASE = \"database\", USER_GROUP = \"userGroup\", USER = \"user\",\nTABLE = \"table\", COLUMN = \"column\", INFO = \"info\", TABLE_GROUP = \"tableGroup\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "+import { DatabaseType } from \"@/common/constants\";\nimport * as vscode from \"vscode\";\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\nimport { SSHConfig } from \"./sshConfig\";\n@@ -18,6 +19,7 @@ export abstract class Node extends vscode.TreeItem {\npublic global?: boolean;\npublic usingSSH?: boolean;\npublic ssh?: SSHConfig;\n+ public dbType?: DatabaseType;\nconstructor(id: string) {\nsuper(id)\n@@ -34,6 +36,7 @@ export abstract class Node extends vscode.TreeItem {\nthis.ssh = source.ssh\nthis.usingSSH = source.usingSSH\nthis.global = source.global\n+ this.dbType=source.dbType\nthis.includeDatabases = source.includeDatabases\nthis.excludeDatabases = source.excludeDatabases\nthis.collapsibleState = DatabaseCache.getElementState(this)\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init db type.
|
141,908
|
05.01.2021 15:24:42
| -28,800
|
4c2de22f4f863f90d02028d1b8376629db7061f3
|
Fix posible null point.
|
[
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -130,7 +130,11 @@ export class QueryPage {\nprivate static async loadColumnList(queryParam: QueryParam<DataResponse>) {\nconst fields = queryParam.res.fields;\nconst conn = queryParam.connection;\n- if (!fields || fields.length == 0) { return; }\n+ if (!fields || fields.length == 0) {\n+ // fix null point on result view\n+ queryParam.res.columnList = []\n+ return;\n+ }\nlet mark = {};\nfor (const field of fields) {\n"
},
{
"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].comment?result.columnList[index].comment:scope.column.title\" placement=\"left-start\">\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<span>\n- <span v-if=\"result.columnList[index].nullable != 'YES'\" style=\"color: #f94e4e; position: relative; top: .2em;\">\n+ <span v-if=\"result.columnList[index]&& (result.columnList[index].nullable != 'YES')\" style=\"color: #f94e4e; position: relative; top: .2em;\">\n*\n</span>\n{{ scope.column.title }}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix posible null point.
|
141,908
|
05.01.2021 21:24:10
| -28,800
|
36bb5528d21e0c8148201a4b4053dc3451d2ae66
|
Adding dialect
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -23,6 +23,7 @@ export class ConnectionNode extends Node implements CopyAble {\nconstructor(readonly id: string, readonly parent: Node) {\nsuper(id)\nthis.init(parent)\n+ this.cacheSelf()\nthis.id=this.getConnectId()\nif (parent.name) {\nthis.label = `${parent.name}_${this.id}`\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -28,6 +28,7 @@ export class DatabaseNode extends Node implements CopyAble {\nthis.id = `${parent.getConnectId()}_${name}`\nthis.parent = NodeUtil.of({ ...parent, database: name } as Node)\nthis.init(this.parent)\n+ this.cacheSelf()\nconst lcp = ConnectionManager.getLastConnectionOption(false);\nif (lcp && lcp.getConnectId() == this.getConnectId() && lcp.database == this.database) {\nthis.iconPath = path.join(Constants.RES_PATH, \"icon/database-active.svg\");\n@@ -42,7 +43,8 @@ export class DatabaseNode extends Node implements CopyAble {\nnew DiagramGroup(this),\nnew ProcedureGroup(this),\nnew FunctionGroup(this),\n- new TriggerGroup(this)];\n+ new TriggerGroup(this)\n+ ];\n}\npublic openOverview() {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "import { DatabaseType } from \"@/common/constants\";\n+import { Util } from \"@/common/util\";\nimport { getDialect, SqlDialect } from \"@/service/dialect/sqlDialect\";\nimport * as vscode from \"vscode\";\nimport { DatabaseCache } from \"../../service/common/databaseCache\";\n@@ -47,6 +48,14 @@ export abstract class Node extends vscode.TreeItem {\nthis.collapsibleState = DatabaseCache.getElementState(this)\n}\n+ private static nodeCache = {};\n+ public cacheSelf(){\n+ Node.nodeCache[this.getConnectId()]=this;\n+ }\n+ public getCache(){\n+ return Node.nodeCache[this.getConnectId()]\n+ }\n+\npublic getChildren(isRresh?: boolean): Node[] | Promise<Node[]> {\nreturn []\n}\n@@ -62,8 +71,17 @@ export abstract class Node extends vscode.TreeItem {\nreturn `${prefix}_${this.host}_${this.port}_${this.user}`;\n}\n+\npublic getHost(): string { return this.usingSSH ? this.ssh.host : this.host }\npublic getPort(): number { return this.usingSSH ? this.ssh.port : this.port }\npublic getUser(): string { return this.usingSSH ? this.ssh.username : this.user }\n+\n+ protected wrap(origin: string){\n+ if(this.dbType==DatabaseType.MYSQL){\n+ return Util.wrap(origin)\n+ }\n+ return origin;\n+ }\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/functionGroup.ts",
"new_path": "src/model/main/functionGroup.ts",
"diff": "@@ -24,7 +24,7 @@ export class FunctionGroup extends Node {\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${this.database}' and ROUTINE_TYPE='FUNCTION'`)\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), this.dialect.showFunctions(this.database))\n.then((tables) => {\ntableNodes = tables.map<FunctionNode>((table) => {\nreturn new FunctionNode(table.ROUTINE_NAME, this);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedureGroup.ts",
"new_path": "src/model/main/procedureGroup.ts",
"diff": "@@ -24,7 +24,7 @@ export class ProcedureGroup extends Node {\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${this.database}' and ROUTINE_TYPE='PROCEDURE'`)\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), this.dialect.showProcedures(this.database))\n.then((tables) => {\ntableNodes = tables.map<Node>((table) => {\nreturn new ProcedureNode(table.ROUTINE_NAME, this);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -58,7 +58,7 @@ export class TableNode extends Node implements CopyAble {\npublic addColumnTemplate() {\nConnectionManager.getConnection(this, true);\nQueryUnit.showSQLTextDocument(`ALTER TABLE\n- ${Util.wrap(this.database)}.${Util.wrap(this.table)}\n+ ${this.wrap(this.database)}.${this.wrap(this.table)}\nADD\nCOLUMN [column] [type] NOT NULL comment '';`, Template.alter);\n}\n@@ -110,8 +110,8 @@ ADD\npublic indexTemplate() {\nConnectionManager.getConnection(this, true);\n- QueryUnit.showSQLTextDocument(`-- ALTER TABLE ${Util.wrap(this.database)}.${Util.wrap(this.table)} DROP INDEX [indexName];\n--- ALTER TABLE ${Util.wrap(this.database)}.${Util.wrap(this.table)} ADD [UNIQUE|INDEX|PRIMARY KEY] ([columns]);`, Template.alter);\n+ QueryUnit.showSQLTextDocument(`-- ALTER TABLE ${this.wrap(this.database)}.${this.wrap(this.table)} DROP INDEX [indexName];\n+-- ALTER TABLE ${this.wrap(this.database)}.${this.wrap(this.table)} ADD [UNIQUE|INDEX|PRIMARY KEY] ([columns]);`, Template.alter);\nsetTimeout(() => {\nQueryUnit.runQuery(`SELECT COLUMN_NAME name,table_schema,index_name,non_unique FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema='${this.database}' and table_name='${this.table}';`, this);\n}, 10);\n@@ -119,8 +119,9 @@ ADD\n}\npublic async openInNew() {\n- const pageSize = Global.getConfig(ConfigKey.DEFAULT_LIMIT);\n- const sql = `SELECT * FROM ${Util.wrap(this.database)}.${Util.wrap(this.table)} LIMIT ${pageSize};`;\n+ const pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\n+ const sql = this.dialect.buildPageSql(this.wrap(this.database),this.wrap(this.table),pageSize);\n+\nconst connection = await ConnectionManager.getConnection(this);\nconst executeTime = new Date().getTime();\nconnection.query(sql, (err: Error, data, fields) => {\n@@ -131,11 +132,12 @@ ADD\n}\npublic async countSql() {\n- QueryUnit.runQuery(`SELECT count(*) FROM ${Util.wrap(this.database)}.${Util.wrap(this.table)};`, this);\n+ QueryUnit.runQuery(`SELECT count(*) FROM ${this.wrap(this.database)}.${this.wrap(this.table)};`, this);\n}\npublic async selectSqlTemplate(run: boolean) {\n- const sql = `SELECT * FROM ${Util.wrap(this.database)}.${Util.wrap(this.table)} LIMIT ${Global.getConfig(ConfigKey.DEFAULT_LIMIT)};`;\n+ const pageSize = Global.getConfig<number>(ConfigKey.DEFAULT_LIMIT);\n+ const sql = this.dialect.buildPageSql(this.wrap(this.database),this.wrap(this.table),pageSize);\nif (run) {\nQueryUnit.runQuery(sql, this);\n@@ -150,9 +152,9 @@ ADD\nthis\n.getChildren()\n.then((children: Node[]) => {\n- const childrenNames = children.map((child: any) => \"\\n \" + Util.wrap(child.column.name));\n+ const childrenNames = children.map((child: any) => \"\\n \" + this.wrap(child.column.name));\nconst childrenValues = children.map((child: any) => \"\\n $\" + child.column.name);\n- let sql = `insert into \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} `;\n+ let sql = `insert into \\n ${this.wrap(this.database)}.${this.wrap(this.table)} `;\nsql += `(${childrenNames.toString().replace(/,/g, \", \")}\\n )\\n`;\nsql += \"values\\n \";\nsql += `(${childrenValues.toString().replace(/,/g, \", \")}\\n );`;\n@@ -170,9 +172,9 @@ ADD\n.then((children: Node[]) => {\nconst keysNames = children.filter((child: any) => child.column.key).map((child: any) => child.column.name);\n- const where = keysNames.map((name: string) => `${Util.wrap(name)} = \\$${name}`);\n+ const where = keysNames.map((name: string) => `${this.wrap(name)} = \\$${name}`);\n- let sql = `delete from \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\n`;\n+ let sql = `delete from \\n ${this.wrap(this.database)}.${this.wrap(this.table)} \\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and\")}`;\nQueryUnit.showSQLTextDocument(sql, Template.table);\n});\n@@ -188,7 +190,7 @@ ADD\nconst sets = childrenNames.map((name: string) => `${name} = ${name}`);\nconst where = keysNames.map((name: string) => `${name} = '${name}'`);\n- let sql = `update \\n ${Util.wrap(this.database)}.${Util.wrap(this.table)} \\nset \\n ${sets.toString().replace(/,/g, \",\\n \")}\\n`;\n+ let sql = `update \\n ${this.wrap(this.database)}.${this.wrap(this.table)} \\nset \\n ${sets.toString().replace(/,/g, \",\\n \")}\\n`;\nsql += `where \\n ${where.toString().replace(/,/g, \"\\n and \")}`;\nQueryUnit.showSQLTextDocument(sql, Template.table);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/triggerGroup.ts",
"new_path": "src/model/main/triggerGroup.ts",
"diff": "@@ -25,7 +25,7 @@ export class TriggerGroup extends Node {\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${this.database}'`)\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), this.dialect.showTriggers(this.database))\n.then((tables) => {\ntableNodes = tables.map<TriggerNode>((table) => {\nreturn new TriggerNode(table.TRIGGER_NAME, this);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -26,7 +26,7 @@ export class ViewGroup extends Node {\nreturn tableNodes;\n}\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this),\n- `SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${this.database}' LIMIT ${QueryUnit.maxTableCount}`)\n+ this.dialect.showViews(this.database))\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\nreturn new ViewNode(table.TABLE_NAME, '', this);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -4,20 +4,7 @@ import { IConnection, queryCallback } from \"./connection\";\nexport class MSSqlConnnection implements IConnection {\nprivate con: Connection;\n- constructor(opt: Node) {\n- this.con = new Connection({\n- server: opt.host,\n- options: {\n- },\n- authentication: {\n- type: \"default\",\n- options: {\n- userName: opt.user,\n- password: opt.password,\n- }\n- }\n- });\n- }\n+ constructor(private opt: Node) { }\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\nquery(sql: any, values?: any, callback?: any) {\n@@ -26,11 +13,18 @@ export class MSSqlConnnection implements IConnection {\n}\nlet fields = null;\nlet datas = [];\n+ this.init()\n+ this.con.on(\"connect\",err=>{\n+ if(err){\n+ callback(err)\n+ return;\n+ }\nthis.con.execSql(new Request(sql, err => {\nif (err) {\ncallback(err, null)\n} else {\ncallback(null, datas, fields)\n+ this.end()\n}\n}).on('row', columns => {\nif (!fields) {\n@@ -48,11 +42,28 @@ export class MSSqlConnnection implements IConnection {\n});\ndatas.push(temp)\n}))\n+ })\n}\nconnect(callback: (err: Error) => void): void {\n- this.con.connect(callback)\n+ callback(null)\n+ }\n+ init(){\n+ const opt=this.opt;\n+ this.con = new Connection({\n+ server: opt.host,\n+ options: {\n+ },\n+ authentication: {\n+ type: \"default\",\n+ options: {\n+ userName: opt.user,\n+ password: opt.password,\n+ }\n+ }\n+ });\n}\nbeginTransaction(callback: (err: Error) => void): void {\n+ this.init()\nthis.con.beginTransaction(callback)\n}\nrollback(): void {\n@@ -64,9 +75,11 @@ export class MSSqlConnnection implements IConnection {\nend(): void {\nthis.con.close()\n}\n+ /**\n+ * Always create new connections\n+ */\nisAlive(): boolean {\n- const temp = this.con as any;\n- return temp.loggedIn && !temp.closed;\n+ return false;\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": "@@ -135,8 +135,8 @@ export class ConnectionManager {\n}\nif (host != null && port != null && user != null) {\nconst node = NodeUtil.of({ host, port: parseInt(port), user, database,dbType });\n- if (this.getActiveConnectByKey(node.getConnectId())) {\n- return node;\n+ if (node.getCache()) {\n+ return node.getCache();\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "import { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect implements SqlDialect {\n+ showTriggers(database: string): string {\n+ throw new Error(\"Unimplments!\")\n+ // return `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n+ }\n+ showProcedures(database: string): string {\n+ return `SELECT ROUTINE_NAME FROM information_schema.routines WHERE SPECIFIC_CATALOG = '${database}' and ROUTINE_TYPE='PROCEDURE'`;\n+ }\n+ showFunctions(database: string): string {\n+ return `SELECT ROUTINE_NAME FROM information_schema.routines WHERE SPECIFIC_CATALOG = '${database}' and ROUTINE_TYPE='FUNCTION'`;\n+ }\n+ showViews(database: string): string {\n+ return `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_CATALOG = '${database}' `;\n+ }\n+ buildPageSql(database: string, table: string, pageSize: number): string {\n+ return `SELECT TOP ${pageSize} * FROM ${database}.${table};`;\n+ }\nshowTables(database: string): string {\n- return `SELECT TABLE_NAME tableName FROM [${database}].INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE'`\n+ return `SELECT TABLE_NAME tableName FROM master.INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_CATALOG='${database}'`\n}\nshowDatabases(): string {\nreturn \"SELECT name 'Database' FROM master.sys.databases\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -2,6 +2,21 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect implements SqlDialect{\n+ showTriggers(database: string): string {\n+ return `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n+ }\n+ showProcedures(database: string): string {\n+ return `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${database}' and ROUTINE_TYPE='PROCEDURE'`;\n+ }\n+ showFunctions(database: string): string {\n+ return `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${database}' and ROUTINE_TYPE='FUNCTION'`;\n+ }\n+ showViews(database: string): string {\n+ return `SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${database}' LIMIT ${QueryUnit.maxTableCount}`;\n+ }\n+ buildPageSql(database: string, table: string, pageSize: number):string {\n+ return `SELECT * FROM ${database}.${table} LIMIT ${pageSize};`;\n+ }\nshowTables(database: string): string {\nreturn `SELECT table_comment comment,TABLE_NAME tableName FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -5,6 +5,11 @@ import { MysqlDialect } from \"./mysqlDialect\";\nexport interface SqlDialect {\nshowDatabases(): string;\nshowTables(database:string): string;\n+ showViews(database:string): string;\n+ showTriggers(database:string): string;\n+ showProcedures(database:string): string;\n+ showFunctions(database:string): string;\n+ buildPageSql(database:string,table:string,pageSize:number):string;\n}\nexport function getDialect(dbType: DatabaseType): SqlDialect {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -64,10 +64,10 @@ export class QueryUnit {\nreturn;\n}\n- const sqlList: string[] = sql.match(/(?:[^;\"']+|[\"'][^\"']*[\"'])+/g)?.filter((s) => (s.trim() != '' && s.trim() != ';'))\n- if (sqlList.length == 0 && sql.match(this.selectPattern) && !sql.match(/\\blimit\\b/i) && !sql.match(/;\\s*$/) && !sql.match(/[count|sum|min|max]\\(/i)) {\n- sql += ` LIMIT ${Global.getConfig(ConfigKey.DEFAULT_LIMIT)}`;\n- }\n+ // const sqlList: string[] = sql.match(/(?:[^;\"']+|[\"'][^\"']*[\"'])+/g)?.filter((s) => (s.trim() != '' && s.trim() != ';'))\n+ // if (sqlList?.length == 0 && sql.match(this.selectPattern) && !sql.match(/\\blimit\\b/i) && !sql.match(/;\\s*$/) && !sql.match(/[count|sum|min|max]\\(/i)) {\n+ // sql += ` LIMIT ${Global.getConfig(ConfigKey.DEFAULT_LIMIT)}`;\n+ // }\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -128,14 +128,13 @@ export class QueryPage {\n}\nprivate static async loadColumnList(queryParam: QueryParam<DataResponse>) {\n+ // fix null point on result view\n+ queryParam.res.columnList = []\nconst fields = queryParam.res.fields;\nconst conn = queryParam.connection;\nif (!fields || fields.length == 0) {\n- // fix null point on result view\n- queryParam.res.columnList = []\nreturn;\n}\n-\nlet mark = {};\nfor (const field of fields) {\nmark[field.orgTable] = true\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adding dialect
|
141,908
|
06.01.2021 00:10:03
| -28,800
|
1b5d023b810acbc0e5a1dad28dc9282819902dbc
|
Adding dialect...
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -38,7 +38,7 @@ export class TableNode extends Node implements CopyAble {\nif (columnNodes && !isRresh && this.collapsibleState != vscode.TreeItemCollapsibleState.Expanded) {\nreturn columnNodes;\n}\n- return QueryUnit.queryPromise<ColumnMeta[]>(await ConnectionManager.getConnection(this), `SELECT COLUMN_NAME name,DATA_TYPE simpleType,COLUMN_TYPE type,COLUMN_COMMENT comment,COLUMN_KEY \\`key\\`,IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH maxLength,COLUMN_DEFAULT defaultValue,EXTRA extra FROM information_schema.columns WHERE table_schema = '${this.database}' AND table_name = '${this.table}' ORDER BY ORDINAL_POSITION;`)\n+ return QueryUnit.queryPromise<ColumnMeta[]>(await ConnectionManager.getConnection(this), this.dialect.showColumns(this.database,this.table))\n.then((columns) => {\ncolumnNodes = columns.map<ColumnNode>((column, index) => {\nif (column && column.key == \"PRI\") {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -52,6 +52,9 @@ export class MSSqlConnnection implements IConnection {\nthis.con = new Connection({\nserver: opt.host,\noptions: {\n+ database:opt.database,\n+ connectTimeout:10000,\n+ requestTimeout:10000,\n},\nauthentication: {\ntype: \"default\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "import { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect implements SqlDialect {\n+ showColumns(database: string,table:string): string {\n+ return `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_CATALOG = '${database}' AND table_name = '${table}' ORDER BY ORDINAL_POSITION;`;\n+ }\nshowTriggers(database: string): string {\n- throw new Error(\"Unimplments!\")\n- // return `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n+ // throw new Error(\"Unimplments!\")\n+ // https://stackoverflow.com/questions/4305691/need-to-list-all-triggers-in-sql-server-database-with-table-name-and-tables-sch\n+ return `SELECT OBJECT_NAME(parent_id) as Table_Name, * FROM [${database}].sys.triggers`;\n}\nshowProcedures(database: string): string {\nreturn `SELECT ROUTINE_NAME FROM information_schema.routines WHERE SPECIFIC_CATALOG = '${database}' and ROUTINE_TYPE='PROCEDURE'`;\n@@ -15,7 +19,7 @@ export class MssqlDIalect implements SqlDialect {\nreturn `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_CATALOG = '${database}' `;\n}\nbuildPageSql(database: string, table: string, pageSize: number): string {\n- return `SELECT TOP ${pageSize} * FROM ${database}.${table};`;\n+ return `SELECT TOP ${pageSize} * FROM ${table};`;\n}\nshowTables(database: string): string {\nreturn `SELECT TABLE_NAME tableName FROM master.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": "@@ -2,6 +2,9 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect implements SqlDialect{\n+ showColumns(database: string,table:string): string {\n+ return `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+ }\nshowTriggers(database: string): string {\nreturn `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -5,6 +5,7 @@ import { MysqlDialect } from \"./mysqlDialect\";\nexport interface SqlDialect {\nshowDatabases(): string;\nshowTables(database:string): string;\n+ showColumns(database:string,table:string): string;\nshowViews(database:string): string;\nshowTriggers(database:string): string;\nshowProcedures(database:string): string;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/page/mssqlPageService.ts",
"diff": "+import { AbstractPageSerivce } from \"./pageService\";\n+\n+export class MssqlPageService extends AbstractPageSerivce{\n+ protected buildPageSql(sql: string, start: number, limit: number): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/page/pageService.ts",
"new_path": "src/service/page/pageService.ts",
"diff": "+import { DatabaseType } from \"@/common/constants\";\n+import { MssqlPageService } from \"./mssqlPageService\";\n+import { MysqlPageSerivce } from \"./mysqlPageSerivce\";\nexport interface PageService {\n/**\n@@ -10,6 +13,16 @@ export interface PageService {\nbuild(sql: string, page: number, pageSize: number): string;\n}\n+export function getPageService(databaseType: DatabaseType):PageService {\n+\n+ switch (databaseType) {\n+ case DatabaseType.MSSQL:\n+ return new MssqlPageService();\n+ }\n+\n+ return new MysqlPageSerivce();\n+}\n+\nexport abstract class AbstractPageSerivce implements PageService {\npublic build(sql: string, page: number, pageSize: number): string {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -8,7 +8,7 @@ import { ConnectionManager } from \"../../service/connectionManager\";\nimport { ExportService } from \"../../service/export/exportService\";\nimport { MysqlExportService } from \"../../service/export/mysqlExportService\";\nimport { MysqlPageSerivce } from \"../../service/page/mysqlPageSerivce\";\n-import { PageService } from \"../../service/page/pageService\";\n+import { getPageService, PageService } from \"../../service/page/pageService\";\nimport { QueryUnit } from \"../../service/queryUnit\";\nimport { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\n@@ -29,7 +29,6 @@ export class QueryParam<T> {\nexport class QueryPage {\nprivate static exportService: ExportService = new MysqlExportService()\n- private static pageService: PageService = new MysqlPageSerivce()\nprivate 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@@ -95,7 +94,7 @@ export class QueryPage {\n}\nQueryUnit.runQuery(params.sql, dbOption);\n}).on(OperateType.next, async (params) => {\n- const sql = this.pageService.build(params.sql, params.pageNum, params.pageSize)\n+ const sql = getPageService(dbOption.dbType).build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(dbOption)\nQueryUnit.queryPromise(connection, sql).then((rows) => {\nhandler.emit(MessageType.NEXT_PAGE, { sql, data: rows })\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adding dialect...
|
141,908
|
06.01.2021 01:52:42
| -28,800
|
9e1ca9ba5881f1e7922ad81627dcbef4c153df6a
|
Fix init fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/page/pageService.ts",
"new_path": "src/service/page/pageService.ts",
"diff": "@@ -11,16 +11,7 @@ export interface PageService {\n* @return paginationSql\n*/\nbuild(sql: string, page: number, pageSize: number): string;\n-}\n-\n-export function getPageService(databaseType: DatabaseType):PageService {\n-\n- switch (databaseType) {\n- case DatabaseType.MSSQL:\n- return new MssqlPageService();\n- }\n- return new MysqlPageSerivce();\n}\nexport abstract class AbstractPageSerivce implements PageService {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/serviceManager.ts",
"new_path": "src/service/serviceManager.ts",
"diff": "@@ -9,7 +9,6 @@ import { ViewManager } from \"../view/viewManager\";\nimport { AbstractConnectService } from \"../view/connect/abstractConnectService\";\nimport { MysqlConnectService } from \"../view/connect/mysqlConnectService\";\nimport { DatabaseCache } from \"./common/databaseCache\";\n-import { DatabaseType } from \"./common/databaseType\";\nimport { AbstractDumpService } from \"./dump/abstractDumpService\";\nimport { MysqlDumpService } from \"./dump/mysqlDumpService\";\nimport { MockRunner } from \"./mock/mockRunner\";\n@@ -22,6 +21,10 @@ import { Global } from \"../common/global\";\nimport { ImportService } from \"./import/importService\";\nimport { MysqlImportService } from \"./import/mysqlImportService\";\nimport { OverviewService } from \"../view/overview/overviewService\";\n+import { MssqlPageService } from \"./page/mssqlPageService\";\n+import { MysqlPageSerivce } from \"./page/mysqlPageSerivce\";\n+import { PageService } from \"./page/pageService\";\n+import { DatabaseType } from \"@/common/constants\";\nexport class ServiceManager {\n@@ -35,7 +38,7 @@ export class ServiceManager {\npublic statusService: StatusService;\npublic importService: ImportService;\npublic dumpService: AbstractDumpService;\n- private type: DatabaseType = DatabaseType.mysql;\n+ private type: DatabaseType = DatabaseType.MYSQL;\nprivate isInit = false;\nconstructor(private readonly context: ExtensionContext) {\n@@ -56,7 +59,7 @@ export class ServiceManager {\n]\nswitch (this.type) {\n- case DatabaseType.mysql:\n+ case DatabaseType.MYSQL:\nthis.initMysqlService();\nbreak;\n}\n@@ -91,4 +94,14 @@ export class ServiceManager {\nthis.importService = new MysqlImportService();\n}\n+ public static getPageService(databaseType: DatabaseType): PageService {\n+\n+ switch (databaseType) {\n+ case DatabaseType.MSSQL:\n+ return new MssqlPageService();\n+ }\n+\n+ return new MysqlPageSerivce();\n+ }\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -8,13 +8,14 @@ import { ConnectionManager } from \"../../service/connectionManager\";\nimport { ExportService } from \"../../service/export/exportService\";\nimport { MysqlExportService } from \"../../service/export/mysqlExportService\";\nimport { MysqlPageSerivce } from \"../../service/page/mysqlPageSerivce\";\n-import { getPageService, PageService } from \"../../service/page/pageService\";\n+import { PageService } from \"../../service/page/pageService\";\nimport { QueryUnit } from \"../../service/queryUnit\";\nimport { ViewManager } from \"../viewManager\";\nimport { DataResponse } from \"./queryResponse\";\nimport { Global } from \"../../common/global\";\nimport { NodeUtil } from \"@/model/nodeUtil\";\nimport { Trans } from \"~/common/trans\";\n+import { ServiceManager } from \"@/service/serviceManager\";\nexport class QueryParam<T> {\n/**\n@@ -94,7 +95,7 @@ export class QueryPage {\n}\nQueryUnit.runQuery(params.sql, dbOption);\n}).on(OperateType.next, async (params) => {\n- const sql = getPageService(dbOption.dbType).build(params.sql, params.pageNum, params.pageSize)\n+ const sql = ServiceManager.getPageService(dbOption.dbType).build(params.sql, params.pageNum, params.pageSize)\nconst connection = await ConnectionManager.getConnection(dbOption)\nQueryUnit.queryPromise(connection, sql).then((rows) => {\nhandler.emit(MessageType.NEXT_PAGE, { sql, data: rows })\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix init fail.
|
141,908
|
06.01.2021 11:21:16
| -28,800
|
5ab88499873fd3452bdc2582b143bc56730d8d48
|
Fix column load fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -78,7 +78,7 @@ export abstract class Node extends vscode.TreeItem {\nprotected wrap(origin: string){\n- if(this.dbType==DatabaseType.MYSQL){\n+ if(this.dbType==DatabaseType.MYSQL || this.dbType==null){\nreturn Util.wrap(origin)\n}\nreturn origin;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/mssqlConnection.ts",
"new_path": "src/service/connect/mssqlConnection.ts",
"diff": "@@ -11,7 +11,7 @@ export class MSSqlConnnection implements IConnection {\nif (!callback && values instanceof Function) {\ncallback = values;\n}\n- let fields = null;\n+ let fields = [];\nlet datas = [];\nthis.init()\nthis.con.on(\"connect\", err => {\n@@ -26,18 +26,16 @@ export class MSSqlConnnection implements IConnection {\ncallback(null, datas, fields)\nthis.end()\n}\n- }).on('row', columns => {\n- if (!fields) {\n- fields = [];\n- columns.forEach(function (column) {\n+ }).on('columnMetadata', (columns) => {\n+ columns.forEach((column) => {\nfields.push({\n- name: column.metadata.colName,\n- orgTable: ((column.metadata) as any).tableName\n+ name: column.colName,\n+ orgTable: ((column) as any).tableName\n})\n});\n- }\n+ }).on('row', columns => {\nlet temp = {};\n- columns.forEach(function (column) {\n+ columns.forEach((column) => {\ntemp[column.metadata.colName] = column.value\n});\ndatas.push(temp)\n@@ -52,7 +50,7 @@ export class MSSqlConnnection implements IConnection {\nthis.con = new Connection({\nserver: opt.host,\noptions: {\n- database:opt.database,\n+ database: opt.database || undefined,\nconnectTimeout: 10000,\nrequestTimeout: 10000,\n},\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix column load fail.
|
141,908
|
06.01.2021 11:30:29
| -28,800
|
d9b7f3acb419f0ff90fac4d44352e7acffd98851
|
Fix query file name.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -86,7 +86,7 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async newQuery() {\nconst key = `${this.getConnectId()}`;\n- await FileManager.show(`${this.dbType}_${key}.sql`);\n+ await FileManager.show(`${key}.sql`);\nconst dbNameList = DatabaseCache.getDatabaseListOfConnection(key).filter((databaseNode) => !(databaseNode instanceof UserGroup)).map((databaseNode) => databaseNode.database);\nlet dbName;\nif (dbNameList.length == 1) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/databaseNode.ts",
"new_path": "src/model/database/databaseNode.ts",
"diff": "@@ -87,7 +87,7 @@ export class DatabaseNode extends Node implements CopyAble {\npublic async newQuery() {\n- FileManager.show(`${this.dbType}_${this.id}.sql`)\n+ FileManager.show(`${this.id}.sql`)\nConnectionManager.getConnection(this, true);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/query/queryNode.ts",
"new_path": "src/model/query/queryNode.ts",
"diff": "@@ -38,7 +38,7 @@ export class QueryNode extends Node {\n}\nprivate getFilePath(newName?: string): string {\n- return `${FileManager.storagePath}/query/${this.dbType}_${this.getConnectId()}_${this.database}/${newName || this.name}.sql`;\n+ return `${FileManager.storagePath}/query/${this.getConnectId()}_${this.database}/${newName || this.name}.sql`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -122,7 +122,7 @@ export class ConnectionManager {\nif (fileName.includes('cweijan.vscode-mysql-client2')) {\nconst queryName = path.basename(fileName, path.extname(fileName))\nconst filePattern = queryName.replace(/#.+$/,'').split('_');\n- const [dbType,mode, host, port, user] = filePattern\n+ const [mode, host, port, user] = filePattern\nlet database: string;\nif (filePattern.length >= 5) {\ndatabase = filePattern[4]\n@@ -134,7 +134,7 @@ export class ConnectionManager {\n}\n}\nif (host != null && port != null && user != null) {\n- const node = NodeUtil.of({ host, port: parseInt(port), user, database,dbType });\n+ const node = NodeUtil.of({ host, port: parseInt(port), user, database });\nif (node.getCache()) {\nreturn node.getCache();\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix query file name.
|
141,908
|
06.01.2021 11:43:24
| -28,800
|
3c8dfb2222a468854403d1857d17f97859b95028
|
Update mode create template.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/functionGroup.ts",
"new_path": "src/model/main/functionGroup.ts",
"diff": "@@ -43,12 +43,7 @@ export class FunctionGroup extends Node {\npublic async createTemplate() {\nConnectionManager.getConnection(this, true);\n- const filePath = await FileManager.record(`${this.parent.id}#create-function-template.sql`, `CREATE\n-/*[DEFINER = { user | CURRENT_USER }]*/\n-FUNCTION [name]() RETURNS [TYPE]\n-BEGIN\n- return [value];\n-END;`, FileModel.WRITE)\n+ const filePath = await FileManager.record(`${this.parent.id}#create-function-template.sql`, this.dialect.functionTemplate(), FileModel.WRITE)\nFileManager.show(filePath)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedureGroup.ts",
"new_path": "src/model/main/procedureGroup.ts",
"diff": "@@ -43,12 +43,7 @@ export class ProcedureGroup extends Node {\npublic async createTemplate() {\nConnectionManager.getConnection(this, true);\n- const filePath = await FileManager.record(`${this.parent.id}#create-procedure-template.sql`, `CREATE\n-/*[DEFINER = { user | CURRENT_USER }]*/\n-PROCEDURE [name]()\n-BEGIN\n-\n-END;`, FileModel.WRITE)\n+ const filePath = await FileManager.record(`${this.parent.id}#create-procedure-template.sql`, this.dialect.procedureTemplate(), FileModel.WRITE)\nFileManager.show(filePath)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -42,12 +42,7 @@ export class TableGroup extends Node {\npublic async createTemplate() {\nConnectionManager.getConnection(this, true);\n- const filePath=await FileManager.record(`${this.info.id}#create-table-template.sql`,`CREATE TABLE [name](\n- id int NOT NULL primary key AUTO_INCREMENT comment 'primary key',\n- created_time DATETIME COMMENT 'created tiem',\n- updated_time DATETIME COMMENT 'updated tiem',\n- [column] varchar(255) comment ''\n-) default charset utf8 comment '';`,FileModel.WRITE)\n+ const filePath=await FileManager.record(`${this.info.id}#create-table-template.sql`,this.dialect.tableTemplate(),FileModel.WRITE)\nFileManager.show(filePath)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/triggerGroup.ts",
"new_path": "src/model/main/triggerGroup.ts",
"diff": "@@ -45,13 +45,7 @@ export class TriggerGroup extends Node {\npublic async createTemplate() {\nConnectionManager.getConnection(this, true);\n- const filePath = await FileManager.record(`${this.parent.id}#create-trigger-template.sql`, `CREATE\n-/*[DEFINER = { user | CURRENT_USER }]*/\n-TRIGGER [name] BEFORE/AFTER INSERT/UPDATE/DELETE\n-ON [table]\n-FOR EACH ROW BEGIN\n-\n-END;`, FileModel.WRITE)\n+ const filePath = await FileManager.record(`${this.parent.id}#create-trigger-template.sql`, this.dialect.triggerTemplate(), FileModel.WRITE)\nFileManager.show(filePath)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -45,11 +45,7 @@ export class ViewGroup extends Node {\npublic async createTemplate() {\nConnectionManager.getConnection(this, true);\n- const filePath = await FileManager.record(`${this.parent.id}#create-view-template.sql`, `CREATE\n-/* [DEFINER = { user | CURRENT_USER }]*/\n-VIEW [name]\n-AS\n-(SELECT * FROM ...);`, FileModel.WRITE)\n+ const filePath = await FileManager.record(`${this.parent.id}#create-view-template.sql`, this.dialect.viewTemplate(), FileModel.WRITE)\nFileManager.show(filePath)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -30,5 +30,42 @@ export class MssqlDIalect implements SqlDialect {\nshowDatabases(): string {\nreturn \"SELECT name 'Database' FROM master.sys.databases\"\n}\n+ tableTemplate(): string {\n+ return `CREATE TABLE [name](\n+ id int NOT NULL primary key,\n+ created_time DATETIME,\n+ updated_time DATETIME,\n+ [column] varchar(255)\n+);`\n+ }\n+ viewTemplate(): string {\n+ return `CREATE\n+VIEW [name]\n+AS\n+(SELECT * FROM ...);`\n+ }\n+ procedureTemplate(): string {\n+ return `CREATE\n+PROCEDURE [name]\n+AS\n+BEGIN\n+\n+END;`;\n+ }\n+ triggerTemplate(): string {\n+ return `CREATE\n+TRIGGER [name]\n+ON [table]\n+[INSTEAD OF/AFTER] [INSERT/UPDATE/DELETE]\n+AS\n+END;`\n+ }\n+ functionTemplate(): string {\n+ return `CREATE\n+FUNCTION [name]() RETURNS [TYPE]\n+BEGIN\n+ return [value];\n+END;`\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -26,4 +26,40 @@ export class MysqlDialect implements SqlDialect{\nshowDatabases(): string {\nreturn \"show databases\"\n}\n+ tableTemplate(): string {\n+ return `CREATE TABLE [name](\n+ id int NOT NULL primary key AUTO_INCREMENT comment 'primary key',\n+ created_time DATETIME COMMENT 'created tiem',\n+ updated_time DATETIME COMMENT 'updated tiem',\n+ [column] varchar(255) comment ''\n+) default charset utf8 comment '';`\n+ }\n+ viewTemplate(): string {\n+ return `CREATE\n+VIEW [name]\n+AS\n+(SELECT * FROM ...);`\n+ }\n+ procedureTemplate(): string {\n+ return `CREATE\n+PROCEDURE [name]()\n+BEGIN\n+\n+END;`;\n+ }\n+ triggerTemplate(): string {\n+ return `CREATE\n+TRIGGER [name] [BEFORE/AFTER] [INSERT/UPDATE/DELETE]\n+ON [table]\n+FOR EACH ROW BEGIN\n+\n+END;`\n+ }\n+ functionTemplate(): string {\n+ return `CREATE\n+FUNCTION [name]() RETURNS [TYPE]\n+BEGIN\n+ return [value];\n+END;`\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -11,6 +11,11 @@ export interface SqlDialect {\nshowProcedures(database:string): string;\nshowFunctions(database:string): string;\nbuildPageSql(database:string,table:string,pageSize:number):string;\n+ tableTemplate():string;\n+ viewTemplate():string;\n+ procedureTemplate():string;\n+ triggerTemplate():string;\n+ functionTemplate():string;\n}\nexport function getDialect(dbType: DatabaseType): SqlDialect {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update mode create template.
|
141,908
|
06.01.2021 12:04:09
| -28,800
|
71b3017d0099522192e802f227be32daf2e48527
|
Support show count.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -132,7 +132,7 @@ ADD\n}\npublic async countSql() {\n- QueryUnit.runQuery(`SELECT count(*) FROM ${this.wrap(this.database)}.${this.wrap(this.table)};`, this);\n+ QueryUnit.runQuery(this.dialect.countSql(this.wrap(this.database),this.wrap(this.table)), this);\n}\npublic async selectSqlTemplate(run: boolean) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -24,6 +24,9 @@ export class MssqlDIalect implements SqlDialect {\nbuildPageSql(database: string, table: string, pageSize: number): string {\nreturn `SELECT TOP ${pageSize} * FROM ${table};`;\n}\n+ countSql(database: string, table: string): string {\n+ return `SELECT count(*) count FROM ${table};`;\n+ }\nshowTables(database: string): string {\nreturn `SELECT TABLE_NAME tableName FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_CATALOG='${database}'`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -20,6 +20,9 @@ export class MysqlDialect implements SqlDialect{\nbuildPageSql(database: string, table: string, pageSize: number):string {\nreturn `SELECT * FROM ${database}.${table} LIMIT ${pageSize};`;\n}\n+ countSql(database: string, table: string): string {\n+ return `SELECT count(*) FROM ${database}.${table};`;\n+ }\nshowTables(database: string): string {\nreturn `SELECT table_comment comment,TABLE_NAME tableName FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -11,6 +11,7 @@ export interface SqlDialect {\nshowProcedures(database:string): string;\nshowFunctions(database:string): string;\nbuildPageSql(database:string,table:string,pageSize:number):string;\n+ countSql(database:string,table:string):string;\ntableTemplate():string;\nviewTemplate():string;\nprocedureTemplate():string;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show count.
|
141,908
|
06.01.2021 14:51:43
| -28,800
|
07c2c4657c3c25f03c088b05b7a502db258df140
|
Fix cache invalid.
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -28,6 +28,7 @@ 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+import { DbTreeDataProvider } from \"./provider/treeDataProvider\";\nexport function activate(context: vscode.ExtensionContext) {\n@@ -48,6 +49,7 @@ export function activate(context: vscode.ExtensionContext) {\n[CommandKey.Refresh]: (node:Node) => {\nif(node){\nnode.getChildren(true)\n+ DbTreeDataProvider.refresh(node)\n}else{\nserviceManager.provider.init();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/functionGroup.ts",
"new_path": "src/model/main/functionGroup.ts",
"diff": "@@ -20,7 +20,7 @@ export class FunctionGroup extends Node {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let tableNodes = DatabaseCache.getChildListOfDatabase(this.id);\n+ let tableNodes = DatabaseCache.getChildListOfId(this.id);\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedureGroup.ts",
"new_path": "src/model/main/procedureGroup.ts",
"diff": "@@ -20,7 +20,7 @@ export class ProcedureGroup extends Node {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let tableNodes = DatabaseCache.getChildListOfDatabase(this.id);\n+ let tableNodes = DatabaseCache.getChildListOfId(this.id);\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -20,7 +20,7 @@ export class TableGroup extends Node {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let tableNodes = DatabaseCache.getChildListOfDatabase(this.id);\n+ let tableNodes = DatabaseCache.getChildListOfId(this.id);\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/triggerGroup.ts",
"new_path": "src/model/main/triggerGroup.ts",
"diff": "@@ -21,7 +21,7 @@ export class TriggerGroup extends Node {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let tableNodes = DatabaseCache.getChildListOfDatabase(this.id);\n+ let tableNodes = DatabaseCache.getChildListOfId(this.id);\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -21,7 +21,7 @@ export class ViewGroup extends Node {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let tableNodes = DatabaseCache.getChildListOfDatabase(this.id);\n+ let tableNodes = DatabaseCache.getChildListOfId(this.id);\nif (tableNodes && !isRresh) {\nreturn tableNodes;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "@@ -191,6 +191,10 @@ export class DatabaseCache {\nreturn viewList;\n}\n+ public static getChildListOfId(id: string): Node[] {\n+ return this.databaseNodeMapTableNode[id];\n+ }\n+\npublic static getDatabase(connectId: string, dbName: string): DatabaseNode {\nconst dbList = this.connectionNodeMapDatabaseNode[connectId];\nif (!dbList) { return null; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -64,11 +64,6 @@ export class QueryUnit {\nreturn;\n}\n- // const sqlList: string[] = sql.match(/(?:[^;\"']+|[\"'][^\"']*[\"'])+/g)?.filter((s) => (s.trim() != '' && s.trim() != ';'))\n- // if (sqlList?.length == 0 && sql.match(this.selectPattern) && !sql.match(/\\blimit\\b/i) && !sql.match(/;\\s*$/) && !sql.match(/[count|sum|min|max]\\(/i)) {\n- // sql += ` LIMIT ${Global.getConfig(ConfigKey.DEFAULT_LIMIT)}`;\n- // }\n-\nQueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\nconst executeTime = new Date().getTime();\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix cache invalid.
|
141,908
|
06.01.2021 15:22:17
| -28,800
|
a4bb2c64a977bc76f27dff6ca519765076fb12bd
|
Suppoer show sqlserver source.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/function.ts",
"new_path": "src/model/main/function.ts",
"diff": "@@ -24,10 +24,10 @@ export class FunctionNode extends Node {\n}\npublic async showSource() {\n- QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE FUNCTION \\`${this.database}\\`.\\`${this.name}\\``)\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), this.dialect.showFunctionSource(this.database,this.name))\n.then((procedDtails) => {\nconst procedDtail = procedDtails[0];\n- QueryUnit.showSQLTextDocument(`DROP FUNCTION IF EXISTS ${procedDtail.Function}; \\n\\n${procedDtail['Create Function']}`);\n+ QueryUnit.showSQLTextDocument(`DROP FUNCTION IF EXISTS ${this.name}; \\n\\n${procedDtail['Create Function']}`);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/procedure.ts",
"new_path": "src/model/main/procedure.ts",
"diff": "@@ -25,10 +25,10 @@ export class ProcedureNode extends Node {\n}\npublic async showSource() {\n- QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE PROCEDURE \\`${this.database}\\`.\\`${this.name}\\``)\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), this.dialect.showProcedureSource(this.database,this.name))\n.then((procedDtails) => {\nconst procedDtail = procedDtails[0]\n- QueryUnit.showSQLTextDocument(`DROP PROCEDURE IF EXISTS ${procedDtail.Procedure}; \\n\\n${procedDtail['Create Procedure']}`);\n+ QueryUnit.showSQLTextDocument(`DROP PROCEDURE IF EXISTS ${this.name}; \\n\\n${procedDtail['Create Procedure']}`);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -65,7 +65,7 @@ ADD\npublic async showSource() {\n- QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE TABLE \\`${this.database}\\`.\\`${this.table}\\``)\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), this.dialect.showTableSource(this.database,this.table))\n.then((sourceResule) => {\nQueryUnit.showSQLTextDocument(sourceResule[0]['Create Table']);\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/trigger.ts",
"new_path": "src/model/main/trigger.ts",
"diff": "@@ -24,10 +24,10 @@ export class TriggerNode extends Node {\n}\npublic async showSource() {\n- QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE TRIGGER \\`${this.database}\\`.\\`${this.name}\\``)\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), this.dialect.showTriggerSource(this.database,this.name))\n.then((procedDtails) => {\nconst procedDtail = procedDtails[0]\n- QueryUnit.showSQLTextDocument(`\\n\\nDROP TRIGGER IF EXISTS ${procedDtail.Trigger}; \\n\\n${procedDtail['SQL Original Statement']}`);\n+ QueryUnit.showSQLTextDocument(`\\n\\nDROP TRIGGER IF EXISTS ${this.name}; \\n\\n${procedDtail['SQL Original Statement']}`);\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewNode.ts",
"new_path": "src/model/main/viewNode.ts",
"diff": "@@ -15,7 +15,7 @@ export class ViewNode extends TableNode {\npublic contextValue: string = ModelType.VIEW;\npublic async showSource() {\n- QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), `SHOW CREATE VIEW \\`${this.database}\\`.\\`${this.table}\\``)\n+ QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this, true), this.dialect.showViewSource(this.database,this.table))\n.then((sourceResule) => {\nconst sql =`DROP VIEW ${this.table};${sourceResule[0]['Create View']}`\nQueryUnit.showSQLTextDocument(sqlFormatter.format(sql));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -2,6 +2,21 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect implements SqlDialect{\n+ showTableSource(database: string, table: string): string {\n+ return `SHOW CREATE TABLE \\`${database}\\`.\\`${table}\\``\n+ }\n+ showViewSource(database: string, table: string): string {\n+ return `SHOW CREATE VIEW \\`${database}\\`.\\`${table}\\``\n+ }\n+ showProcedureSource(database: string, name: string): string {\n+ return `SHOW CREATE PROCEDURE \\`${database}\\`.\\`${name}\\``\n+ }\n+ showFunctionSource(database: string, name: string): string {\n+ return `SHOW CREATE FUNCTION \\`${database}\\`.\\`${name}\\``;\n+ }\n+ showTriggerSource(database: string, name: string): string {\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}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -12,6 +12,11 @@ export interface SqlDialect {\nshowFunctions(database:string): string;\nbuildPageSql(database:string,table:string,pageSize:number):string;\ncountSql(database:string,table:string):string;\n+ showTableSource(database:string,table:string):string;\n+ showViewSource(database:string,table:string):string;\n+ showProcedureSource(database:string,name:string):string;\n+ showFunctionSource(database:string,name:string):string;\n+ showTriggerSource(database:string,name:string):string;\ntableTemplate():string;\nviewTemplate():string;\nprocedureTemplate():string;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/App.vue",
"new_path": "src/vue/result/App.vue",
"diff": "@@ -585,7 +585,7 @@ export default {\nreturn \"Edit For \" + this.result.table + \" : \" + this.result.primaryKey + \"=\" + this.update.primary\n},\nremainHeight() {\n- return window.outerHeight - 200\n+ return window.outerHeight - 230\n},\n},\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Suppoer show sqlserver source.
|
141,908
|
06.01.2021 16:09:05
| -28,800
|
a1ac0e66e1da157dbab7043264e8a95f91626c35
|
Suppoer show system views.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -50,10 +50,10 @@ export abstract class Node extends vscode.TreeItem {\nprivate static nodeCache = {};\npublic cacheSelf(){\n- Node.nodeCache[this.getConnectId()]=this;\n+ Node.nodeCache[`${this.getConnectId()}_${this.database}`]=this;\n}\npublic getCache(){\n- return Node.nodeCache[this.getConnectId()]\n+ return Node.nodeCache[`${this.getConnectId()}_${this.database}`]\n}\npublic getChildren(isRresh?: boolean): Node[] | Promise<Node[]> {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -102,7 +102,9 @@ export class ConnectionManager {\nthis.activeConnection[key] = { connection: create(connectOption), ssh, createTime: new Date() };\nthis.activeConnection[key].connection.connect((err: Error) => {\nif (!err) {\n+ if(changeActive){\nthis.lastConnectionNode = NodeUtil.of(connectionNode);\n+ }\nresolve(this.activeConnection[key].connection);\n} else {\nthis.activeConnection[key] = null;\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 { version } from \"vue/types/umd\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect implements SqlDialect {\nshowTableSource(database: string, table: string): string {\n- return `SELECT definition 'Create Table' FROM sys.sql_modules WHERE object_id = OBJECT_ID('${table}')`\n+ window.showErrorMessage(\"Show Source Not Support Sql Server.\")\n+ throw new Error(\"Show Source Not Support Sql Server.\")\n}\nshowViewSource(database: string, table: string): string {\nreturn `SELECT definition 'Create View' FROM sys.sql_modules WHERE object_id = OBJECT_ID('${table}')`\n@@ -34,6 +37,9 @@ export class MssqlDIalect implements SqlDialect {\nreturn `SELECT concat(ROUTINE_SCHEMA,'.',ROUTINE_NAME) ROUTINE_NAME FROM information_schema.routines WHERE SPECIFIC_CATALOG = '${database}' and ROUTINE_TYPE='FUNCTION'`;\n}\nshowViews(database: string): string {\n+ if (database.toLowerCase() == 'master') {\n+ return `SELECT concat(SCHEMA_NAME(schema_id),'.',name) TABLE_NAME FROM [sys].[all_views] ORDER BY TABLE_NAME`;\n+ }\nreturn `SELECT concat(TABLE_SCHEMA,'.',TABLE_NAME) TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_CATALOG = '${database}' `;\n}\nbuildPageSql(database: string, table: string, pageSize: number): string {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Suppoer show system views.
|
141,908
|
06.01.2021 16:22:13
| -28,800
|
727754ec384078252c85f6b5332f9c2e487ad036
|
FIx load column fail.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "{\n\"command\": \"mysql.name.copy\",\n\"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n+ \"group\": \"1_inline@-2\"\n+ },\n+ {\n+ \"command\": \"mysql.refresh\",\n+ \"when\": \"view == github.cweijan.mysql && viewItem =~ /(table|view)/\",\n\"group\": \"1_inline@-1\"\n},\n{\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
FIx load column fail.
|
141,908
|
06.01.2021 23:47:21
| -28,800
|
512e3db2b991569a75fb735b41f964c5e5e0c774
|
Init postgresql.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "},\n\"dependencies\": {\n\"@antv/g2\": \"^4.0.9\",\n+ \"@types/pg\": \"^7.14.7\",\n\"@types/tedious\": \"^4.0.3\",\n\"date-format\": \"^3.0.0\",\n\"deepmerge\": \"^3.2.0\",\n\"mockjs\": \"^1.1.0\",\n\"mysql2\": \"^2.2.5\",\n\"node-xlsx\": \"^0.15.0\",\n+ \"pg\": \"^8.5.1\",\n\"portfinder\": \"^1.0.26\",\n\"pretty-bytes\": \"^5.3.0\",\n\"sqlstring\": \"^2.3.2\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -29,6 +29,9 @@ export class Util {\nif(databaseType==DatabaseType.MSSQL){\nreturn origin.split(\".\").map(text=>`[${text}]`).join(\".\")\n}\n+ if(databaseType==DatabaseType.PG){\n+ return `\"${origin}\"`;\n+ }\nreturn `\\`${origin}\\``;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/connection.ts",
"new_path": "src/service/connect/connection.ts",
"diff": "@@ -3,6 +3,7 @@ import { Node } from \"@/model/interface/node\";\nimport { FieldInfo } from \"mysql2\";\nimport { MSSqlConnnection } from \"./mssqlConnection\";\nimport { MysqlConnection } from \"./mysqlConnection\";\n+import { PostgreSqlConnection } from \"./postgresqlConnection\";\nexport interface IConnection {\nquery(sql: string, callback?: queryCallback): void;\n@@ -33,6 +34,8 @@ export function create(opt: Node) {\nswitch (opt.dbType) {\ncase DatabaseType.MSSQL:\nreturn new MSSqlConnnection(opt)\n+ case DatabaseType.PG:\n+ return new PostgreSqlConnection(opt)\n}\nreturn new MysqlConnection(opt)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "+import { Node } from \"@/model/interface/node\";\n+import { Client } from \"pg\";\n+import { IConnection, queryCallback } from \"./connection\";\n+\n+export class PostgreSqlConnection implements IConnection {\n+ private client: Client;\n+ constructor(opt: Node) {\n+ this.client = new Client({\n+ host: opt.host, port: opt.port,\n+ user: opt.user, password: opt.password,\n+ database: opt.database\n+ });\n+ }\n+ isAlive(): boolean {\n+ // return this.con.state == 'authenticated' || this.con.authorized\n+ return false;\n+ }\n+ query(sql: string, callback?: queryCallback): void;\n+ query(sql: string, values: any, callback?: queryCallback): void;\n+ query(sql: any, values?: any, callback?: any) {\n+ /**\n+ * convert result value\n+ */\n+ this.client.query(sql, values, callback)\n+ }\n+ connect(callback: (err: Error) => void): void {\n+ this.client.connect(callback)\n+ }\n+ async beginTransaction() {\n+ await this.client.query(\"BEGIN\")\n+ }\n+ async rollback() {\n+ await this.client.query(\"ROLLBACK\")\n+ }\n+ async commit() {\n+ await this.client.query(\"COMMIT\")\n+ }\n+ end(): void {\n+ this.client.end()\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "+import { SqlDialect } from \"./sqlDialect\";\n+\n+export class PostgreSqlDialect implements SqlDialect{\n+ showDatabases(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showTables(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showColumns(database: string, table: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showViews(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showTriggers(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showProcedures(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showFunctions(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ buildPageSql(database: string, table: string, pageSize: number): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ countSql(database: string, table: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ createDatabase(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ truncateDatabase(database: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ renameTable(database: string, tableName: string, newName: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showTableSource(database: string, table: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showViewSource(database: string, table: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showProcedureSource(database: string, name: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showFunctionSource(database: string, name: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ showTriggerSource(database: string, name: string): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ tableTemplate(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ viewTemplate(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ procedureTemplate(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ triggerTemplate(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+ functionTemplate(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "import { DatabaseType } from \"@/common/constants\";\nimport { MssqlDIalect } from \"./mssqlDIalect\";\nimport { MysqlDialect } from \"./mysqlDialect\";\n+import { PostgreSqlDialect } from \"./postgreSqlDialect\";\nexport interface SqlDialect {\nshowDatabases(): string;\n@@ -31,6 +32,8 @@ export function getDialect(dbType: DatabaseType): SqlDialect {\nswitch (dbType) {\ncase DatabaseType.MSSQL:\nreturn new MssqlDIalect()\n+ case DatabaseType.PG:\n+ return new PostgreSqlDialect();\n}\nreturn new MysqlDialect()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/service/page/postgreSqlPageService.ts",
"diff": "+import { AbstractPageSerivce } from \"./pageService\";\n+\n+export class PostgreSqlPageService extends AbstractPageSerivce{\n+ protected buildPageSql(sql: string, start: number, limit: number): string {\n+ throw new Error(\"Method not implemented.\");\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": "@@ -25,6 +25,7 @@ import { MssqlPageService } from \"./page/mssqlPageService\";\nimport { MysqlPageSerivce } from \"./page/mysqlPageSerivce\";\nimport { PageService } from \"./page/pageService\";\nimport { DatabaseType } from \"@/common/constants\";\n+import { PostgreSqlPageService } from \"./page/postgreSqlPageService\";\nexport class ServiceManager {\n@@ -94,6 +95,8 @@ export class ServiceManager {\nswitch (databaseType) {\ncase DatabaseType.MSSQL:\nreturn new MssqlPageService();\n+ case DatabaseType.PG:\n+ return new PostgreSqlPageService();\n}\nreturn new MysqlPageSerivce();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/connect/index.vue",
"new_path": "src/vue/connect/index.vue",
"diff": "<el-select id=\"connection-type\" v-model=\"connectionOption.dbType\">\n<el-option value=\"MySQL\">MySQL</el-option>\n<el-option value=\"PostgreSQL\">PostgreSQL</el-option>\n- <el-option value=\"Oracle\">Oracle</el-option>\n<el-option value=\"SqlServer\">SQL Server</el-option>\n</el-select>\n</section>\n"
},
{
"change_type": "MODIFY",
"old_path": "webpack.config.js",
"new_path": "webpack.config.js",
"diff": "@@ -3,6 +3,7 @@ const { VueLoaderPlugin } = require('vue-loader')\nconst HtmlWebpackPlugin = require('html-webpack-plugin')\nconst CopyWebpackPlugin = require('copy-webpack-plugin')\nconst isProd = process.argv.indexOf('-p') >= 0;\n+var webpack = require('webpack');\nmodule.exports = [\n{\n@@ -30,6 +31,9 @@ module.exports = [\n'~': path.resolve(__dirname, './src')\n}\n},\n+ plugins: [\n+ new webpack.IgnorePlugin(/^pg-native$/)\n+ ],\nmodule: { rules: [{ test: /\\.ts$/, exclude: /node_modules/, use: ['ts-loader'] }] },\noptimization: { minimize: false },\nwatch: !isProd,\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Init postgresql.
|
141,908
|
07.01.2021 12:37:53
| -28,800
|
8897ca548b4fd1f7c3fdb6c61ad973986c5b1611
|
Added postgresql dialect.
|
[
{
"change_type": "MODIFY",
"old_path": "src/common/util.ts",
"new_path": "src/common/util.ts",
"diff": "@@ -30,7 +30,7 @@ export class Util {\nreturn origin.split(\".\").map(text=>`[${text}]`).join(\".\")\n}\nif(databaseType==DatabaseType.PG){\n- return `\"${origin}\"`;\n+ return origin.split(\".\").map(text=>`\"${text}\"`).join(\".\")\n}\nreturn `\\`${origin}\\``;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -46,9 +46,9 @@ export function activate(context: vscode.ExtensionContext) {\n// util\n...{\n\"mysql.history.open\": () => serviceManager.historyService.showHistory(),\n- [CommandKey.Refresh]: (node:Node) => {\n+ [CommandKey.Refresh]: async (node:Node) => {\nif(node){\n- node.getChildren(true)\n+ await node.getChildren(true)\nDbTreeDataProvider.refresh(node)\n}else{\nserviceManager.provider.init();\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -67,7 +67,7 @@ export class ConnectionNode extends Node implements CopyAble {\n});\nif (this.user.toLocaleLowerCase() == \"root\") {\n- databaseNodes.unshift(new UserGroup(\"USER\", this));\n+ // databaseNodes.unshift(new UserGroup(\"USER\", this));\n}\nDatabaseCache.setDataBaseListOfConnection(this.id, databaseNodes);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/interface/node.ts",
"new_path": "src/model/interface/node.ts",
"diff": "@@ -65,10 +65,14 @@ export abstract class Node extends vscode.TreeItem {\nconst targetGlobal = SpecGlobal != null ? SpecGlobal : this.global;\nconst prefix = targetGlobal === false ? \"workspace\" : \"global\";\n- if (this.usingSSH && this.ssh) {\n- return `${prefix}_${this.ssh.host}_${this.ssh.port}_${this.ssh.username}`;\n+ let id = (this.usingSSH && this.ssh)?`${prefix}_${this.ssh.host}_${this.ssh.port}_${this.ssh.username}`\n+ :`${prefix}_${this.host}_${this.port}_${this.user}`;\n+\n+ if(this.database && this.dbType==DatabaseType.PG){\n+ return `${id}_${this.database}`\n}\n- return `${prefix}_${this.host}_${this.port}_${this.user}`;\n+\n+ return id;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableGroup.ts",
"new_path": "src/model/main/tableGroup.ts",
"diff": "@@ -27,7 +27,7 @@ export class TableGroup extends Node {\nreturn QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this),this.dialect.showTables(this.database))\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new TableNode(table.tableName, table.comment, this);\n+ return new TableNode(table.name, table.comment, this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/main/viewGroup.ts",
"new_path": "src/model/main/viewGroup.ts",
"diff": "@@ -29,7 +29,7 @@ export class ViewGroup extends Node {\nthis.dialect.showViews(this.database))\n.then((tables) => {\ntableNodes = tables.map<TableNode>((table) => {\n- return new ViewNode(table.TABLE_NAME, '', this);\n+ return new ViewNode(table.name, '', this);\n});\nDatabaseCache.setTableListOfDatabase(this.id, tableNodes);\nif (tableNodes.length == 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -5,23 +5,30 @@ import { IConnection, queryCallback } from \"./connection\";\nexport class PostgreSqlConnection implements IConnection {\nprivate client: Client;\nconstructor(opt: Node) {\n- this.client = new Client({\n+ const config = {\nhost: opt.host, port: opt.port,\nuser: opt.user, password: opt.password,\ndatabase: opt.database\n- });\n+ };\n+ this.client = new Client(config);\n}\nisAlive(): boolean {\n- // return this.con.state == 'authenticated' || this.con.authorized\n- return false;\n+ const temp = this.client as any;\n+ return temp._connected && (!temp._ending);\n}\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\nquery(sql: any, values?: any, callback?: any) {\n- /**\n- * convert result value\n- */\n- this.client.query(sql, values, callback)\n+ if (!callback && values instanceof Function) {\n+ callback = values;\n+ }\n+ this.client.query(sql, values, (err, res) => {\n+ if (err) {\n+ callback(err)\n+ } else {\n+ callback(null, res.rows, res.fields)\n+ }\n+ })\n}\nconnect(callback: (err: Error) => void): void {\nthis.client.connect(callback)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -51,7 +51,7 @@ export class ConnectionManager {\nconst activeConnect = this.activeConnection[id];\nif (activeConnect) {\nthis.activeConnection[id] = null\n- this.tunnelService.closeTunnel(lcp.getConnectId())\n+ this.tunnelService.closeTunnel(id)\nactiveConnect.connection.end()\n}\nDatabaseCache.clearDatabaseCache(id)\n@@ -83,7 +83,7 @@ export class ConnectionManager {\nresolve(connection.connection);\nreturn;\n} catch (err) {\n- this.activeConnection[key] = null\n+ ConnectionManager.end(key, connection);\n}\n}\n@@ -101,16 +101,16 @@ export class ConnectionManager {\n}\nthis.activeConnection[key] = { connection: create(connectOption), ssh, createTime: new Date() };\nthis.activeConnection[key].connection.connect((err: Error) => {\n- if (!err) {\n- if(changeActive){\n- this.lastConnectionNode = NodeUtil.of(connectionNode);\n- }\n- resolve(this.activeConnection[key].connection);\n- } else {\n+ if (err) {\nthis.activeConnection[key] = null;\nthis.tunnelService.closeTunnel(key)\nconsole.error(err.stack)\nreject(err.message);\n+ } else {\n+ if (changeActive) {\n+ this.lastConnectionNode = NodeUtil.of(connectionNode);\n+ }\n+ resolve(this.activeConnection[key].connection);\n}\n});\n@@ -118,6 +118,15 @@ export class ConnectionManager {\n}\n+ private static end(key: string, connection: ConnectionWrapper) {\n+ this.activeConnection[key] = null\n+ try {\n+ connection.connection.end();\n+ } catch (error) {\n+ console.log(error)\n+ }\n+ }\n+\npublic static getByActiveFile(): Node {\nif (vscode.window.activeTextEditor) {\nconst fileName = vscode.window.activeTextEditor.document.fileName;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -46,9 +46,9 @@ export class MssqlDIalect implements SqlDialect {\n}\nshowViews(database: string): string {\nif (database.toLowerCase() == 'master') {\n- return `SELECT concat(SCHEMA_NAME(schema_id),'.',name) TABLE_NAME FROM [sys].[all_views] ORDER BY TABLE_NAME`;\n+ return `SELECT concat(SCHEMA_NAME(schema_id),'.',name) name FROM [sys].[all_views] ORDER BY name`;\n}\n- return `SELECT concat(TABLE_SCHEMA,'.',TABLE_NAME) TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_CATALOG = '${database}' `;\n+ return `SELECT concat(TABLE_SCHEMA,'.',TABLE_NAME) name FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_CATALOG = '${database}' `;\n}\nbuildPageSql(database: string, table: string, pageSize: number): string {\nreturn `SELECT TOP ${pageSize} * FROM ${table};`;\n@@ -57,7 +57,7 @@ export class MssqlDIalect implements SqlDialect {\nreturn `SELECT count(*) count FROM ${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT concat(TABLE_SCHEMA,'.',TABLE_NAME) tableName FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_CATALOG='${database}'`\n+ return `SELECT concat(TABLE_SCHEMA,'.',TABLE_NAME) 'name' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_CATALOG='${database}'`\n}\nshowDatabases(): string {\nreturn \"SELECT name 'Database' FROM master.sys.databases\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -39,7 +39,7 @@ export class MysqlDialect implements SqlDialect{\nreturn `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${database}' and ROUTINE_TYPE='FUNCTION'`;\n}\nshowViews(database: string): string {\n- return `SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${database}' LIMIT ${QueryUnit.maxTableCount}`;\n+ return `SELECT TABLE_NAME name FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${database}' LIMIT ${QueryUnit.maxTableCount}`;\n}\nbuildPageSql(database: string, table: string, pageSize: number):string {\nreturn `SELECT * FROM ${database}.${table} LIMIT ${pageSize};`;\n@@ -48,7 +48,7 @@ export class MysqlDialect implements SqlDialect{\nreturn `SELECT count(*) FROM ${database}.${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT table_comment comment,TABLE_NAME tableName FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`\n+ return `SELECT table_comment comment,TABLE_NAME as name FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`\n}\nshowDatabases(): string {\nreturn \"show databases\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "+import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect implements SqlDialect{\n- showDatabases(): string {\n- throw new Error(\"Method not implemented.\");\n+ renameTable(database: string, tableName: string, newName: string): string {\n+ return `RENAME TABLE \"${database}\".\"${tableName}\" to \"${database}\".\"${newName}\"`;\n}\n- showTables(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ truncateDatabase(database: string): string {\n+ return `SELECT Concat('TRUNCATE TABLE \"',TABLE_NAME, '\";') trun FROM INFORMATION_SCHEMA.TABLES WHERE table_schema ='public' AND table_type='BASE TABLE';`\n}\n- showColumns(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ createDatabase(database: string): string {\n+ return `create database \"${database}\"`;\n}\n- showViews(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showTableSource(database: string, table: string): string {\n+ return `SHOW CREATE TABLE \"${database}\".\"${table}\"`\n}\n- showTriggers(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showViewSource(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}\n- showProcedures(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showProcedureSource(database: string, name: string): string {\n+ return `SELECT CONCAT('CREATE PROCEDURE ',ROUTINE_NAME,'()\\nLANGUAGE ',routine_body,'\\nAS $$',routine_definition,'$$;') \"Create Procedure\",ROUTINE_NAME,routine_definition,routine_body,data_type FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='PROCEDURE' AND ROUTINE_NAME='${name}'`;\n}\n- showFunctions(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showFunctionSource(database: string, name: string): string {\n+ return `SELECT CONCAT('CREATE FUNCTION ',ROUTINE_NAME,'()\\nRETURNS ',data_type,'\\nAS $$',routine_definition,'$$ LANGUAGE ',routine_body,';') \"Create Function\",ROUTINE_NAME,routine_definition,routine_body,data_type FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='FUNCTION' AND ROUTINE_NAME='${name}'`;\n}\n- buildPageSql(database: string, table: string, pageSize: number): string {\n- throw new Error(\"Method not implemented.\");\n+ showTriggerSource(database: string, name: string): string {\n+ return `SHOW CREATE TRIGGER \"${database}\".\"${name}\"`;\n}\n- countSql(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showColumns(database: string,table:string): string {\n+ const view = table.split('.')[1];\n+ return `SELECT COLUMN_NAME \"name\",DATA_TYPE \"simpleType\",DATA_TYPE \"type\",IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH \"maxLength\",COLUMN_DEFAULT \"defaultValue\",'' \"comment\" FROM information_schema.columns WHERE TABLE_CATALOG = '${database}' AND table_name = '${view?view:table}' ORDER BY ORDINAL_POSITION;`;\n}\n- createDatabase(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showTriggers(database: string): string {\n+ return `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n}\n- truncateDatabase(database: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showProcedures(database: string): string {\n+ return `SELECT ROUTINE_NAME \"ROUTINE_NAME\" FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='PROCEDURE'`;\n}\n- renameTable(database: string, tableName: string, newName: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showFunctions(database: string): string {\n+ return `SELECT ROUTINE_NAME \"ROUTINE_NAME\" FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='FUNCTION'`;\n}\n- showTableSource(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showViews(database: string): string {\n+ return `select table_name \"name\" from information_schema.tables where table_schema='public' and table_type='VIEW';`\n}\n- showViewSource(database: string, table: string): string {\n- throw new Error(\"Method not implemented.\");\n+ buildPageSql(database: string, table: string, pageSize: number):string {\n+ return `SELECT * FROM ${table} LIMIT ${pageSize};`;\n}\n- showProcedureSource(database: string, name: string): string {\n- throw new Error(\"Method not implemented.\");\n+ countSql(database: string, table: string): string {\n+ return `SELECT count(*) FROM ${table};`;\n}\n- showFunctionSource(database: string, name: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showTables(database: string): string {\n+ return `select table_name \"name\" from information_schema.tables where table_schema='public' and table_type='BASE TABLE' ;`\n}\n- showTriggerSource(database: string, name: string): string {\n- throw new Error(\"Method not implemented.\");\n+ showDatabases(): string {\n+ return `SELECT datname \"Database\" FROM pg_database WHERE datistemplate = false;`\n}\ntableTemplate(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `CREATE TABLE [name](\n+ id int NOT NULL primary key,\n+ created_time DATETIME,\n+ updated_time DATETIME,\n+ [column] varchar(255)\n+);`\n}\nviewTemplate(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `CREATE\n+VIEW [name]\n+AS\n+(SELECT * FROM ...);`\n}\nprocedureTemplate(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `CREATE PROCEDURE [name]()\n+LANGUAGE SQL\n+as $$\n+[content]\n+$$`;\n}\ntriggerTemplate(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `CREATE\n+TRIGGER [name] [BEFORE/AFTER] [INSERT/UPDATE/DELETE]\n+ON [table]\n+FOR EACH ROW BEGIN\n+\n+END;`\n}\nfunctionTemplate(): string {\n- throw new Error(\"Method not implemented.\");\n+ return `CREATE FUNCTION [name]()\n+RETURNS [type] AS $$\n+BEGIN\n+ return [type];\n+END;\n+$$ LANGUAGE plpgsql;`\n}\n-\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/page/postgreSqlPageService.ts",
"new_path": "src/service/page/postgreSqlPageService.ts",
"diff": "@@ -2,7 +2,12 @@ import { AbstractPageSerivce } from \"./pageService\";\nexport class PostgreSqlPageService extends AbstractPageSerivce{\nprotected buildPageSql(sql: string, start: number, limit: number): string {\n- throw new Error(\"Method not implemented.\");\n+ const paginationSql = `LIMIT ${limit} OFFSET ${start}`;\n+ if (sql.match(/\\blimit\\b/i)) {\n+ return sql.replace(/\\blimit\\b.+/ig, paginationSql)\n+ }\n+\n+ return `${sql} ${paginationSql}`\n}\n}\n\\ No newline at end of file\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Added postgresql dialect.
|
141,908
|
07.01.2021 14:02:59
| -28,800
|
656260d567f3d8f4b63b7d128136b3e8cc44488f
|
Fix posible sql run fail.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -50,6 +50,12 @@ export class QueryUnit {\n}\nsql = sql.replace(/^\\s*--.+/igm, '').trim();\n+ const sqlList: string[] = sql?.match(/(?:[^;\"']+|[\"'][^\"']*[\"'])+/g)?.filter((s) => (s.trim() != '' && s.trim() != ';'))\n+ // Fix posible sql run fail.\n+ if(sqlList?.length==1){\n+ sql=sqlList[0]\n+ }\n+\nconst parseResult = this.delimiterHodler.parseBatch(sql, connectionNode.getConnectId())\nsql = parseResult.sql\nif (!sql && parseResult.replace) {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Fix posible sql run fail.
|
141,908
|
07.01.2021 14:14:25
| -28,800
|
278370d488ed050e90fd179c1026c61cbbe28467
|
Add switch database dialect.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -76,8 +76,7 @@ export class ConnectionManager {\nconst key = connectionNode.getConnectId();\nconst connection = this.activeConnection[key];\nif (connection && connection.connection.isAlive()) {\n- // TODO change to ping.\n- const sql = connectionNode.database ? `use ${connectionNode.wrap(connectionNode.database)}` : `select 1;`;\n+ const sql = connectionNode.database ? connectionNode.dialect.switchDataBase(connectionNode.database) : `select 1;`;\ntry {\nawait QueryUnit.queryPromise(connection.connection, sql, false)\nresolve(connection.connection);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -2,6 +2,12 @@ import { window } from \"vscode\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect implements SqlDialect {\n+ /**\n+ * sql server cannot change database.\n+ */\n+ switchDataBase(database: string): string {\n+ return \"select 1;\";\n+ }\nrenameTable(database: string, tableName: string, newName: string): string {\nreturn `sp_rename '${tableName}', '${newName}'`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -2,6 +2,9 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect implements SqlDialect{\n+ switchDataBase(database: string): string {\n+ return `use \\`${database}\\``;\n+ }\nrenameTable(database: string, tableName: string, newName: string): string {\nreturn `RENAME TABLE \\`${database}\\`.\\`${tableName}\\` to \\`${database}\\`.\\`${newName}\\``;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -2,6 +2,12 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect implements SqlDialect{\n+ /**\n+ * postgre cannot change database.\n+ */\n+ switchDataBase(database: string): string {\n+ return \"select 1;\";\n+ }\nrenameTable(database: string, tableName: string, newName: string): string {\nreturn `RENAME TABLE \"${database}\".\"${tableName}\" to \"${database}\".\"${newName}\"`;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "import { DatabaseType } from \"@/common/constants\";\n+import { abort } from \"process\";\nimport { MssqlDIalect } from \"./mssqlDIalect\";\nimport { MysqlDialect } from \"./mysqlDialect\";\nimport { PostgreSqlDialect } from \"./postgreSqlDialect\";\nexport interface SqlDialect {\n+ switchDataBase(database: string): string;\nshowDatabases(): string;\nshowTables(database: string): string;\nshowColumns(database: string, table: string): string;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add switch database dialect.
|
141,908
|
07.01.2021 17:18:29
| -28,800
|
d75f4c04fc6588664b016008cdaa6209f8926603
|
Support show postgres sql.
|
[
{
"change_type": "MODIFY",
"old_path": "src/extension.ts",
"new_path": "src/extension.ts",
"diff": "@@ -4,7 +4,7 @@ import * as vscode from \"vscode\";\nimport { CommandKey } from \"./common/constants\";\nimport { ConnectionNode } from \"./model/database/connectionNode\";\nimport { DatabaseNode } from \"./model/database/databaseNode\";\n-import { UserGroup, UserNode } from \"./model/database/userGroup\";\n+import { UserGroup } from \"./model/database/userGroup\";\nimport { CopyAble } from \"./model/interface/copyAble\";\nimport { FunctionNode } from \"./model/main/function\";\nimport { FunctionGroup } from \"./model/main/functionGroup\";\n@@ -29,6 +29,7 @@ import { QueryNode } from \"./model/query/queryNode\";\nimport { QueryGroup } from \"./model/query/queryGroup\";\nimport { Node } from \"./model/interface/node\";\nimport { DbTreeDataProvider } from \"./provider/treeDataProvider\";\n+import { UserNode } from \"./model/database/userNode\";\nexport function activate(context: vscode.ExtensionContext) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -38,12 +38,7 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- let connection: IConnection;\n- try {\n- connection = await ConnectionManager.getConnection(this);\n- } catch (err) {\n- return [new InfoNode(err)];\n- }\n+ const connection= await ConnectionManager.getConnection(this)\nreturn QueryUnit.queryPromise<any[]>(connection, this.dialect.showDatabases())\n.then((databases) => {\n@@ -66,9 +61,7 @@ export class ConnectionNode extends Node implements CopyAble {\nreturn new DatabaseNode(database.Database, this);\n});\n- if (this.user.toLocaleLowerCase() == \"root\") {\n- // databaseNodes.unshift(new UserGroup(\"USER\", this));\n- }\n+ databaseNodes.unshift(new UserGroup(\"USER\", this));\nDatabaseCache.setDataBaseListOfConnection(this.uid, databaseNodes);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/model/database/userGroup.ts",
"new_path": "src/model/database/userGroup.ts",
"diff": "@@ -10,6 +10,7 @@ import { CopyAble } from \"../interface/copyAble\";\nimport { Node } from \"../interface/node\";\nimport { DatabaseNode } from \"./databaseNode\";\nimport { FileManager, FileModel } from \"@/common/filesManager\";\n+import { UserNode } from \"./userNode\";\nexport class UserGroup extends DatabaseNode {\n@@ -18,12 +19,12 @@ export class UserGroup extends DatabaseNode {\nconstructor(readonly name: string, readonly parent: Node) {\nsuper(name, parent)\nthis.uid = `${this.getConnectId()}_${ModelType.USER_GROUP}`;\n- this.database = null\n+ this.database = parent.database\n}\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\nlet userNodes = [];\n- return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), `SELECT host,user FROM mysql.user;`)\n+ return QueryUnit.queryPromise<any[]>(await ConnectionManager.getConnection(this), this.dialect.showUsers())\n.then((tables) => {\nuserNodes = tables.map<UserNode>((table) => {\nreturn new UserNode(table.user,table.host, this.parent);\n@@ -45,61 +46,3 @@ export class UserGroup extends DatabaseNode {\n}\n-export class UserNode extends Node implements CopyAble {\n-\n- public contextValue = ModelType.USER;\n- public iconPath = path.join(Constants.RES_PATH, \"icon/user.svg\")\n- constructor(readonly username: string,readonly host:string, readonly info: Node) {\n- super(`${username}@${host}`)\n- this.init(info)\n- this.command = {\n- command: \"mysql.user.sql\",\n- title: \"Run User Detail Statement\",\n- arguments: [this, true],\n- }\n- }\n-\n- public copyName(): void {\n- Util.copyToBoard(this.username)\n- }\n-\n- public async getChildren(isRresh: boolean = false): Promise<Node[]> {\n- return [];\n- }\n-\n- public async selectSqlTemplate() {\n- const sql = `SELECT USER 0USER,HOST 1HOST,Super_priv,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_priv,Alter_priv FROM mysql.user where user='${this.username}';`;\n- QueryUnit.runQuery(sql, this);\n- }\n-\n- public drop() {\n-\n- Util.confirm(`Are you want to drop user ${this.username} ?`, async () => {\n- QueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP user ${this.username}`).then(() => {\n- DbTreeDataProvider.refresh(this.info);\n- vscode.window.showInformationMessage(`Drop user ${this.username} success!`);\n- });\n- })\n- }\n-\n- public grandTemplate() {\n- QueryUnit.showSQLTextDocument(`\n-GRANT ALL PRIVILEGES ON *.* to '${this.username}'@'%'\n-`.replace(/^\\s/, \"\"));\n- }\n-\n- public changePasswordTemplate() {\n- ConnectionManager.getConnection(this, true);\n- QueryUnit.showSQLTextDocument(`\n-update\n- mysql.user\n-set\n- password = PASSWORD(\"newPassword\")\n-where\n- User = '${this.username}';\n-FLUSH PRIVILEGES;\n--- since mysql version 5.7, password column need change to authentication_string=PASSWORD(\"test\")`\n- .replace(/^\\s/, \"\"));\n- }\n-\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/model/database/userNode.ts",
"diff": "+import * as path from \"path\";\n+import * as vscode from \"vscode\";\n+import { Constants, ModelType } from \"../../common/constants\";\n+import { Util } from \"../../common/util\";\n+import { DbTreeDataProvider } from \"../../provider/treeDataProvider\";\n+import { ConnectionManager } from \"../../service/connectionManager\";\n+import { QueryUnit } from \"../../service/queryUnit\";\n+import { CopyAble } from \"../interface/copyAble\";\n+import { Node } from \"../interface/node\";\n+\n+export class UserNode extends Node implements CopyAble {\n+\n+ public contextValue = ModelType.USER;\n+ public iconPath = path.join(Constants.RES_PATH, \"icon/user.svg\")\n+ constructor(readonly username: string,readonly host:string, readonly info: Node) {\n+ super(username)\n+ this.init(info)\n+ this.command = {\n+ command: \"mysql.user.sql\",\n+ title: \"Run User Detail Statement\",\n+ arguments: [this, true],\n+ }\n+ }\n+\n+ public copyName(): void {\n+ Util.copyToBoard(this.username)\n+ }\n+\n+ public async getChildren(isRresh: boolean = false): Promise<Node[]> {\n+ return [];\n+ }\n+\n+ public async selectSqlTemplate() {\n+ const sql = `SELECT USER 0USER,HOST 1HOST,Super_priv,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_priv,Alter_priv FROM mysql.user where user='${this.username}';`;\n+ QueryUnit.runQuery(sql, this);\n+ }\n+\n+ public drop() {\n+\n+ Util.confirm(`Are you want to drop user ${this.username} ?`, async () => {\n+ QueryUnit.queryPromise(await ConnectionManager.getConnection(this), `DROP user ${this.username}`).then(() => {\n+ DbTreeDataProvider.refresh(this.info);\n+ vscode.window.showInformationMessage(`Drop user ${this.username} success!`);\n+ });\n+ })\n+ }\n+\n+ public grandTemplate() {\n+ QueryUnit.showSQLTextDocument(`\n+GRANT ALL PRIVILEGES ON *.* to '${this.username}'@'%'\n+`.replace(/^\\s/, \"\"));\n+ }\n+\n+ public changePasswordTemplate() {\n+ ConnectionManager.getConnection(this, true);\n+ QueryUnit.showSQLTextDocument(`\n+update\n+ mysql.user\n+set\n+ password = PASSWORD(\"newPassword\")\n+where\n+ User = '${this.username}';\n+FLUSH PRIVILEGES;\n+-- since mysql version 5.7, password column need change to authentication_string=PASSWORD(\"test\")`\n+ .replace(/^\\s/, \"\"));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "import { ExtensionContext, TreeItemCollapsibleState } from \"vscode\";\n-import { CacheKey, ModelType } from \"../../common/constants\";\n+import { CacheKey, ConfigKey, ModelType } from \"../../common/constants\";\nimport { ColumnNode } from \"../../model/other/columnNode\";\nimport { DatabaseNode } from \"../../model/database/databaseNode\";\nimport { Node } from \"../../model/interface/node\";\nimport { TableNode } from \"../../model/main/tableNode\";\n+import { Global } from \"@/common/global\";\nexport class DatabaseCache {\n@@ -62,6 +63,10 @@ export class DatabaseCache {\nreturn TreeItemCollapsibleState.None\n}\n+ if(!Global.getConfig<boolean>(ConfigKey.LOAD_META_ON_CONNECT)){\n+ return TreeItemCollapsibleState.Collapsed;\n+ }\n+\nif (element.contextValue == ModelType.COLUMN || element.contextValue == ModelType.INFO || element.contextValue == ModelType.FUNCTION\n|| element.contextValue == ModelType.TRIGGER || element.contextValue == ModelType.PROCEDURE || element.contextValue == ModelType.USER) {\nreturn TreeItemCollapsibleState.None;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "@@ -8,7 +8,9 @@ export class PostgreSqlConnection implements IConnection {\nconst config = {\nhost: opt.host, port: opt.port,\nuser: opt.user, password: opt.password,\n- database: opt.database\n+ database: opt.database,\n+ connectionTimeoutMillis:5000,\n+ statement_timeout:10000,\n};\nthis.client = new Client(config);\n}\n@@ -19,6 +21,7 @@ export class PostgreSqlConnection implements IConnection {\nquery(sql: string, callback?: queryCallback): void;\nquery(sql: string, values: any, callback?: queryCallback): void;\nquery(sql: any, values?: any, callback?: any) {\n+\nif (!callback && values instanceof Function) {\ncallback = values;\n}\n@@ -35,7 +38,9 @@ export class PostgreSqlConnection implements IConnection {\n})\n}\nconnect(callback: (err: Error) => void): void {\n- this.client.connect(callback)\n+ this.client.connect(err=>{\n+ callback(err)\n+ })\n}\nasync beginTransaction() {\nawait this.client.query(\"BEGIN\")\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -75,7 +75,8 @@ export class ConnectionManager {\n}\nconst key = connectionNode.getConnectId({ withDb: true });\nconst connection = this.activeConnection[key];\n- if (connection && connection.connection.isAlive()) {\n+ if (connection ) {\n+ if(connection.connection.isAlive()){\nconst sql = connectionNode.database ? connectionNode.dialect.switchDataBase(connectionNode.database) : `select 1;`;\ntry {\nawait QueryUnit.queryPromise(connection.connection, sql, false)\n@@ -84,6 +85,9 @@ export class ConnectionManager {\n} catch (err) {\nConnectionManager.end(key, connection);\n}\n+ }else{\n+ ConnectionManager.end(key, connection);\n+ }\n}\nconst ssh = connectionNode.ssh;\n@@ -101,8 +105,8 @@ export class ConnectionManager {\nthis.activeConnection[key] = { connection: create(connectOption), ssh, createTime: new Date() };\nthis.activeConnection[key].connection.connect((err: Error) => {\nif (err) {\n- this.activeConnection[key] = null;\nthis.tunnelService.closeTunnel(key)\n+ this.end(key,this.activeConnection[key])\nconsole.error(err.stack)\nreject(err.message);\n} else {\n@@ -122,7 +126,6 @@ export class ConnectionManager {\ntry {\nconnection.connection.end();\n} catch (error) {\n- console.log(error)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -2,6 +2,9 @@ import { window } from \"vscode\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MssqlDIalect implements SqlDialect {\n+ showUsers(): string {\n+ throw new Error(\"Method not implemented.\");\n+ }\n/**\n* sql server cannot change database.\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -2,6 +2,9 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class MysqlDialect implements SqlDialect{\n+ showUsers(): string {\n+ return `SELECT concat(user,'@',host) user FROM mysql.user;`;\n+ }\nswitchDataBase(database: string): string {\nreturn `use \\`${database}\\``;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -2,6 +2,9 @@ import { QueryUnit } from \"../queryUnit\";\nimport { SqlDialect } from \"./sqlDialect\";\nexport class PostgreSqlDialect implements SqlDialect{\n+ showUsers(): string {\n+ return `SELECT usename \"user\" from pg_user `;\n+ }\n/**\n* postgre cannot change database.\n*/\n@@ -26,7 +29,7 @@ export class PostgreSqlDialect implements SqlDialect{\nshowProcedureSource(database: string, name: string): string {\nreturn `SELECT CONCAT('CREATE PROCEDURE ',ROUTINE_NAME,'()\\nLANGUAGE ',routine_body,'\\nAS $$',routine_definition,'$$;') \"Create Procedure\",ROUTINE_NAME,routine_definition,routine_body,data_type FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='PROCEDURE' and routine_body!='EXTERNAL' AND ROUTINE_NAME='${name}'\nunion\n- SELECT CONCAT('CREATE PROCEDURE ',ROUTINE_NAME,'()\\nLANGUAGE plpgsql\\nAS $$',routine_definition,'$$;') \"Create Procedure\",ROUTINE_NAME,routine_definition,routine_body,data_type FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='PROCEDURE' and routine_body='EXTERNAL AND ROUTINE_NAME='${name}'`;\n+ SELECT CONCAT('CREATE PROCEDURE ',ROUTINE_NAME,'()\\nLANGUAGE plpgsql\\nAS $$',routine_definition,'$$;') \"Create Procedure\",ROUTINE_NAME,routine_definition,routine_body,data_type FROM information_schema.routines WHERE ROUTINE_SCHEMA = 'public' and ROUTINE_TYPE='PROCEDURE' and routine_body='EXTERNAL' AND ROUTINE_NAME='${name}'`;\n}\nshowFunctionSource(database: string, name: string): string {\nreturn `SELECT CONCAT('CREATE FUNCTION ',ROUTINE_NAME,'()\\nRETURNS ',data_type,'\\nAS $$',\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/sqlDialect.ts",
"new_path": "src/service/dialect/sqlDialect.ts",
"diff": "@@ -10,6 +10,7 @@ export interface SqlDialect {\nshowTables(database: string): string;\nshowColumns(database: string, table: string): string;\nshowViews(database: string): string;\n+ showUsers(): string;\nshowTriggers(database: string): string;\nshowProcedures(database: string): string;\nshowFunctions(database: string): string;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show postgres sql.
|
141,908
|
07.01.2021 17:42:37
| -28,800
|
1bef391f441ae017d53897df009c048a21faf25d
|
Update setting.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/common/databaseCache.ts",
"new_path": "src/service/common/databaseCache.ts",
"diff": "@@ -63,15 +63,15 @@ export class DatabaseCache {\nreturn TreeItemCollapsibleState.None\n}\n- if(!Global.getConfig<boolean>(ConfigKey.LOAD_META_ON_CONNECT)){\n- return TreeItemCollapsibleState.Collapsed;\n- }\n-\nif (element.contextValue == ModelType.COLUMN || element.contextValue == ModelType.INFO || element.contextValue == ModelType.FUNCTION\n|| element.contextValue == ModelType.TRIGGER || element.contextValue == ModelType.PROCEDURE || element.contextValue == ModelType.USER) {\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"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Update setting.
|
141,908
|
07.01.2021 17:50:45
| -28,800
|
5db448b64d8699c8c8b67407d0252bdfde0877ff
|
Add database node cache.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/database/connectionNode.ts",
"new_path": "src/model/database/connectionNode.ts",
"diff": "@@ -38,6 +38,11 @@ export class ConnectionNode extends Node implements CopyAble {\npublic async getChildren(isRresh: boolean = false): Promise<Node[]> {\n+ let dbNodes = DatabaseCache.getDatabaseListOfConnection(this.uid);\n+ if (dbNodes && !isRresh) {\n+ return dbNodes;\n+ }\n+\nconst connection= await ConnectionManager.getConnection(this)\nreturn QueryUnit.queryPromise<any[]>(connection, this.dialect.showDatabases())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -77,9 +77,11 @@ export class ConnectionManager {\nconst connection = this.activeConnection[key];\nif (connection ) {\nif(connection.connection.isAlive()){\n- const sql = connectionNode.database ? connectionNode.dialect.switchDataBase(connectionNode.database) : `select 1;`;\n+ const sql = connectionNode.database ? connectionNode.dialect.switchDataBase(connectionNode.database) : '';\ntry {\n+ if(sql){\nawait QueryUnit.queryPromise(connection.connection, sql, false)\n+ }\nresolve(connection.connection);\nreturn;\n} catch (err) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mssqlDIalect.ts",
"new_path": "src/service/dialect/mssqlDIalect.ts",
"diff": "@@ -9,7 +9,7 @@ export class MssqlDIalect implements SqlDialect {\n* sql server cannot change database.\n*/\nswitchDataBase(database: string): string {\n- return \"select 1;\";\n+ return null;\n}\nrenameTable(database: string, tableName: string, newName: string): string {\nreturn `sp_rename '${tableName}', '${newName}'`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -9,7 +9,7 @@ export class PostgreSqlDialect implements SqlDialect{\n* postgre cannot change database.\n*/\nswitchDataBase(database: string): string {\n- return \"select 1;\";\n+ return null;\n}\nrenameTable(database: string, tableName: string, newName: string): string {\nreturn `RENAME TABLE \"${database}\".\"${tableName}\" to \"${database}\".\"${newName}\"`;\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Add database node cache.
|
141,908
|
07.01.2021 18:08:43
| -28,800
|
f7c01357058f3552bde58f3381dd2c9bab7e47bb
|
Delete legacy query.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/main/tableNode.ts",
"new_path": "src/model/main/tableNode.ts",
"diff": "@@ -125,7 +125,7 @@ ADD\nconst executeTime = new Date().getTime();\nconnection.query(sql, (err: Error, data, fields) => {\nconst 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+ QueryPage.send({ singlePage: false, type: MessageType.DATA, connection: this, res: { sql, costTime, data, fields, pageSize: pageSize } as DataResponse },this);\n})\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/connectionManager.ts",
"new_path": "src/service/connectionManager.ts",
"diff": "@@ -87,8 +87,6 @@ export class ConnectionManager {\n} catch (err) {\nConnectionManager.end(key, connection);\n}\n- }else{\n- ConnectionManager.end(key, connection);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/mock/mockRunner.ts",
"new_path": "src/service/mock/mockRunner.ts",
"diff": "@@ -106,7 +106,7 @@ export class MockRunner {\nconst success = await QueryUnit.runBatch(connection, sqlList)\nvscode.commands.executeCommand(\"mysql.template.sql\", tableNode, true)\n- QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse });\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Generate mock data for ${tableNode.table} ${success ? 'success' : 'fail'}!`, success } as MessageResponse },tableNode);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -59,7 +59,7 @@ export class QueryUnit {\nconst parseResult = this.delimiterHodler.parseBatch(sql, connectionNode.getConnectId())\nsql = parseResult.sql\nif (!sql && parseResult.replace) {\n- QueryPage.send({ type: MessageType.MESSAGE, res: { message: `change delimiter success`, success: true } as MessageResponse });\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `change delimiter success`, success: true } as MessageResponse },connectionNode);\nreturn;\n}\n@@ -69,13 +69,13 @@ export class QueryUnit {\nreturn;\n}\n- QueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse });\n+ QueryPage.send({ type: MessageType.RUN, res: { sql } as RunResponse },connectionNode);\nconst executeTime = new Date().getTime();\ntry {\n(await ConnectionManager.getConnection(connectionNode, true)).query(sql, (err: Error, data, fields) => {\nif (err) {\n- QueryPage.send({ type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse });\n+ QueryPage.send({ type: MessageType.ERROR, res: { sql, message: err.message } as ErrorResponse },connectionNode);\nreturn;\n}\nconst costTime = new Date().getTime() - executeTime;\n@@ -83,7 +83,7 @@ export class QueryUnit {\nvscode.commands.executeCommand(CommandKey.RecordHistory, sql, costTime);\n}\nif (data.affectedRows) {\n- QueryPage.send({ type: MessageType.DML, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse });\n+ QueryPage.send({ type: MessageType.DML, res: { sql, costTime, affectedRows: data.affectedRows } as DMLResponse },connectionNode);\nvscode.commands.executeCommand(CommandKey.Refresh);\nreturn;\n}\n@@ -94,13 +94,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({ type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse },connectionNode);\nreturn;\n}\n- QueryPage.send({ type: MessageType.DATA, connection: connectionNode, res: { sql, costTime, data, fields, pageSize: Global.getConfig(ConfigKey.DEFAULT_LIMIT) } as DataResponse });\n+ QueryPage.send({ type: MessageType.DATA, connection: connectionNode, res: { sql, costTime, data, fields, pageSize: Global.getConfig(ConfigKey.DEFAULT_LIMIT) } as DataResponse },connectionNode);\n} else {\n// unknow result, send sql success\n- QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse });\n+ QueryPage.send({ type: MessageType.MESSAGE, res: { message: `Execute sql success : ${sql}`, costTime, success: true } as MessageResponse },connectionNode);\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/view/result/query.ts",
"new_path": "src/view/result/query.ts",
"diff": "@@ -34,7 +34,7 @@ export class QueryPage {\nprivate static statusBar: StatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, -200);\nprivate static costStatusBar: StatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, -250);\n- public static async send(queryParam: QueryParam<any>) {\n+ public static async send(queryParam: QueryParam<any>,dbOption:Node) {\nif (typeof queryParam.singlePage == 'undefined') {\nqueryParam.singlePage = true;\n@@ -64,7 +64,6 @@ export class QueryPage {\n}\n}\n- const dbOption = ConnectionManager.getLastConnectionOption();\nViewManager.createWebviewPanel({\nsinglePage: true,\nsplitView: this.isActiveSql(),\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Delete legacy query.
|
141,908
|
07.01.2021 18:14:48
| -28,800
|
0e83cf1cf1bb9c1e0402e3380e66de9e73fa63fe
|
Remove max table count setting.
|
[
{
"change_type": "MODIFY",
"old_path": "package.json",
"new_path": "package.json",
"diff": "\"type\": \"object\",\n\"title\": \"MySQL\",\n\"properties\": {\n- \"vscode-mysql.maxTableCount\": {\n- \"type\": \"integer\",\n- \"default\": 1000,\n- \"description\": \"The maximum table count shown in the tree view\"\n- },\n\"vscode-mysql.enableDelimiter\": {\n\"type\": \"boolean\",\n\"default\": false,\n"
},
{
"change_type": "MODIFY",
"old_path": "src/common/constants.ts",
"new_path": "src/common/constants.ts",
"diff": "@@ -23,7 +23,6 @@ export enum CacheKey {\n}\nexport enum ConfigKey {\n- MAX_TABLE_COUNT = \"maxTableCount\",\nENABLE_DELIMITER = \"enableDelimiter\",\nLOAD_META_ON_CONNECT = \"loadMetaOnConnect\",\nDEFAULT_LIMIT = \"defaultSelectLimit\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/mysqlDialect.ts",
"new_path": "src/service/dialect/mysqlDialect.ts",
"diff": "@@ -45,7 +45,7 @@ export class MysqlDialect implements SqlDialect{\nreturn `SELECT ROUTINE_NAME FROM information_schema.routines WHERE ROUTINE_SCHEMA = '${database}' and ROUTINE_TYPE='FUNCTION'`;\n}\nshowViews(database: string): string {\n- return `SELECT TABLE_NAME name FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${database}' LIMIT ${QueryUnit.maxTableCount}`;\n+ return `SELECT TABLE_NAME name FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '${database}'`;\n}\nbuildPageSql(database: string, table: string, pageSize: number):string {\nreturn `SELECT * FROM ${database}.${table} LIMIT ${pageSize};`;\n@@ -54,7 +54,7 @@ export class MysqlDialect implements SqlDialect{\nreturn `SELECT count(*) FROM ${database}.${table};`;\n}\nshowTables(database: string): string {\n- return `SELECT table_comment comment,TABLE_NAME as name FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name LIMIT ${QueryUnit.maxTableCount} ;`\n+ return `SELECT table_comment comment,TABLE_NAME as name FROM information_schema.TABLES WHERE TABLE_SCHEMA = '${database}' and TABLE_TYPE<>'VIEW' order by table_name;`\n}\nshowDatabases(): string {\nreturn \"show databases\"\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/queryUnit.ts",
"new_path": "src/service/queryUnit.ts",
"diff": "@@ -16,8 +16,6 @@ import { IConnection } from \"./connect/connection\";\nexport class QueryUnit {\n- public static readonly maxTableCount = Global.getConfig<number>(ConfigKey.MAX_TABLE_COUNT);\n-\npublic static queryPromise<T>(connection: IConnection, sql: string,showError=true): Promise<T> {\nreturn new Promise((resolve, reject) => {\nconnection.query(sql, (err: Error, rows) => {\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Remove max table count setting.
|
141,908
|
07.01.2021 18:20:25
| -28,800
|
d5ad893c2618e5be438fd6200bda11af83ec3172
|
Adapat postgresql dml.
|
[
{
"change_type": "MODIFY",
"old_path": "src/service/connect/postgreSqlConnection.ts",
"new_path": "src/service/connect/postgreSqlConnection.ts",
"diff": "import { Node } from \"@/model/interface/node\";\n-import { Client } from \"pg\";\n+import { Client, QueryArrayResult } from \"pg\";\nimport { IConnection, queryCallback } from \"./connection\";\nexport class PostgreSqlConnection implements IConnection {\n@@ -30,13 +30,20 @@ export class PostgreSqlConnection implements IConnection {\ncallback(err)\n} else {\nif (res instanceof Array) {\n- callback(null, res.map(row => row.rows), res.map(row => row.fields))\n+ callback(null, res.map(row => this.adaptResult(row)), res.map(row => row.fields))\n} else {\n- callback(null, res.rows, res.fields)\n+ callback(null, this.adaptResult(res), res.fields)\n}\n}\n})\n}\n+ adaptResult(res: QueryArrayResult<any>) {\n+ if (res.command != 'SELECT') {\n+ return { affectedRows: res.rowCount }\n+ }\n+ return res.rows;\n+ }\n+\nconnect(callback: (err: Error) => void): void {\nthis.client.connect(err => {\ncallback(err)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/view.css",
"new_path": "src/vue/result/view.css",
"diff": "@@ -47,6 +47,10 @@ body {\n/* umyui */\n+.el-input.is-disabled input{\n+border: none !important;\n+}\n+\n.plx-header--column.col--ellipsis>.plx-cell .plx-cell--title{\nfont-weight: 400;\n}\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Adapat postgresql dml.
|
141,908
|
07.01.2021 18:50:09
| -28,800
|
78faa90aed162621996a5a988ceca07b4e6bf924
|
Support show primary key.
|
[
{
"change_type": "MODIFY",
"old_path": "src/model/other/columnNode.ts",
"new_path": "src/model/other/columnNode.ts",
"diff": "@@ -21,7 +21,7 @@ export class ColumnNode extends Node implements CopyAble {\nthis.description = `${this.column.comment}`\nthis.label = `${this.column.name} : ${this.column.type} ${this.getIndex(this.column.key)}`\nthis.collapsibleState = vscode.TreeItemCollapsibleState.None\n- this.iconPath = path.join(Constants.RES_PATH, this.column.key === \"PRI\" ? \"icon/b_primary.png\" : \"icon/b_props.png\");\n+ this.iconPath = path.join(Constants.RES_PATH, this.isPrimaryKey ? \"icon/b_primary.png\" : \"icon/b_props.png\");\nthis.command = {\ncommand: \"mysql.column.update\",\ntitle: \"Update Column Statement\",\n@@ -37,6 +37,7 @@ export class ColumnNode extends Node implements CopyAble {\ncase 'UNI': return \"UniqueKey\";\ncase 'MUL': return \"IndexKey\";\ncase 'PRI':\n+ case 'PRIMARY KEY':\nthis.isPrimaryKey = true\nreturn \"PrimaryKey\";\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/service/dialect/postgreSqlDialect.ts",
"new_path": "src/service/dialect/postgreSqlDialect.ts",
"diff": "@@ -44,7 +44,13 @@ export class PostgreSqlDialect implements SqlDialect{\n}\nshowColumns(database: string,table:string): string {\nconst view = table.split('.')[1];\n- return `SELECT COLUMN_NAME \"name\",DATA_TYPE \"simpleType\",DATA_TYPE \"type\",IS_NULLABLE nullable,CHARACTER_MAXIMUM_LENGTH \"maxLength\",COLUMN_DEFAULT \"defaultValue\",'' \"comment\" FROM information_schema.columns WHERE TABLE_CATALOG = '${database}' AND table_name = '${view?view:table}' ORDER BY ORDINAL_POSITION;`;\n+ return `SELECT c.COLUMN_NAME \"name\", DATA_TYPE \"simpleType\", DATA_TYPE \"type\", IS_NULLABLE nullable, CHARACTER_MAXIMUM_LENGTH \"maxLength\", COLUMN_DEFAULT \"defaultValue\", '' \"comment\", tc.constraint_type \"key\" FROM\n+ information_schema.columns c\n+ left join information_schema.constraint_column_usage ccu\n+ on c.COLUMN_NAME=ccu.column_name and c.table_name=ccu.table_name and ccu.table_catalog=c.TABLE_CATALOG\n+ left join information_schema.table_constraints tc\n+ on tc.constraint_name=ccu.constraint_name\n+ and tc.table_catalog=c.TABLE_CATALOG and tc.table_name=c.table_name and constraint_type = 'PRIMARY KEY' WHERE c.TABLE_CATALOG = '${database}' AND c.table_name = '${view?view:table}' ORDER BY ORDINAL_POSITION;`;\n}\nshowTriggers(database: string): string {\nreturn `SELECT TRIGGER_NAME FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA = '${database}'`;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/vue/result/view.css",
"new_path": "src/vue/result/view.css",
"diff": "@@ -49,6 +49,7 @@ body {\n.el-input.is-disabled input{\nborder: none !important;\n+user-select: all;\n}\n.plx-header--column.col--ellipsis>.plx-cell .plx-cell--title{\n"
}
] |
TypeScript
|
MIT License
|
cweijan/vscode-database-client
|
Support show primary key.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.