added custom types for sp

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

@@ -108,6 +108,8 @@ public class DataSourcesDataAccess {
                 dataSourceDbo.addStoredProcedure(spDbo);
                 DataHolder<Integer> position = new DataHolder<>();
                 position.data = 0;
+                TableDataSourceDbo returnType = new TableDataSourceDbo();
+                returnType.setName(spDbo.getName());
                 sp.getArguments().forEach(o ->
                 {
                     SqlTypeDbo sqlTypeDbo = new SqlTypeDbo();
@@ -116,8 +118,6 @@ public class DataSourcesDataAccess {
 
                     DasArgument.Direction dir = o.getArgumentDirection();
 
-
-
                     if (dir.isReturnOrResult()) {
                         spDbo.setSqlType(sqlTypeDbo);
                     }
@@ -125,14 +125,33 @@ public class DataSourcesDataAccess {
                         StoredProcedureArgDbo argDbo = new StoredProcedureArgDbo();
                         argDbo.setName(o.getName().isEmpty() ? "arg" + position.data : o.getName());
                         argDbo.setSqlType(sqlTypeDbo);
-                        argDbo.setOut(o.getArgumentDirection().isOut());
                         spDbo.addArgument(argDbo);
                         ++position.data;
                     }
+                    if (dir.isOut()) {
+                        ColumnDataSourceDbo field = new ColumnDataSourceDbo();
+                        field.setSelected(true);
+                        field.setPrimary(false);
+                        field.setDefaultValue(null);
+                        field.setNotNull(false);
+                        field.setName(o.getName());
+                        field.setSqlType(sqlTypeDbo);
+                        returnType.addColumn(field);
+                    }
                 });
-//                DasArgument arg = sp.getReturnArgument();
-//                if (arg != null)
-//                    arg.toString();
+                if (returnType.getColumns().size() > 1) {
+                    boolean isSetOf = sp.getReturnArgument().getDataType().typeName.startsWith("setof ");
+                    SqlTypeDbo sqlTypeDbo = new SqlTypeDbo();
+                    sqlTypeDbo.setType((isSetOf ? "setof " : "" ) + returnType.getName());
+                    sqlTypeDbo.setVagueArg(null);
+                    spDbo.setSqlType(sqlTypeDbo);
+                    dataSourceDbo.addType(returnType);
+                }
+                else {
+                    DasArgument returnArg = sp.getReturnArgument();
+                    if (returnArg != null) {
+                    }
+                }
             }
         });
         return dataSourceDbo;

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

@@ -91,7 +91,7 @@ public abstract class Generator {
             }
         }
         if (typeName == null) {
-            TableDataSourceDbo table = dataSourceDbo.findTable(sqlTypeName);
+            TableDataSourceDbo table = dataSourceDbo.findTypeOrTable(sqlTypeName);
             if (table == null) {
                 typeName = types.get("*").get("*");
             }
@@ -128,7 +128,7 @@ public abstract class Generator {
     public static void convertOptions(GenerateOptions options, TypesCastOptions types)
     {
 
-        for (TableDataSourceDbo table : options.getDataSource().getTables())
+        for (TableDataSourceDbo table : options.getDataSource().getTablesAndTypes())
         {
             for (ColumnDataSourceDbo column : table.getColumns())
             {
@@ -267,7 +267,7 @@ public abstract class Generator {
         convertOptions(options, types);
 
         generateFile(dataSourceTemplateAbsolutePath, dataSourceAbsolutePath, options.getDataSource(), null, types);
-        for (TableDataSourceDbo table : options.getDataSource().getTables()) {
+        for (TableDataSourceDbo table : options.getDataSource().getTablesAndTypes()) {
             if (table.hasAny()) {
                 String filename = modelsAbsolutePath + File.separator + table.getName() + "." + options.getFilesExtension();
                 generateFile(modelsTemplateAbsolutePath, filename, options.getDataSource(), table, types);

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

@@ -12,6 +12,8 @@ public class DataSourceDbo {
 
     private List<TableDataSourceDbo> _tables = new Vector<>();
 
+    private List<TableDataSourceDbo> _types = new Vector<>();
+
     private List<StoredProcedureDbo> _storedProcedures = new Vector<>();
 
     public List<StoredProcedureDbo> getStoredProcedures() {
@@ -38,6 +40,21 @@ public class DataSourceDbo {
         _tables.add(table);
     }
 
+    public List<TableDataSourceDbo> getTypes() {
+        return _types;
+    }
+
+    public List<TableDataSourceDbo> getTablesAndTypes() {
+        List<TableDataSourceDbo> all = new Vector<>();
+        all.addAll(_tables);
+        all.addAll(_types);
+        return all;
+    }
+
+    public void addType(TableDataSourceDbo types) {
+        _types.add(types);
+    }
+
     public TableDataSourceDbo findTable(String name)
     {
         for (TableDataSourceDbo table : _tables) {
@@ -48,6 +65,25 @@ public class DataSourceDbo {
         return null;
     }
 
+    public TableDataSourceDbo findType(String name)
+    {
+        for (TableDataSourceDbo table : _types) {
+            if (table.getName().equals(name)) {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    public TableDataSourceDbo findTypeOrTable(String name)
+    {
+        TableDataSourceDbo type = findType(name);
+        if (type == null) {
+            return findTable(name);
+        }
+        return type;
+    }
+
     public StoredProcedureDbo findStoredProcedure(String name)
     {
         for (StoredProcedureDbo sp : _storedProcedures) {

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

@@ -9,8 +9,6 @@ public class StoredProcedureArgDbo {
 
     private SqlTypeDbo _sqlType;
 
-    private boolean _isOut;
-
     public String getName() {
         return name;
     }
@@ -30,12 +28,4 @@ public class StoredProcedureArgDbo {
     public void setSqlType(SqlTypeDbo sqlType) {
         _sqlType = sqlType;
     }
-
-    public boolean isOut() {
-        return _isOut;
-    }
-
-    public void setOut(boolean out) {
-        _isOut = out;
-    }
 }