klinsmaya/SQLBot
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git synced 2026-11-08 01:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(datasource): Support Mssql

Browse Source
This commit is contained in:
junjun
2025-05-19 13:38:01 +08:00
parent 27db349a95
commit e50b71af2c
6 changed files with 94 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/apps/datasource/crud/datasource.py
+10
View File
@@ -132,6 +132,9 @@ def sync_table(session: SessionDep, ds: CoreDatasource, tables: List[CoreTable])
if len(id_list) > 0:
session.query(CoreTable).filter(and_(CoreTable.ds_id == ds.id, CoreTable.id.not_in(id_list))).delete(
synchronize_session=False)
session.query(CoreField).filter(and_(CoreField.ds_id == ds.id, CoreField.table_id.not_in(id_list))).delete(
synchronize_session=False)
session.commit()
def sync_fields(session: SessionDep, ds: CoreDatasource, table: CoreTable, fields: List[ColumnSchema]):
@@ -161,6 +164,7 @@ def sync_fields(session: SessionDep, ds: CoreDatasource, table: CoreTable, field
if len(id_list) > 0:
session.query(CoreField).filter(and_(CoreField.table_id == table.id, CoreField.id.not_in(id_list))).delete(
synchronize_session=False)
session.commit()
def update_table_and_fields(session: SessionDep, data: EditObj):
@@ -174,4 +178,10 @@ def preview(session: SessionDep, id: int, data: EditObj):
sql: str = ""
if ds.type == "mysql":
sql = f"""SELECT {", ".join([f.field_name for f in data.fields if f.checked])} FROM {data.table.table_name} LIMIT 100"""
elif ds.type == "sqlServer":
sql = f"""
SELECT {", ".join([f.field_name for f in data.fields if f.checked])} FROM {data.table.table_name}
ORDER BY {data.fields[0].field_name}
OFFSET 0 ROWS FETCH NEXT 100 ROWS ONLY
"""
return exec_sql(ds, sql)
backend/apps/datasource/models/datasource.py
+1
View File
@@ -67,6 +67,7 @@ class DatasourceConf(BaseModel):
database: str = ''
driver: str = ''
extraJdbc: str = ''
dbSchema: str = ''
class TableSchema:
backend/apps/db/db.py
+63 -18
View File
@@ -17,6 +17,11 @@ def get_uri(ds: CoreDatasource):
db_url = f"mysql+pymysql://{urllib.parse.quote(conf.username)}:{urllib.parse.quote(conf.password)}@{conf.host}:{conf.port}/{urllib.parse.quote(conf.database)}?{urllib.parse.quote(conf.extraJdbc)}"
else:
db_url = f"mysql+pymysql://{urllib.parse.quote(conf.username)}:{urllib.parse.quote(conf.password)}@{conf.host}:{conf.port}/{urllib.parse.quote(conf.database)}"
elif ds.type == "sqlServer":
if conf.extraJdbc is not None and conf.extraJdbc != '':
db_url = f"mssql+pymssql://{urllib.parse.quote(conf.username)}:{urllib.parse.quote(conf.password)}@{conf.host}:{conf.port}/{urllib.parse.quote(conf.database)}?{urllib.parse.quote(conf.extraJdbc)}"
else:
db_url = f"mssql+pymssql://{urllib.parse.quote(conf.username)}:{urllib.parse.quote(conf.password)}@{conf.host}:{conf.port}/{urllib.parse.quote(conf.database)}"
else:
raise 'The datasource type not support.'
return db_url
@@ -33,17 +38,36 @@ def get_tables(ds: CoreDatasource):
conf = DatasourceConf(**json.loads(aes_decrypt(ds.configuration)))
session = get_session(ds)
result: Result[Any]
sql: str = ''
try:
if ds.type == "mysql":
sql = f"""SELECT
TABLE_NAME,
TABLE_COMMENT
FROM
information_schema.TABLES
WHERE
TABLE_SCHEMA = '{conf.database}';"""
result = session.execute(text(sql))
sql = f"""
SELECT
TABLE_NAME,
TABLE_COMMENT
FROM
information_schema.TABLES
WHERE
TABLE_SCHEMA = '{conf.database}';
"""
elif ds.type == "sqlServer":
sql = f"""
SELECT
TABLE_NAME AS [TABLE_NAME],
ISNULL(ep.value, '') AS [TABLE_COMMENT]
FROM
INFORMATION_SCHEMA.TABLES t
LEFT JOIN
sys.extended_properties ep
ON ep.major_id = OBJECT_ID(t.TABLE_SCHEMA + '.' + t.TABLE_NAME)
AND ep.minor_id = 0
AND ep.name = 'MS_Description'
WHERE
t.TABLE_TYPE IN ('BASE TABLE', 'VIEW')
AND t.TABLE_SCHEMA = '{conf.dbSchema}';
"""
result = session.execute(text(sql))
res = result.fetchall()
res_list = [TableSchema(*item) for item in res]
return res_list
@@ -58,20 +82,41 @@ def get_fields(ds: CoreDatasource, table_name: str = None):
conf = DatasourceConf(**json.loads(aes_decrypt(ds.configuration)))
session = get_session(ds)
result: Result[Any]
sql: str = ''
try:
if ds.type == "mysql":
sql1 = f"""SELECT
COLUMN_NAME,
DATA_TYPE,
COLUMN_COMMENT
FROM
INFORMATION_SCHEMA.COLUMNS
WHERE
TABLE_SCHEMA = '{conf.database}'"""
sql2 = f""" AND TABLE_NAME = '{table_name}';""" if table_name is not None and table_name != "" else ";"
sql1 = f"""
SELECT
COLUMN_NAME,
DATA_TYPE,
COLUMN_COMMENT
FROM
INFORMATION_SCHEMA.COLUMNS
WHERE
TABLE_SCHEMA = '{conf.database}'
"""
sql2 = f" AND TABLE_NAME = '{table_name}';" if table_name is not None and table_name != "" else ";"
sql = sql1 + sql2
elif ds.type == "sqlServer":
sql1 = f"""
SELECT
COLUMN_NAME AS [COLUMN_NAME],
DATA_TYPE AS [DATA_TYPE],
ISNULL(EP.value, '') AS [COLUMN_COMMENT]
FROM
INFORMATION_SCHEMA.COLUMNS C
LEFT JOIN
sys.extended_properties EP
ON EP.major_id = OBJECT_ID(C.TABLE_SCHEMA + '.' + C.TABLE_NAME)
AND EP.minor_id = C.ORDINAL_POSITION
AND EP.name = 'MS_Description'
WHERE
C.TABLE_SCHEMA = '{conf.dbSchema}'
"""
sql2 = f"AND C.TABLE_NAME = '{table_name}';" if table_name is not None and table_name != "" else ";"
sql = sql1 + sql2
result = session.execute(text(sql))
result = session.execute(text(sql))
res = result.fetchall()
res_list = [ColumnSchema(*item) for item in res]
return res_list
backend/pyproject.toml
+2 -1
View File
@@ -28,7 +28,8 @@ dependencies = [
"dashscope>=1.14.0,<2.0.0",
"pymysql (>=1.1.1,<2.0.0)",
"cryptography (>=44.0.3,<45.0.0)",
"llama_index>=0.12.35"
"llama_index>=0.12.35",
"pymssql (>=2.3.4,<3.0.0)"
]
[[tool.uv.index]]
url = "https://pypi.tuna.tsinghua.edu.cn/simple"
frontend/src/views/ds/form.vue
+16 -6
View File
@@ -20,7 +20,7 @@
<el-input v-model="form.description" :rows="2" type="textarea" />
</el-form-item>
<el-form-item label="Type">
<el-select v-model="form.type" placeholder="Select Type">
<el-select v-model="form.type" placeholder="Select Type" :disabled="!isCreate">
<el-option
v-for="item in dsType"
:key="item.value"
@@ -47,10 +47,14 @@
<el-form-item label="Extra JDBC String">
<el-input v-model="config.extraJdbc" />
</el-form-item>
<el-form-item label="Schema" v-if="form.type === 'sqlServer'">
<el-input v-model="config.dbSchema" />
<el-button link type="primary" :icon="Plus" v-if="false">Get Schema</el-button>
</el-form-item>
</el-form>
</div>
<div v-show="active === 2" class="container">
<el-scrollbar height="480px">
<el-scrollbar>
<el-checkbox-group v-model="checkList">
<el-row :gutter="10">
<el-col v-for="item in tableList" :key="item.value" :span="12">
@@ -76,6 +80,7 @@ import { datasourceApi } from '@/api/datasource'
import { encrypted, decrypted } from './js/aes'
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { Plus } from '@element-plus/icons-vue'
const dsFormRef = ref<FormInstance>()
const emit = defineEmits(['refresh'])
@@ -94,7 +99,8 @@ const rules = reactive<FormRules>({
const dialogVisible = ref<boolean>(false)
const dsType = [
{label:"MySQL", value:"mysql"}
{label:"MySQL", value:"mysql"},
{label:"SQL Server", value:"sqlServer"}
]
const form = ref<any>({
name:'',
@@ -109,7 +115,8 @@ const config = ref<any>({
username:'',
password:'',
database:'',
extraJdbc:''
extraJdbc:'',
dbSchema:''
})
const close = () => {
@@ -138,6 +145,7 @@ const open = (item: any, editTable: boolean = false) => {
config.value.password = configuration.password
config.value.database = configuration.database
config.value.extraJdbc = configuration.extraJdbc
config.value.dbSchema = configuration.dbSchema
}
if (editTable) {
@@ -171,6 +179,7 @@ const open = (item: any, editTable: boolean = false) => {
password:'',
database:'',
extraJdbc:'',
dbSchema:''
}
}
dialogVisible.value = true
@@ -218,7 +227,8 @@ const buildConf = () => {
username:config.value.username,
password:config.value.password,
database:config.value.database,
extraJdbc:config.value.extraJdbc
extraJdbc:config.value.extraJdbc,
dbSchema:config.value.dbSchema
}))
}
@@ -262,7 +272,7 @@ defineExpose({ open })
</script>
<style lang="less" scoped>
.container{
height: 500px;
height: 600px;
margin-top: 20px;
}
</style>
frontend/src/views/ds/index.vue
+2
View File
@@ -27,6 +27,7 @@
<div class="connection-icon">
<Icon>
<MysqlDs v-if="ds.type === 'mysql'"/>
<SQLServerDs v-else-if="ds.type === 'sqlServer'"/>
</Icon>
</div>
<div class="connection-details">
@@ -52,6 +53,7 @@ import IconOpeAdd from '@/assets/svg/operate/ope-add.svg'
import IconOpeEdit from '@/assets/svg/operate/ope-edit.svg'
import IconOpeDelete from '@/assets/svg/operate/ope-delete.svg'
import MysqlDs from '@/assets/svg/ds/mysql-ds.svg'
import SQLServerDs from '@/assets/svg/ds/sqlServer-ds.svg'
import { Search, List, CreditCard } from '@element-plus/icons-vue'
import { ref, onMounted } from 'vue'
import DsForm from './form.vue'