Implementation of getDbType, getDbVersion, test

Даниил · Даниил · commit fe76bc198be7 · 2019-12-15T07:32:34.000+03:00
diff --git a/src/main/java/ru/fusionsoft/dbgit/mssql/DBAdapterMssql.java b/src/main/java/ru/fusionsoft/dbgit/mssql/DBAdapterMssql.java
@@ -1202,15 +1202,27 @@ public IFactoryDBConvertAdapter getConvertAdapterFactory() {
 
 	@Override
 	public String getDbType() {
-		// TODO Auto-generated method stub
-		return null;
+		return IFactoryDBConvertAdapter.MSSQL;
 	}
 
-	@Override
-	public String getDbVersion() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    @Override
+    public String getDbVersion() {
+        try {
+            Statement stmt = getConnection().createStatement();
+
+            //Gives 8.00, 9.00, 10.00 and 10.50 for SQL 2000, 2005, 2008 and 2008R2 respectively.
+            String query = "SELECT left(cast(serverproperty('productversion') as varchar), 4)";
+
+            ResultSet resultSet = stmt.executeQuery(query);
+            resultSet.next();
+            String result = resultSet.getString(1);
+
+            resultSet.close();
+            stmt.close();
+            return result;
+
+        } catch (SQLException e) { return "";}
+    }
 
 	@Override
 	public void createSchemaIfNeed(String schemaName) throws ExceptionDBGit {
diff --git a/src/test/java/ru/fusionsoft/dbgit/mssql/DBAdapterMssqlTest.java b/src/test/java/ru/fusionsoft/dbgit/mssql/DBAdapterMssqlTest.java
@@ -8,6 +8,7 @@
 import org.junit.Test;
 
 import ru.fusionsoft.dbgit.adapters.AdapterFactory;
+import ru.fusionsoft.dbgit.adapters.IFactoryDBConvertAdapter;
 import ru.fusionsoft.dbgit.core.DBGitConfig;
 import ru.fusionsoft.dbgit.dbobjects.*;
 import ru.fusionsoft.dbgit.utils.ConsoleWriter;
@@ -585,6 +586,20 @@ public void userHasRightsToGetDdlOfOtherUsers() throws Exception{
 
     }
 
+    @Test
+    public void getDbType(){
+        String type = testAdapter.getDbType();
+        assertFalse(type.isEmpty());
+        assertEquals(IFactoryDBConvertAdapter.MSSQL, type);
+    }
+
+    @Test
+    public void getDbVersion(){
+        String version = testAdapter.getDbVersion();
+        assertFalse(version.isEmpty());
+    }
+
+
     public DBAdapterMssql createAdapterWithCredentials(String username, String password, String url) throws Exception{
         Properties props = new Properties();
         props.setProperty("url", Objects.nonNull(url) ? url : TEST_CONN_STRING);
