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

Pass column or argument name to NativeToNamedColumnType(), as a hint for the user.

Browse Source
This commit is contained in:
Ansgar Becker
2014-11-13 18:41:14 +00:00
parent eeb571464a
commit 9b397beff0
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
out/locale/en/LC_MESSAGES/default.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: HeidiSQL\n" "Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n" "POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2014-10-26 11:35+0100\n" "PO-Revision-Date: 2014-11-13 19:40+0100\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n" "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/" "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
"language/en/)\n" "language/en/)\n"
@ -5811,6 +5811,10 @@ msgstr "Skip"
msgid "Characterset" msgid "Characterset"
msgstr "Characterset" msgstr "Characterset"
#. Error happening when facing unknown native column types, mainly in PostgreSQL #. Error happening when facing unknown native data types, mainly in PostgreSQL tables and routines.
msgid "Unknown column type oid #%d." msgid "Unknown datatype oid #%d. Fall back to %s."
msgstr "Unknown column type oid #%d." msgstr "Unknown datatype oid #%d. Fall back to %s."
#. Error happening when facing unknown native data types, mainly in PostgreSQL tables and routines. Name of column or argument passed here as a hint for the user.
msgid "Unknown datatype oid #%d for \"%s\". Fall back to %s."
msgstr "Unknown datatype oid #%d for \"%s\". Fall back to %s."

25
source/dbconnection.pas
View File

@ -347,7 +347,7 @@ type
function ExtractIdentifier(var SQL: String): String; function ExtractIdentifier(var SQL: String): String;
procedure ClearCache(IncludeDBObjects: Boolean); procedure ClearCache(IncludeDBObjects: Boolean);
procedure FetchDbObjects(db: String; var Cache: TDBObjectList); virtual; abstract; procedure FetchDbObjects(db: String; var Cache: TDBObjectList); virtual; abstract;
function NativeToNamedColumnType(NativeType: Integer): TDBDatatype; function NativeToNamedColumnType(NativeType: Integer; Identifier: String=''): TDBDatatype;
procedure SetObjectNamesInSelectedDB; procedure SetObjectNamesInSelectedDB;
procedure SetLockedByThread(Value: TThread); virtual; procedure SetLockedByThread(Value: TThread); virtual;
procedure KeepAliveTimerEvent(Sender: TObject); procedure KeepAliveTimerEvent(Sender: TObject);
@ -2537,7 +2537,7 @@ end;
function TDBConnection.GetCreateCode(Database, Schema, Name: String; NodeType: TListNodeType): String; function TDBConnection.GetCreateCode(Database, Schema, Name: String; NodeType: TListNodeType): String;
var var
Cols, Keys, ProcDetails: TDBQuery; Cols, Keys, ProcDetails: TDBQuery;
ConstraintName, MaxLen: String; ConstraintName, MaxLen, ArgDataType: String;
ColNames, ArgNames, ArgTypes, Arguments: TStringList; ColNames, ArgNames, ArgTypes, Arguments: TStringList;
Rows: TStringList; Rows: TStringList;
i: Integer; i: Integer;
@ -2717,12 +2717,16 @@ begin
'AND '+QuoteIdent('p')+'.'+QuoteIdent('proname')+'='+EscapeString(Name) 'AND '+QuoteIdent('p')+'.'+QuoteIdent('proname')+'='+EscapeString(Name)
); );
ArgNames := Explode(',', Copy(ProcDetails.Col('proargnames'), 2, Length(ProcDetails.Col('proargnames'))-2)); ArgNames := Explode(',', Copy(ProcDetails.Col('proargnames'), 2, Length(ProcDetails.Col('proargnames'))-2));
ArgTypes := Explode(',', Copy(ProcDetails.Col('proargtypes'), 2, Length(ProcDetails.Col('proargtypes'))-2)); ArgTypes := Explode(' ', Copy(ProcDetails.Col('proargtypes'), 2, Length(ProcDetails.Col('proargtypes'))-2));
Arguments := TStringList.Create; Arguments := TStringList.Create;
for i:=0 to ArgNames.Count-1 do begin for i:=0 to ArgNames.Count-1 do begin
Arguments.Add(ArgNames[i] + ' ' + NativeToNamedColumnType(MakeInt(ArgTypes[i])).Name); if ArgTypes.Count > i then
ArgDataType := NativeToNamedColumnType(MakeInt(ArgTypes[i]), ArgNames[i]).Name
else
ArgDataType := '';
Arguments.Add(ArgNames[i] + ' ' + ArgDataType);
end; end;
Result := Result + '(' + implodestr(',', Arguments) + ') '+ Result := Result + '(' + implodestr(', ', Arguments) + ') '+
'RETURNS '+NativeToNamedColumnType(MakeInt(ProcDetails.Col('prorettype'))).Name+' '+ 'RETURNS '+NativeToNamedColumnType(MakeInt(ProcDetails.Col('prorettype'))).Name+' '+
'AS $$ '+ProcDetails.Col('prosrc')+' $$' 'AS $$ '+ProcDetails.Col('prosrc')+' $$'
// TODO: 'LANGUAGE SQL IMMUTABLE STRICT' // TODO: 'LANGUAGE SQL IMMUTABLE STRICT'
@ -4239,7 +4243,7 @@ begin
end; end;
function TDBConnection.NativeToNamedColumnType(NativeType: Integer): TDBDatatype; function TDBConnection.NativeToNamedColumnType(NativeType: Integer; Identifier: String=''): TDBDatatype;
var var
i: Integer; i: Integer;
rx: TRegExpr; rx: TRegExpr;
@ -4258,9 +4262,12 @@ begin
end; end;
end; end;
if not TypeFound then begin if not TypeFound then begin
// Fall back to text type // Fall back to unknown type
Result := Datatypes[0]; Result := Datatypes[0];
Log(lcError, f_('Unknown column type oid #%d.', [NativeType])); if Identifier <> '' then
Log(lcError, f_('Unknown datatype oid #%d for "%s". Fall back to %s.', [NativeType, Identifier, Result.Name]))
else
Log(lcError, f_('Unknown datatype oid #%d. Fall back to %s.', [NativeType, Result.Name]));
end; end;
end; end;
@ -5231,7 +5238,7 @@ begin
FColumnOrgNames.Add(FColumnNames[FColumnNames.Count-1]); FColumnOrgNames.Add(FColumnNames[FColumnNames.Count-1]);
FieldTypeOID := PQftype(LastResult, i); FieldTypeOID := PQftype(LastResult, i);
TypeFound := False; TypeFound := False;
FColumnTypes[i] := FConnection.NativeToNamedColumnType(FieldTypeOID); FColumnTypes[i] := FConnection.NativeToNamedColumnType(FieldTypeOID, FColumnNames[FColumnNames.Count-1]);
end; end;
rx.Free; rx.Free;
FRecNo := -1; FRecNo := -1;