opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix always empty comment on PostgreSQL columns. Closes #859

Browse Source
This commit is contained in:
Ansgar Becker
2020-01-20 19:48:01 +01:00
parent d5e5a8292d
commit c76695c0d8
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/dbconnection.pas
View File

@ -601,6 +601,7 @@ type
function GetRowCount(Obj: TDBObject): Int64; override; function GetRowCount(Obj: TDBObject): Int64; override;
property LastRawResults: TPGRawResults read FLastRawResults; property LastRawResults: TPGRawResults read FLastRawResults;
property RegClasses: TOidStringPairs read FRegClasses; property RegClasses: TOidStringPairs read FRegClasses;
function GetTableColumns(Table: TDBObject): TTableColumnList; override;
function GetTableKeys(Table: TDBObject): TTableKeyList; override; function GetTableKeys(Table: TDBObject): TTableKeyList; override;
end; end;
@ -4671,7 +4672,7 @@ var
TableCol: TTableColumn; TableCol: TTableColumn;
begin begin
Result := inherited; Result := inherited;
// Comments in MSSQL. See http://www.heidisql.com/forum.php?t=19576 // Column comments in MSSQL. See http://www.heidisql.com/forum.php?t=19576
try try
Comments := GetResults('SELECT c.name AS '+QuoteIdent('column')+', prop.value AS '+QuoteIdent('comment')+' '+ Comments := GetResults('SELECT c.name AS '+QuoteIdent('column')+', prop.value AS '+QuoteIdent('comment')+' '+
'FROM sys.extended_properties AS prop '+ 'FROM sys.extended_properties AS prop '+
@ -4698,6 +4699,34 @@ begin
end; end;
function TPgConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
var
Comments: TDBQuery;
TableCol: TTableColumn;
begin
Result := inherited;
// Column comments in Postgre. See issue #859
// Todo: add current schema to WHERE clause?
Comments := GetResults('SELECT a.attname AS column, des.description AS comment'+
' FROM pg_attribute AS a, pg_description AS des, pg_class AS pgc'+
' WHERE'+
' pgc.oid = a.attrelid'+
' AND des.objoid = pgc.oid'+
' AND pg_table_is_visible(pgc.oid)'+
' AND pgc.relname = '+EscapeString(Table.Name)+
' AND a.attnum = des.objsubid'
);
while not Comments.Eof do begin
for TableCol in Result do begin
if TableCol.Name = Comments.Col('column') then begin
TableCol.Comment := Comments.Col('comment');
Break;
end;
end;
Comments.Next;
end;
end;
function TSQLiteConnection.GetTableColumns(Table: TDBObject): TTableColumnList; function TSQLiteConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
var var
ColQuery: TDBQuery; ColQuery: TDBQuery;