Merge branch 'sql-server' into develop

# Conflicts: # pom.xml # src/main/java/com/zzg/mybatis/generator/util/DbUtil.java
anealo · May 27, 2017 · 7f2759c · 7f2759c
2 parents 53b2e50 + 0ade97a
commit 7f2759c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/zzg/mybatis/generator/model/DbType.java b/src/main/java/com/zzg/mybatis/generator/model/DbType.java
@@ -7,7 +7,8 @@ public enum DbType {
 
     MySQL("com.mysql.jdbc.Driver", "jdbc:mysql://%s:%s/%s?useUnicode=true&useSSL=false&characterEncoding=%s", "mysql-connector-java-5.1.38.jar"),
     Oracle("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%s:%s", "ojdbc14.jar"),
-    PostgreSQL("org.postgresql.Driver", "jdbc:postgresql://%s:%s/%s", "postgresql-9.4.1209.jar");
+    PostgreSQL("org.postgresql.Driver", "jdbc:postgresql://%s:%s/%s", "postgresql-9.4.1209.jar"),
+	SQL_Server("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://%s:%s;databaseName=%s", "sqljdbc4-4.0.jar");
 
     private final String driverClass;
     private final String connectionUrlPattern;

diff --git a/src/main/resources/fxml/newConnection.fxml b/src/main/resources/fxml/newConnection.fxml
@@ -36,6 +36,7 @@
                         <String fx:value="MySQL" />
                         <String fx:value="Oracle" />
                         <String fx:value="PostgreSQL" />
+                        <String fx:value="SQL_Server" />
                     </FXCollections>
                 </items>
             </ChoiceBox>

diff --git a/src/main/resources/lib/sqljdbc4-4.0.jar b/src/main/resources/lib/sqljdbc4-4.0.jar