From 9b397beff0aed8f2a2a88f547cd08d40a21e0796 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 13 Nov 2014 18:41:14 +0000
Subject: [PATCH] Pass column or argument name to NativeToNamedColumnType(), as
 a hint for the user.

---
 out/locale/en/LC_MESSAGES/default.po | 12 ++++++++----
 source/dbconnection.pas              | 25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index 337c26da..b4befb44 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\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"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
 "language/en/)\n"
@@ -5811,6 +5811,10 @@ msgstr "Skip"
 msgid "Characterset"
 msgstr "Characterset"
 
-#. Error happening when facing unknown native column types, mainly in PostgreSQL
-msgid "Unknown column type oid #%d."
-msgstr "Unknown column type oid #%d."
+#. Error happening when facing unknown native data types, mainly in PostgreSQL tables and routines.
+msgid "Unknown datatype oid #%d. Fall back to %s."
+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."
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index fc632889..8f7b9b15 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -347,7 +347,7 @@ type
       function ExtractIdentifier(var SQL: String): String;
       procedure ClearCache(IncludeDBObjects: Boolean);
       procedure FetchDbObjects(db: String; var Cache: TDBObjectList); virtual; abstract;
-      function NativeToNamedColumnType(NativeType: Integer): TDBDatatype;
+      function NativeToNamedColumnType(NativeType: Integer; Identifier: String=''): TDBDatatype;
       procedure SetObjectNamesInSelectedDB;
       procedure SetLockedByThread(Value: TThread); virtual;
       procedure KeepAliveTimerEvent(Sender: TObject);
@@ -2537,7 +2537,7 @@ end;
 function TDBConnection.GetCreateCode(Database, Schema, Name: String; NodeType: TListNodeType): String;
 var
   Cols, Keys, ProcDetails: TDBQuery;
-  ConstraintName, MaxLen: String;
+  ConstraintName, MaxLen, ArgDataType: String;
   ColNames, ArgNames, ArgTypes, Arguments: TStringList;
   Rows: TStringList;
   i: Integer;
@@ -2717,12 +2717,16 @@ begin
             'AND '+QuoteIdent('p')+'.'+QuoteIdent('proname')+'='+EscapeString(Name)
             );
           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;
           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;
-          Result := Result + '(' + implodestr(',', Arguments) + ') '+
+          Result := Result + '(' + implodestr(', ', Arguments) + ') '+
             'RETURNS '+NativeToNamedColumnType(MakeInt(ProcDetails.Col('prorettype'))).Name+' '+
             'AS $$ '+ProcDetails.Col('prosrc')+' $$'
             // TODO: 'LANGUAGE SQL IMMUTABLE STRICT'
@@ -4239,7 +4243,7 @@ begin
 end;
 
 
-function TDBConnection.NativeToNamedColumnType(NativeType: Integer): TDBDatatype;
+function TDBConnection.NativeToNamedColumnType(NativeType: Integer; Identifier: String=''): TDBDatatype;
 var
   i: Integer;
   rx: TRegExpr;
@@ -4258,9 +4262,12 @@ begin
     end;
   end;
   if not TypeFound then begin
-    // Fall back to text type
+    // Fall back to unknown type
     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;
 
@@ -5231,7 +5238,7 @@ begin
         FColumnOrgNames.Add(FColumnNames[FColumnNames.Count-1]);
         FieldTypeOID :=  PQftype(LastResult, i);
         TypeFound := False;
-        FColumnTypes[i] := FConnection.NativeToNamedColumnType(FieldTypeOID);
+        FColumnTypes[i] := FConnection.NativeToNamedColumnType(FieldTypeOID, FColumnNames[FColumnNames.Count-1]);
       end;
       rx.Free;
       FRecNo := -1;