Skip to content

Commit 9029619

Browse files
janfhjanfh
committed
Merge remote-tracking branch 'origin/main' into feature/rpg-codegen
# Conflicts: # package-lock.json
2 parents de78996 + 3d61ddf commit 9029619

File tree

5 files changed

+144
-28
lines changed

5 files changed

+144
-28
lines changed

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,58 @@
749749
"command": "vscode-db2i.setSchemaFilter",
750750
"when": "never"
751751
},
752+
{
753+
"command": "vscode-db2i.generateSQL",
754+
"when": "never"
755+
},
756+
{
757+
"command": "vscode-db2i.getRelatedObjects",
758+
"when": "never"
759+
},
760+
{
761+
"command": "vscode-db2i.getMTIs",
762+
"when": "never"
763+
},
764+
{
765+
"command": "vscode-db2i.getIndexes",
766+
"when": "never"
767+
},
768+
{
769+
"command": "vscode-db2i.getAuthorities",
770+
"when": "never"
771+
},
772+
{
773+
"command": "vscode-db2i.getObjectLocks",
774+
"when": "never"
775+
},
776+
{
777+
"command": "vscode-db2i.getRecordLocks",
778+
"when": "never"
779+
},
780+
{
781+
"command": "vscode-db2i.clearData",
782+
"when": "never"
783+
},
784+
{
785+
"command": "vscode-db2i.copyData",
786+
"when": "never"
787+
},
788+
{
789+
"command": "vscode-db2i.deleteObject",
790+
"when": "never"
791+
},
792+
{
793+
"command": "vscode-db2i.renameObject",
794+
"when": "never"
795+
},
796+
{
797+
"command": "vscode-db2i.advisedIndexes",
798+
"when": "never"
799+
},
800+
{
801+
"command": "vscode-db2i.clearAdvisedIndexes",
802+
"when": "never"
803+
},
752804
{
753805
"command": "vscode-db2i.resultset.settings",
754806
"when": "never"

‎src/connection/manager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ export class SQLJobManager {
3535
"full open": false,
3636
"transaction isolation": "none",
3737
"query optimize goal": "1",
38-
"block size": "512"
38+
"block size": "512",
39+
"date format": "iso",
40+
"extended metadata": true,
3941
}));
4042

4143
try {

‎src/views/results/html.ts

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -434,31 +434,7 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
434434
columnMetaData.map(column => {
435435
var cell = headerRow.insertCell();
436436
cell.appendChild(document.createTextNode(columnHeadings === 'Label' ? column.label : column.name));
437-
switch (column.type) {
438-
case 'CHAR':
439-
case 'VARCHAR':
440-
case 'CLOB':
441-
case 'BINARY':
442-
case 'VARBINARY':
443-
case 'BLOB':
444-
case 'GRAPHIC':
445-
case 'VARGRAPHIC':
446-
case 'DBCLOB':
447-
case 'NCHAR':
448-
case 'NVARCHAR':
449-
case 'NCLOB':
450-
case 'FLOAT':
451-
case 'DECFLOAT':
452-
case 'DATALINK':
453-
cell.title = column.type + '(' + column.precision + ')';
454-
break;
455-
case 'DECIMAL':
456-
case 'NUMERIC':
457-
cell.title = column.type + '(' + column.precision + ', ' + column.scale + ')';
458-
break;
459-
default:
460-
cell.title = column.type;
461-
}
437+
cell.title = getTooltip(column, columnHeadings);
462438
});
463439
464440
// Initialize the footer
@@ -537,9 +513,43 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
537513
var headerCells = document.getElementById(htmlTableId).getElementsByTagName('thead')[0].rows[0].cells;
538514
for (let x = 0; x < headerCells.length; ++x) {
539515
headerCells[x].innerText = columnHeadings === 'Label' ? columnMetaData[x].label : columnMetaData[x].name;
516+
headerCells[x].title = getTooltip(columnMetaData[x], columnHeadings);
540517
}
541518
}
542519
}
520+
521+
function getTooltip(column, columnHeadings) {
522+
let title = '';
523+
switch (column.type) {
524+
case 'CHAR':
525+
case 'VARCHAR':
526+
case 'CLOB':
527+
case 'BINARY':
528+
case 'VARBINARY':
529+
case 'BLOB':
530+
case 'GRAPHIC':
531+
case 'VARGRAPHIC':
532+
case 'DBCLOB':
533+
case 'NCHAR':
534+
case 'NVARCHAR':
535+
case 'NCLOB':
536+
case 'FLOAT':
537+
case 'DECFLOAT':
538+
case 'DATALINK':
539+
title = column.type + '(' + column.precision + ')';
540+
break;
541+
case 'DECIMAL':
542+
case 'NUMERIC':
543+
title = column.type + '(' + column.precision + ', ' + column.scale + ')';
544+
break;
545+
default:
546+
title = column.type;
547+
}
548+
title += \`\\n\`;
549+
title += columnHeadings === 'Label' ? column.name : column.label;
550+
return title;
551+
}
552+
543553
</script>
544554
</head>
545555
<body style="padding: 0;">

‎src/views/schemaBrowser/contributes.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,58 @@
122122
{
123123
"command": "vscode-db2i.setSchemaFilter",
124124
"when": "never"
125+
},
126+
{
127+
"command": "vscode-db2i.generateSQL",
128+
"when": "never"
129+
},
130+
{
131+
"command": "vscode-db2i.getRelatedObjects",
132+
"when": "never"
133+
},
134+
{
135+
"command": "vscode-db2i.getMTIs",
136+
"when": "never"
137+
},
138+
{
139+
"command": "vscode-db2i.getIndexes",
140+
"when": "never"
141+
},
142+
{
143+
"command": "vscode-db2i.getAuthorities",
144+
"when": "never"
145+
},
146+
{
147+
"command": "vscode-db2i.getObjectLocks",
148+
"when": "never"
149+
},
150+
{
151+
"command": "vscode-db2i.getRecordLocks",
152+
"when": "never"
153+
},
154+
{
155+
"command": "vscode-db2i.clearData",
156+
"when": "never"
157+
},
158+
{
159+
"command": "vscode-db2i.copyData",
160+
"when": "never"
161+
},
162+
{
163+
"command": "vscode-db2i.deleteObject",
164+
"when": "never"
165+
},
166+
{
167+
"command": "vscode-db2i.renameObject",
168+
"when": "never"
169+
},
170+
{
171+
"command": "vscode-db2i.advisedIndexes",
172+
"when": "never"
173+
},
174+
{
175+
"command": "vscode-db2i.clearAdvisedIndexes",
176+
"when": "never"
125177
}
126178
],
127179
"view/title": [

0 commit comments

Comments
 (0)