fixed sp generation

TODO

@@ -1,5 +1,4 @@
-proc stock
 many to many
 table inheritance
-generate custom types (sp return)
-UI for sp dataSource
+variadic sp
+inout sp arguments

src/com/rthoni/intellij/codefromds/DataAccess/DataSourcesDataAccess.java

@@ -51,9 +51,10 @@ public class DataSourcesDataAccess {
                 columnDataSourceDbo.data.setName(column.getName());
                 columnDataSourceDbo.data.setNotNull(column.isNotNull());
                 SqlTypeDbo type = new SqlTypeDbo();
-                type.setType(column.getDataType().typeName);
+                type.setName(column.getDataType().typeName);
+                type.guessArrayAndSetOf();
                 type.setVagueArg(column.getDataType().vagueArg);
-                columnDataSourceDbo.data.setSqlType(type);
+                columnDataSourceDbo.data.setType(type);
                 columnDataSourceDbo.data.setDefaultValue(column.getDefault());
                 columnDataSourceDbo.data.setPrimary(DasUtil.isPrimary(column));
                 tableDataSourceDbo.data.addColumn(columnDataSourceDbo.data);
@@ -113,18 +114,19 @@ public class DataSourcesDataAccess {
                 sp.getArguments().forEach(o ->
                 {
                     SqlTypeDbo sqlTypeDbo = new SqlTypeDbo();
-                    sqlTypeDbo.setType(o.getDataType().typeName);
+                    sqlTypeDbo.setName(o.getDataType().typeName);
+                    sqlTypeDbo.guessArrayAndSetOf();
                     sqlTypeDbo.setVagueArg(o.getDataType().vagueArg);
 
                     DasArgument.Direction dir = o.getArgumentDirection();
 
                     if (dir.isReturnOrResult()) {
-                        spDbo.setSqlType(sqlTypeDbo);
+                        spDbo.setType(sqlTypeDbo);
                     }
                     if (dir.isIn()) {
                         StoredProcedureArgDbo argDbo = new StoredProcedureArgDbo();
                         argDbo.setName(o.getName().isEmpty() ? "arg" + position.data : o.getName());
-                        argDbo.setSqlType(sqlTypeDbo);
+                        argDbo.setType(sqlTypeDbo);
                         spDbo.addArgument(argDbo);
                         ++position.data;
                     }
@@ -135,23 +137,19 @@ public class DataSourcesDataAccess {
                         field.setDefaultValue(null);
                         field.setNotNull(false);
                         field.setName(o.getName());
-                        field.setSqlType(sqlTypeDbo);
+                        field.setType(sqlTypeDbo);
                         returnType.addColumn(field);
                     }
                 });
                 if (returnType.getColumns().size() > 1) {
                     boolean isSetOf = sp.getReturnArgument().getDataType().typeName.startsWith("setof ");
                     SqlTypeDbo sqlTypeDbo = new SqlTypeDbo();
-                    sqlTypeDbo.setType((isSetOf ? "setof " : "" ) + returnType.getName());
+                    sqlTypeDbo.setName((isSetOf ? "setof " : "" ) + returnType.getName());
+                    sqlTypeDbo.guessArrayAndSetOf();
                     sqlTypeDbo.setVagueArg(null);
-                    spDbo.setSqlType(sqlTypeDbo);
+                    spDbo.setType(sqlTypeDbo);
                     dataSourceDbo.addType(returnType);
                 }
-                else {
-                    DasArgument returnArg = sp.getReturnArgument();
-                    if (returnArg != null) {
-                    }
-                }
             }
         });
         return dataSourceDbo;

src/com/rthoni/intellij/codefromds/business/Generator.java

@@ -71,9 +71,9 @@ public abstract class Generator {
         if (type == null) {
             return;
         }
-        boolean isArray = type.getType().endsWith("[]");
-        boolean isSetOf = type.getType().startsWith("setof ");
-        String sqlTypeName = isArray ? type.getType().substring(0, type.getType().length() - 2) : type.getType();
+        boolean isArray = type.isArray();
+        boolean isSetOf = type.isSetOf();
+        String sqlTypeName = isArray ? type.getName().substring(0, type.getName().length() - 2) : type.getName();
         if (isSetOf)
         {
             sqlTypeName = sqlTypeName.substring(6);
@@ -96,16 +96,18 @@ public abstract class Generator {
                 typeName = types.get("*").get("*");
             }
             else {
+                type.setLanguageType(table);
                 typeName = table.getName();
             }
         }
+        type.setLanguageBaseTypeName(typeName);
         if (isArray) {
             typeName = options.getArrayTemplate().replace("%t", typeName);
         }
         if (isSetOf) {
             typeName = options.getSetOfTemplate().replace("%t", typeName);
         }
-        type.setLanguageType(typeName);
+        type.setLanguageTypeName(typeName);
         type.setLanguageTypeNotNull(options.getNonNullableTypes().contains(typeName));
     }
 
@@ -132,15 +134,15 @@ public abstract class Generator {
         {
             for (ColumnDataSourceDbo column : table.getColumns())
             {
-                convertSqlType(column.getSqlType(), types, options.getDataSource());
+                convertSqlType(column.getType(), types, options.getDataSource());
             }
         }
 
         for (StoredProcedureDbo spDbo : options.getDataSource().getStoredProcedures())
         {
-            convertSqlType(spDbo.getSqlType(), types, options.getDataSource());
+            convertSqlType(spDbo.getType(), types, options.getDataSource());
             for (StoredProcedureArgDbo arg : spDbo.getArguments()) {
-                convertSqlType(arg.getSqlType(), types, options.getDataSource());
+                convertSqlType(arg.getType(), types, options.getDataSource());
             }
         }
     }

src/com/rthoni/intellij/codefromds/dbo/template/ColumnDataSourceDbo.java

@@ -11,7 +11,7 @@ public class ColumnDataSourceDbo {
 
     private boolean _isSelected;
 
-    private SqlTypeDbo _sqlType;
+    private SqlTypeDbo _type;
 
     private boolean _notNull;
 
@@ -41,16 +41,12 @@ public class ColumnDataSourceDbo {
         _isSelected = selected;
     }
 
-    public String getType() {
-        return _sqlType != null ? _sqlType.getLanguageType() : null;
+    public SqlTypeDbo getType() {
+        return _type;
     }
 
-    public SqlTypeDbo getSqlType() {
-        return _sqlType;
-    }
-
-    public void setSqlType(SqlTypeDbo sqlType) {
-        _sqlType = sqlType;
+    public void setType(SqlTypeDbo type) {
+        _type = type;
     }
 
     public boolean isNotNull() {
@@ -62,7 +58,7 @@ public class ColumnDataSourceDbo {
     }
 
     public boolean isTypeNotNull() {
-        return _sqlType != null && _sqlType.isLanguageTypeNotNull();
+        return _type != null && _type.isLanguageTypeNotNull();
     }
 
     public String getDefaultValue() {

src/com/rthoni/intellij/codefromds/dbo/template/SqlTypeDbo.java

@@ -5,20 +5,50 @@ package com.rthoni.intellij.codefromds.dbo.template;
  */
 public class SqlTypeDbo {
 
-    private String _type;
+    private String _name;
 
     private String vagueArg;
 
-    private String _languageType;
+    private boolean _isArray;
+
+    private boolean _isSetOf;
+
+    private String _languageTypeName;
+
+    private String _languageBaseTypeName;
+
+    private TableDataSourceDbo _languageType;
 
     private boolean _languageTypeNotNull;
 
-    public String getType() {
-        return _type;
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public boolean isArray() {
+        return _isArray;
+    }
+
+    public void setArray(boolean array) {
+        _isArray = array;
+    }
+
+    public boolean isSetOf() {
+        return _isSetOf;
+    }
+
+    public void setSetOf(boolean setOf) {
+        _isSetOf = setOf;
     }
 
-    public void setType(String type) {
-        _type = type;
+    public void guessArrayAndSetOf()
+    {
+        setArray(_name.endsWith("[]"));
+        setSetOf(_name.startsWith("setof "));
     }
 
     public String getVagueArg() {
@@ -29,11 +59,19 @@ public class SqlTypeDbo {
         this.vagueArg = vagueArg;
     }
 
-    public String getLanguageType() {
+    public String getLanguageTypeName() {
+        return _languageTypeName;
+    }
+
+    public void setLanguageTypeName(String languageTypeName) {
+        _languageTypeName = languageTypeName;
+    }
+
+    public TableDataSourceDbo getLanguageType() {
         return _languageType;
     }
 
-    public void setLanguageType(String languageType) {
+    public void setLanguageType(TableDataSourceDbo languageType) {
         _languageType = languageType;
     }
 
@@ -44,4 +82,12 @@ public class SqlTypeDbo {
     public void setLanguageTypeNotNull(boolean languageTypeNotNull) {
         _languageTypeNotNull = languageTypeNotNull;
     }
+
+    public String getLanguageBaseTypeName() {
+        return _languageBaseTypeName;
+    }
+
+    public void setLanguageBaseTypeName(String languageBaseTypeName) {
+        _languageBaseTypeName = languageBaseTypeName;
+    }
 }

src/com/rthoni/intellij/codefromds/dbo/template/StoredProcedureArgDbo.java

@@ -7,7 +7,7 @@ public class StoredProcedureArgDbo {
 
     private String name;
 
-    private SqlTypeDbo _sqlType;
+    private SqlTypeDbo _type;
 
     public String getName() {
         return name;
@@ -17,15 +17,11 @@ public class StoredProcedureArgDbo {
         this.name = name;
     }
 
-    public String getType() {
-        return _sqlType != null ? _sqlType.getLanguageType() : null;
+    public SqlTypeDbo getType() {
+        return _type;
     }
 
-    public SqlTypeDbo getSqlType() {
-        return _sqlType;
-    }
-
-    public void setSqlType(SqlTypeDbo sqlType) {
-        _sqlType = sqlType;
+    public void setType(SqlTypeDbo type) {
+        _type = type;
     }
 }

src/com/rthoni/intellij/codefromds/dbo/template/StoredProcedureDbo.java

@@ -12,7 +12,7 @@ public class StoredProcedureDbo {
 
     private List<StoredProcedureArgDbo> _arguments = new Vector<>();
 
-    private SqlTypeDbo _sqlType;
+    private SqlTypeDbo _type;
 
     private boolean _isSelected;
 
@@ -34,16 +34,12 @@ public class StoredProcedureDbo {
         _arguments.add(arguments);
     }
 
-    public String getType() {
-        return _sqlType != null ? _sqlType.getLanguageType() : null;
+    public SqlTypeDbo getType() {
+        return _type;
     }
 
-    public SqlTypeDbo getSqlType() {
-        return _sqlType;
-    }
-
-    public void setSqlType(SqlTypeDbo sqlType) {
-        _sqlType = sqlType;
+    public void setType(SqlTypeDbo type) {
+        _type = type;
     }
 
     public boolean isSelected() {