Merge pull request #8 from binlabs/feature/additional-type-support

Added support for BIT, BINARY, REAL, TIMESTAMP, YEAR

Author: binlabs

.editorconfig

@@ -0,0 +1,14 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.semver

@@ -0,0 +1,5 @@
+---
+:major: 1
+:minor: 1
+:patch: 0
+:special: ''

README.md

@@ -12,7 +12,7 @@ This bundle allows you to generate a Typescript interface from the table(s) that
 
 ### Typescript Sequelize Model with Interface
 
-From the table(s) that you have selected, this bundle allows you to generate a [Typescript Sequelize](https://github.com/RobinBuschmann/sequelize-typescript) model and an accompanying interface, which will be used to instantiate a class for the model.
+From the table(s) that you have selected, this bundle allows you to generate a [Sequelize](https://github.com/sequelize/sequelize) model and an accompanying interface, which will be used to instantiate a class for the model.
 
 ## Installation and Usage
 

Typescript Interface.saBundle/Support/parseTableData.rb

@@ -10,10 +10,14 @@
 puts "interface #{interface_name}Iface {"
 CSV.parse(STDIN.read, headers: true)  do |row|
   # TODO: Lots of if statements, try to find a better way to do this
+  # Field Types
   fieldType = "unknown"
   fieldType = "string" if row['Type'].include? "text"
   fieldType = "string" if row['Type'].include? "char"
   fieldType = "string" if row['Type'].include? "json"
+  fieldType = "string" if row['Type'].include? "binary"
+  fieldType = "string" if row['Type'].include? "blob"
+  fieldType = "string" if row['Type'].include? "time"
   fieldType = "Date" if row['Type'].include? "date"
   fieldType = "DateTime" if row['Type'].include? "datetime"
   fieldType = "number" if row['Type'].include? "fixed"
@@ -22,8 +26,10 @@
   fieldType = "number" if row['Type'].include? "dec"
   fieldType = "number" if row['Type'].include? "doub"
   fieldType = "number" if row['Type'].include? "numeric"
+  fieldType = "number" if row['Type'].include? "real"
   fieldType = "number" if row['Type'].include? "year"
   fieldType = "boolean" if row['Type'].include? "tinyint"
+  fieldType = "boolean" if row['Type'].include? "bit"
   fieldType = "boolean" if row['Type'].include? "bool"
   puts "  #{row['Field']}: #{fieldType}"
 end

Typescript Sequelize Model with Interface.saBundle/Support/parseTableData.rb

@@ -10,17 +10,21 @@
 # Model Variables
 allow_null_false = "allowNull: false"
 allow_null_true = "allowNull: true"
+data_type_blob = "type: DataTypes.BLOB"
 data_type_boolean = "type: DataTypes.BOOLEAN"
 data_type_date = "type: DataTypes.DATE"
+data_type_date_only = "type: DataTypes.DATEONLY"
 data_type_decimal = "type: DataTypes.DECIMAL"
 data_type_double = "type: DataTypes.DOUBLE"
 data_type_fixed = "type: DataTypes.FIXED"
 data_type_float = "type: DataTypes.FLOAT"
+data_type_geometry = "type: DataTypes.GEOMETRY"
 data_type_integer = "type: DataTypes.INTEGER"
 data_type_interger_unsigned = "type: DataTypes.INTEGER.UNSIGNED"
 data_type_json = "type: DataTypes.JSON"
-data_type_numeric = "type: DataTypes.NUMBER"
+data_type_real = "type: DataTypes.REAL"
 data_type_string = "type: DataTypes.STRING"
+data_type_time = "type: DataTypes.TIME"
 default_value_date_now = "defaultValue: literal('NOW()')"
 default_value_empty_string = "defaultValue: ''"
 default_value_false = "defaultValue: false"
@@ -48,6 +52,9 @@
   fieldType = "string" if row['Type'].include? "text"
   fieldType = "string" if row['Type'].include? "char"
   fieldType = "string" if row['Type'].include? "json"
+  fieldType = "string" if row['Type'].include? "binary"
+  fieldType = "string" if row['Type'].include? "blob"
+  fieldType = "string" if row['Type'].include? "time"
   fieldType = "Date" if row['Type'].include? "date"
   fieldType = "DateTime" if row['Type'].include? "datetime"
   fieldType = "number" if row['Type'].include? "fixed"
@@ -56,8 +63,10 @@
   fieldType = "number" if row['Type'].include? "dec"
   fieldType = "number" if row['Type'].include? "doub"
   fieldType = "number" if row['Type'].include? "numeric"
+  fieldType = "number" if row['Type'].include? "real"
   fieldType = "number" if row['Type'].include? "year"
   fieldType = "boolean" if row['Type'].include? "tinyint"
+  fieldType = "boolean" if row['Type'].include? "bit"
   fieldType = "boolean" if row['Type'].include? "bool"
   puts "  #{row['Field']}: #{fieldType}"
 end
@@ -74,16 +83,22 @@
   dataType = data_type_string if row['Type'].include? "text"
   dataType = data_type_string if row['Type'].include? "char"
   dataType = data_type_json if row['Type'].include? "json"
-  dataType = data_type_date if row['Type'].include? "date"
+  dataType = data_type_blob if row['Type'].include? "binary"
+  dataType = data_type_blob if row['Type'].include? "blob"
+  dataType = data_type_time if row['Type'].include? "time"
+  dataType = data_type_date_only if row['Type'].include? "date"
+  dataType = data_type_date if row['Type'].include? "year"
+  dataType = data_type_date if row['Type'].include? "timestamp"
   dataType = data_type_date if row['Type'].include? "datetime"
   dataType = data_type_fixed if row['Type'].include? "fixed"
   dataType = data_type_float if row['Type'].include? "float"
   dataType = data_type_integer if row['Type'].include? "int"
   dataType = data_type_interger_unsigned if row['Type'] =~ /int.*unsigned/
   dataType = data_type_interger_unsigned if row['Type'].include? "dec"
   dataType = data_type_double if row['Type'].include? "doub"
-  dataType = data_type_numeric if row['Type'].include? "numeric"
-  dataType = data_type_date if row['Type'].include? "year"
+  dataType = data_type_real if row['Type'].include? "real"
+  dataType = data_type_decimal if row['Type'].include? "numeric"
+  dataType = data_type_boolean if row['Type'].include? "bit"
   dataType = data_type_boolean if row['Type'].include? "tinyint"
   dataType = data_type_boolean if row['Type'].include? "bool"
   # Allow Null
@@ -97,7 +112,7 @@
   defaultValue = default_value_false if row['Default'] == "false"
   defaultValue = default_value_zero if row['Default'] == "0"
   puts "  #{row['Field']}: { #{allowNull}, #{defaultValue}, #{dataType} },"
-  
+
 end
 puts "}"
 puts single_return