sql type to language type

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

@@ -1,6 +1,7 @@
 package com.rthoni.intellij.codefromds.business;
 
 import com.intellij.database.model.DasForeignKey;
+import com.intellij.database.model.DataType;
 import com.intellij.database.model.MultiRef;
 import com.intellij.database.psi.DbDataSource;
 import com.intellij.database.util.DasUtil;
@@ -8,10 +9,12 @@ import com.intellij.openapi.project.Project;
 import com.rthoni.intellij.codefromds.dbo.options.ColumnSelection;
 import com.rthoni.intellij.codefromds.dbo.options.GenerateOptions;
 import com.rthoni.intellij.codefromds.dbo.options.TableSelection;
+import com.rthoni.intellij.codefromds.dbo.options.TypesCastOptions;
 import com.rthoni.intellij.codefromds.dbo.template.ColumnDataSourceDbo;
 import com.rthoni.intellij.codefromds.dbo.template.DataSourceDbo;
 import com.rthoni.intellij.codefromds.dbo.template.ForeignKeyDbo;
 import com.rthoni.intellij.codefromds.dbo.template.TableDataSourceDbo;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
@@ -44,7 +47,7 @@ public abstract class Generator {
 
     public static GenerateOptions loadOptions(String configPath) throws Exception
     {
-        String data = Files.readAllLines(Paths.get(configPath), StandardCharsets.UTF_8).stream().reduce("", (s1, s2) -> s1 + s2 + "\n");
+        String data = Helper.readFile(configPath);
 
         JSONObject obj = new JSONObject(data);
         String src = obj.getJSONObject("selection").getString("source");
@@ -81,32 +84,53 @@ public abstract class Generator {
         return dbo;
     }
 
-    public static ColumnDataSourceDbo convertColumn(ColumnSelection columnSelection)
+    public static ColumnDataSourceDbo convertColumn(ColumnSelection columnSelection, TypesCastOptions options)
     {
         ColumnDataSourceDbo dbo = new ColumnDataSourceDbo();
         dbo.setName(columnSelection.getColumn().getName());
         dbo.setPrimary(DasUtil.isPrimary(columnSelection.getColumn()));
         dbo.setSelected(columnSelection.isSelected());
+
+        DataType type = columnSelection.getColumn().getDataType();
+        boolean isArray = type.typeName.endsWith("[]");
+        String sqlTypeName = isArray ? type.typeName.substring(0, type.typeName.length() - 2) : type.typeName;
+        String typeName = type.typeName;
+        HashMap<String, HashMap<String, String>> types = options.getTypes();
+
+        if (types.containsKey(sqlTypeName)) {
+            HashMap<String, String> subtype = types.get(sqlTypeName);
+            if (subtype.containsKey(type.vagueArg)) {
+                typeName = subtype.get(type.vagueArg);
+            }
+            else if (subtype.containsKey("*")) {
+                typeName = subtype.get("*");
+            }
+        }
+        if (isArray) {
+            typeName = options.getArrayTemplate().replace("%t", typeName);
+        }
+        dbo.setType(typeName);
+
         return dbo;
     }
 
-    public static TableDataSourceDbo convertTable(TableSelection tableSelection)
+    public static TableDataSourceDbo convertTable(TableSelection tableSelection, TypesCastOptions types)
     {
         TableDataSourceDbo dbo = new TableDataSourceDbo();
         dbo.setName(tableSelection.getTable().getName());
-        dbo.setColumns(tableSelection.getColumns().stream().map(Generator::convertColumn).collect(Collectors.toList()));
+        dbo.setColumns(tableSelection.getColumns().stream().map(c -> convertColumn(c, types)).collect(Collectors.toList()));
         dbo.setPrimaryKeys(dbo.getColumns().stream().filter(ColumnDataSourceDbo::isPrimary).collect(Collectors.toList()));
         dbo.setHasAny(!tableSelection.hasNone());
         dbo.setTargetForeignKeys(new Vector<>());
         return dbo;
     }
 
-    public static DataSourceDbo convertOptions(GenerateOptions options)
+    public static DataSourceDbo convertOptions(GenerateOptions options, TypesCastOptions types)
     {
         DataSourceDbo dbo = new DataSourceDbo();
 
         dbo.setName(options.getSelection().getSource().getName());
-        dbo.setTables(options.getSelection().getTables().stream().map(Generator::convertTable).collect(Collectors.toList()));
+        dbo.setTables(options.getSelection().getTables().stream().map(t -> convertTable(t, types)).collect(Collectors.toList()));
 
         List<TableDataSourceDbo> tables = dbo.getTables();
         List<TableSelection> tableSelections = options.getSelection().getTables();
@@ -119,6 +143,36 @@ public abstract class Generator {
         return dbo;
     }
 
+    public static TypesCastOptions loadTypesCast(String file) throws IOException
+    {
+        TypesCastOptions dbo = new TypesCastOptions();
+        String data = Helper.readFile(file);
+
+        JSONObject obj = new JSONObject(data);
+        JSONObject objTypes = obj.getJSONObject("types");
+        HashMap<String, HashMap<String, String>> map = new HashMap<>();
+
+        for (String key : objTypes.keySet()) {
+            HashMap<String, String> typeMap = new HashMap<>();
+            String type = objTypes.optString(key);
+            JSONObject typeObject = objTypes.optJSONObject(key);
+            if (type != null) {
+                typeMap.put("*", type);
+            }
+            else if (typeObject != null) {
+                for (String subtype : typeObject.keySet()) {
+                    typeMap.put(subtype, typeObject.getString(subtype));
+                }
+            }
+            map.put(key, typeMap);
+        }
+        dbo.setTypes(map);
+
+        dbo.setArrayTemplate(obj.getString("arrayTemplate"));
+
+        return dbo;
+    }
+
     public static void generateFile(String templatePath, String outputFile, DataSourceDbo dataSource, TableDataSourceDbo table) throws IOException
     {
         String data = Helper.readFile(templatePath);
@@ -138,8 +192,11 @@ public abstract class Generator {
         String modelsAbsolutePath = Helper.getAbsolutePath(project, options.getModelsRelativePath());
         String dataSourceTemplateAbsolutePath = Helper.getAbsolutePath(project, options.getDataSourceTemplateRelativePath());
         String modelsTemplateAbsolutePath = Helper.getAbsolutePath(project, options.getModelsTemplateRelativePath());
+        String typesCastAbsolutePath = Helper.getAbsolutePath(project, options.getCastFileRelativePath());
+
+        TypesCastOptions types = loadTypesCast(typesCastAbsolutePath);
 
-        DataSourceDbo dbo = convertOptions(options);
+        DataSourceDbo dbo = convertOptions(options, types);
 
         generateFile(dataSourceTemplateAbsolutePath, modelsAbsolutePath + File.separator +
                 "Database." + options.getFilesExtension(), dbo, null);

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

@@ -61,8 +61,12 @@ public abstract class Helper {
     }
 
     public static String readFile(String path) throws IOException {
-        return Files.readAllLines(Paths.get(path), StandardCharsets.UTF_8)
+        String data = Files.readAllLines(Paths.get(path), StandardCharsets.UTF_8)
                 .stream().reduce("", (s1, s2) -> s1 + s2 + "\n");
+        if (data.startsWith("\uFEFF")) {
+            return data.substring(1);
+        }
+        return data;
     }
 
     public static String getJsonString(JSONObject obj, String key, String defaultValue)

src/com/rthoni/intellij/codefromds/dbo/options/GenerateOptions.java

@@ -1,16 +1,11 @@
 package com.rthoni.intellij.codefromds.dbo.options;
 
-import com.intellij.database.model.DasTable;
 import com.intellij.database.psi.DbDataSource;
-import com.intellij.database.util.DasUtil;
 import com.rthoni.intellij.codefromds.business.Helper;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Vector;
-import java.util.stream.Collectors;
 
 /**
  * Created by robin on 11/15/16.
@@ -29,12 +24,15 @@ public class GenerateOptions {
 
     private String _filesExtension;
 
+    private String _castFileRelativePath;
+
     public GenerateOptions(DbDataSource source) {
         _modelsRelativePath = "Models";
-        _dataSourceTemplateRelativePath = "Templates" + File.separator + "DataSource.twig";
-        _modelsTemplateRelativePath = "Templates" + File.separator + "Models.twig";
-        _configAbsolutePath = source.getProject().getBasePath() + File.separator + "code-from-ds.json";
+        _dataSourceTemplateRelativePath = "code-from-ds" + File.separator + "DataSource.twig";
+        _modelsTemplateRelativePath = "code-from-ds" + File.separator + "Models.twig";
+        _configAbsolutePath = source.getProject().getBasePath() + File.separator + "code-from-ds" + File.separator + "code-from-ds.json";
         _filesExtension = "cs";
+        _castFileRelativePath = "code-from-ds" + File.separator + "types-cast.json";
         _selection = new DataSourceSelection(source);
     }
 
@@ -46,6 +44,7 @@ public class GenerateOptions {
         map.put("dataSourceTemplateRelativePath", _dataSourceTemplateRelativePath);
         map.put("modelsTemplateRelativePath", _modelsTemplateRelativePath);
         map.put("filesExtension", _filesExtension);
+        map.put("castFileRelativePath", _castFileRelativePath);
         map.put("selection", _selection == null ? null : new JSONObject(_selection.toMap()));
 
         return map;
@@ -57,6 +56,7 @@ public class GenerateOptions {
         _dataSourceTemplateRelativePath = Helper.getJsonString(json, "dataSourceTemplateRelativePath");
         _modelsTemplateRelativePath = Helper.getJsonString(json, "modelsTemplateRelativePath");
         _filesExtension = Helper.getJsonString(json, "filesExtension");
+        _castFileRelativePath = Helper.getJsonString(json, "castFileRelativePath");
         _selection.fromJson(json.getJSONObject("selection"));
     }
 
@@ -107,4 +107,12 @@ public class GenerateOptions {
     public void setFilesExtension(String filesExtension) {
         _filesExtension = filesExtension;
     }
+
+    public String getCastFileRelativePath() {
+        return _castFileRelativePath;
+    }
+
+    public void setCastFileRelativePath(String castFileRelativePath) {
+        _castFileRelativePath = castFileRelativePath;
+    }
 }

src/com/rthoni/intellij/codefromds/dbo/options/TypesCastOptions.java

@@ -0,0 +1,29 @@
+package com.rthoni.intellij.codefromds.dbo.options;
+
+import java.util.HashMap;
+
+/**
+ * Created by robin on 11/19/16.
+ */
+public class TypesCastOptions {
+
+    private String _arrayTemplate;
+
+    private HashMap<String, HashMap<String, String>> _types;
+
+    public String getArrayTemplate() {
+        return _arrayTemplate;
+    }
+
+    public void setArrayTemplate(String arrayTemplate) {
+        _arrayTemplate = arrayTemplate;
+    }
+
+    public HashMap<String, HashMap<String, String>> getTypes() {
+        return _types;
+    }
+
+    public void setTypes(HashMap<String, HashMap<String, String>> types) {
+        _types = types;
+    }
+}

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

@@ -11,6 +11,8 @@ public class ColumnDataSourceDbo {
 
     private boolean _isSelected;
 
+    private String _type;
+
     public String getName() {
         return _name;
     }
@@ -34,4 +36,12 @@ public class ColumnDataSourceDbo {
     public void setSelected(boolean selected) {
         _isSelected = selected;
     }
+
+    public String getType() {
+        return _type;
+    }
+
+    public void setType(String type) {
+        _type = type;
+    }
 }

src/com/rthoni/intellij/codefromds/ui/dialogs/GenerateDialog.java

@@ -46,6 +46,8 @@ public class GenerateDialog extends DialogWrapper {
     private JLabel _lblDataSourceTemplatePath;
     private JLabel _lblModelsPath;
     private JLabel _lblModelsTemplatePath;
+    private TextFieldWithBrowseButton _textCastFile;
+    private JLabel _lblCastFile;
 
     private GenerateOptions _options;
 
@@ -71,6 +73,7 @@ public class GenerateDialog extends DialogWrapper {
             _textDataSourceTemplate.setText(Helper.getAbsolutePath(_project, _options.getDataSourceTemplateRelativePath()));
             _textModelsTemplate.setText(Helper.getAbsolutePath(_project, _options.getModelsTemplateRelativePath()));
             _textFilesExtension.setText(_options.getFilesExtension());
+            _textCastFile.setText(Helper.getAbsolutePath(_project, _options.getCastFileRelativePath()));
             _textConfigPath.setText(_options.getConfigAbsolutePath());
         }
         else {
@@ -79,6 +82,7 @@ public class GenerateDialog extends DialogWrapper {
             _textDataSourceTemplate.setText("");
             _textModelsTemplate.setText("");
             _textFilesExtension.setText("");
+            _textCastFile.setText("");
             _textConfigPath.setText("");
         }
     }
@@ -93,6 +97,7 @@ public class GenerateDialog extends DialogWrapper {
         File configPath = _options == null ? null : new File(_options.getConfigAbsolutePath());
         File configDir = _options == null ? null : new File(configPath.getParent());
         String extension = _options == null ? null : _options.getFilesExtension();
+        File castFilePath = _options == null ? null : new File(Helper.getAbsolutePath(_project, _options.getCastFileRelativePath()));
         if (_options == null) {
             info = new ValidationInfo("No Data Source Selected", _listDatasources);
         }
@@ -114,6 +119,9 @@ public class GenerateDialog extends DialogWrapper {
         else if (extension.startsWith(".")) {
             info = new ValidationInfo("Files extension must not include dot (.)", _textFilesExtension);
         }
+        else if (!castFilePath.exists() || !castFilePath.isFile()) {
+            info = new ValidationInfo("Cast file does not exists", _textCastFile.getTextField());
+        }
 
         return info;
     }
@@ -148,10 +156,11 @@ public class GenerateDialog extends DialogWrapper {
             }
         });
 
-        setupTextField(_textModels, null, true);
-        setupTextField(_textDataSourceTemplate, null, false);
-        setupTextField(_textModelsTemplate, null, false);
-        setupTextField(_textConfigPath, null, false);
+        setupTextField(_textModels, null, true, "Models");
+        setupTextField(_textDataSourceTemplate, null, false, "Data Source Template");
+        setupTextField(_textModelsTemplate, null, false, "Models Template");
+        setupTextField(_textConfigPath, null, false, "Configuration");
+        setupTextField(_textCastFile, null, false, "Types Cast");
 
         setupTextFieldListener(_textModels.getTextField(), s -> {
             _options.setModelsRelativePath(Helper.getRelativePath(_project, s));
@@ -167,6 +176,10 @@ public class GenerateDialog extends DialogWrapper {
         });
         setupTextFieldListener(_textFilesExtension, s -> _options.setFilesExtension(s));
         setupTextFieldListener(_textConfigPath.getTextField(), s -> _options.setConfigAbsolutePath(s));
+        setupTextFieldListener(_textCastFile.getTextField(), s -> {
+            _options.setCastFileRelativePath(Helper.getRelativePath(_project, s));
+            _lblCastFile.setText("$ProjectRoot/" + _options.getCastFileRelativePath());
+        });
 
         _listTables.setCellRenderer(new ColoredListCellRenderer() {
             @Override
@@ -216,12 +229,12 @@ public class GenerateDialog extends DialogWrapper {
         });
     }
 
-    private void setupTextField(TextFieldWithBrowseButton field, Project project, boolean dirsOnly)
+    private void setupTextField(TextFieldWithBrowseButton field, Project project, boolean dirsOnly, String title)
     {
         for (ActionListener l : field.getButton().getActionListeners()) {
             field.getButton().removeActionListener(l);
         }
-        field.addBrowseFolderListener("Choose Models Destination Folder", "Choose folder", project,
+        field.addBrowseFolderListener("Choose " + title + " " + (dirsOnly ? "Folder" : "File"), "Choose " + (dirsOnly ? "Folder" : "File"), project,
                 dirsOnly ? FileChooserDescriptorFactory.createSingleFolderDescriptor() : FileChooserDescriptorFactory.createSingleFileDescriptor());
     }
 

src/com/rthoni/intellij/codefromds/ui/forms/GenerateForm.form

@@ -13,7 +13,7 @@
           <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <grid id="6946b" layout-manager="GridLayoutManager" row-count="8" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="6946b" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -65,7 +65,7 @@
           </component>
           <component id="22d0d" class="javax.swing.JLabel">
             <constraints>
-              <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Configuration File:"/>
@@ -73,7 +73,7 @@
           </component>
           <component id="4c3cb" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="_textConfigPath">
             <constraints>
-              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
           </component>
@@ -103,7 +103,7 @@
           </component>
           <component id="c0c9e" class="javax.swing.JLabel">
             <constraints>
-              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Files extension:"/>
@@ -111,12 +111,34 @@
           </component>
           <component id="880ce" class="javax.swing.JTextField" binding="_textFilesExtension">
             <constraints>
-              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
+          <component id="3cbf6" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Type Cast File:"/>
+            </properties>
+          </component>
+          <component id="853dd" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="_textCastFile">
+            <constraints>
+              <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="8682b" class="javax.swing.JLabel" binding="_lblCastFile">
+            <constraints>
+              <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="$ProjectRoot/"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="39adc" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">