From 0d605eb4c5bf2fc04e6ceb0f8c35681d6803399f Mon Sep 17 00:00:00 2001
From: serge-rider <serge.rider@gmail.com>
Date: Wed, 21 Dec 2016 12:42:59 +0300
Subject: [PATCH] #1082 PG procedures parameter names fix

Former-commit-id: ac2a0cd8cdd5177940771d8d463a3a224256b4c4
---
 .../dbeaver/ext/postgresql/model/PostgreProcedure.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
index cc2966eeb6..1dd2dd35ee 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
@@ -120,8 +120,8 @@ public class PostgreProcedure extends AbstractProcedure<PostgreDataSource, Postg
         this.estRows = JDBCUtils.safeGetFloat(dbResult, "prorows");
 
         Long[] allArgTypes = JDBCUtils.safeGetArray(dbResult, "proallargtypes");
+        String[] argNames = JDBCUtils.safeGetArray(dbResult, "proargnames");
         if (!ArrayUtils.isEmpty(allArgTypes)) {
-            String[] argNames = JDBCUtils.safeGetArray(dbResult, "proargnames");
             String[] argModes = JDBCUtils.safeGetArray(dbResult, "proargmodes");
 
             for (int i = 0; i < allArgTypes.length; i++) {
@@ -161,7 +161,8 @@ public class PostgreProcedure extends AbstractProcedure<PostgreDataSource, Postg
                         continue;
                     }
                     //String paramName = argNames == null || argNames.length < inArg
-                    String paramName = "$" + (i + 1);
+                    //String paramName = "$" + (i + 1);
+                    String paramName = argNames == null || argNames.length < inArgTypes.length ? "$" + (i + 1) : argNames[i];
                     PostgreProcedureParameter param = new PostgreProcedureParameter(this, paramName, dataType, DBSProcedureParameterKind.IN, i + 1);
                     params.add(param);
                 }
@@ -398,7 +399,7 @@ public class PostgreProcedure extends AbstractProcedure<PostgreDataSource, Postg
 
     @Override
     public String toString() {
-        return overloadedName;
+        return overloadedName == null ? name : overloadedName;
     }
 
 }
-- 
GitLab