diff --git a/packages/engines/default/SqlDumper.js b/packages/engines/default/SqlDumper.js
index 8aec609fc..3a9c3196e 100644
--- a/packages/engines/default/SqlDumper.js
+++ b/packages/engines/default/SqlDumper.js
@@ -130,7 +130,7 @@ class SqlDumper {
       if (column.isPersisted) this.put(" ^persisted");
       return;
     }
-    this.put("%k", column.dataType);
+    if (column.dataType) this.put("%k", column.dataType);
     if (column.autoIncrement) {
       this.autoIncrement();
     }
@@ -180,7 +180,7 @@ class SqlDumper {
   createTable(table) {
     this.put("^create ^table %f ( &>&n", table);
     this.putCollection(",&n", table.columns, col => {
-      this.put("%i", col.columnName);
+      this.put("%i ", col.columnName);
       this.columnDefinition(col);
     });
     if (table.primaryKey) {
diff --git a/packages/engines/mssql/MsSqlDumper.js b/packages/engines/mssql/MsSqlDumper.js
index d44e23cfa..c622abe49 100644
--- a/packages/engines/mssql/MsSqlDumper.js
+++ b/packages/engines/mssql/MsSqlDumper.js
@@ -1,5 +1,9 @@
-const SqlDumper = require('../default/SqlDumper');
+const SqlDumper = require("../default/SqlDumper");
 
-class MsSqlDumper extends SqlDumper {}
+class MsSqlDumper extends SqlDumper {
+  autoIncrement() {
+    this.put(" ^identity");
+  }
+}
 
 module.exports = MsSqlDumper;
diff --git a/packages/web/src/sqleditor/SqlEditor.js b/packages/web/src/sqleditor/SqlEditor.js
new file mode 100644
index 000000000..24a62abcf
--- /dev/null
+++ b/packages/web/src/sqleditor/SqlEditor.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import useFetch from '../utility/useFetch';
+import styled from 'styled-components';
+import theme from '../theme';
+import AceEditor from 'react-ace';
+import useDimensions from '../utility/useDimensions';
+import engines from '@dbgate/engines';
+import useTableInfo from '../utility/useTableInfo';
+import useConnectionInfo from '../utility/useConnectionInfo';
+
+const Wrapper = styled.div`
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+`;
+
+const engineToMode = {
+  mssql: 'sqlserver',
+  mysql: 'mysql',
+  postgre: 'pgsql',
+};
+
+export default function SqlEditor({ value, engine }) {
+  const [containerRef, { height, width }] = useDimensions();
+
+  return (
+    <Wrapper ref={containerRef}>
+      <AceEditor
+        mode={engineToMode[engine] || 'sql'}
+        theme="github"
+        // onChange={onChange}
+        name="UNIQUE_ID_OF_DIV"
+        editorProps={{ $blockScrolling: true }}
+        value={value}
+        readOnly
+        fontSize="11pt"
+        width={`${width}px`}
+        height={`${height}px`}
+      />
+    </Wrapper>
+  );
+}
diff --git a/packages/web/src/tabs/TableCreateScriptTab.js b/packages/web/src/tabs/TableCreateScriptTab.js
index d5c6215e6..2217c31f9 100644
--- a/packages/web/src/tabs/TableCreateScriptTab.js
+++ b/packages/web/src/tabs/TableCreateScriptTab.js
@@ -1,45 +1,18 @@
 import React from 'react';
-import useFetch from '../utility/useFetch';
-import styled from 'styled-components';
-import theme from '../theme';
-import AceEditor from 'react-ace';
-import useDimensions from '../utility/useDimensions';
 import engines from '@dbgate/engines';
 import useTableInfo from '../utility/useTableInfo';
-
-const Wrapper = styled.div`
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-`;
+import useConnectionInfo from '../utility/useConnectionInfo';
+import SqlEditor from '../sqleditor/SqlEditor';
 
 export default function TableCreateScriptTab({ conid, database, schemaName, pureName }) {
-  const [containerRef, { height, width }] = useDimensions();
-
   const tableInfo = useTableInfo({ conid, database, schemaName, pureName });
+  const connnection = useConnectionInfo(conid);
+  if (!connnection || !tableInfo) return null;
+  // console.log(tableInfo);
 
-  console.log(tableInfo);
-
-  const driver = engines('mssql');
+  const driver = engines(connnection.engine);
   const dumper = driver.createDumper();
   if (tableInfo) dumper.createTable(tableInfo);
 
-  return (
-    <Wrapper ref={containerRef}>
-      <AceEditor
-        mode="sql"
-        theme="github"
-        // onChange={onChange}
-        name="UNIQUE_ID_OF_DIV"
-        editorProps={{ $blockScrolling: true }}
-        value={dumper.s}
-        readOnly
-        fontSize="11pt"
-        width={`${width}px`}
-        height={`${height}px`}
-      />
-    </Wrapper>
-  );
+  return <SqlEditor engine={connnection && connnection.engine} value={dumper.s} />;
 }
diff --git a/packages/web/src/utility/useConnectionInfo.js b/packages/web/src/utility/useConnectionInfo.js
new file mode 100644
index 000000000..369c98145
--- /dev/null
+++ b/packages/web/src/utility/useConnectionInfo.js
@@ -0,0 +1,10 @@
+import useFetch from './useFetch';
+
+export default function useConnectionInfo(conid) {
+  /** @type {import('@dbgate/types').StoredConnection} */
+  const connection = useFetch({
+    params: { conid },
+    url: 'connections/get',
+  });
+  return connection;
+}