@@ -113,26 +113,17 @@ def get_origin_connect(type: str, conf: DatasourceConf):
113113 if equals_ignore_case (type , "sqlServer" ):
114114 # none or true, set tds_version = 7.0
115115 if conf .lowVersion is None or conf .lowVersion :
116- return pymssql .connect (
117- server = conf .host ,
118- port = str (conf .port ),
119- user = conf .username ,
120- password = conf .password ,
121- database = conf .database ,
122- timeout = conf .timeout ,
123- tds_version = '7.0' , # options: '4.2', '7.0', '8.0' ...,
124- ** extra_config_dict
125- )
126- else :
127- return pymssql .connect (
128- server = conf .host ,
129- port = str (conf .port ),
130- user = conf .username ,
131- password = conf .password ,
132- database = conf .database ,
133- timeout = conf .timeout ,
134- ** extra_config_dict
135- )
116+ extra_config_dict ['tds_version' ] = '7.0'
117+
118+ return pymssql .connect (
119+ server = conf .host ,
120+ port = str (conf .port ),
121+ user = conf .username ,
122+ password = conf .password ,
123+ database = conf .database ,
124+ timeout = conf .timeout ,
125+ ** extra_config_dict
126+ )
136127
137128
138129# use sqlalchemy
@@ -418,15 +409,7 @@ def get_version(ds: CoreDatasource | AssistantOutDsSchema):
418409 "excel" ) else get_engine_config ()
419410 else :
420411 conf = DatasourceConf (** json .loads (aes_decrypt (get_out_ds_conf (ds , 10 ))))
421- # if isinstance(ds, AssistantOutDsSchema):
422- # conf = DatasourceConf()
423- # conf.host = ds.host
424- # conf.port = ds.port
425- # conf.username = ds.user
426- # conf.password = ds.password
427- # conf.database = ds.dataBase
428- # conf.dbSchema = ds.db_schema
429- # conf.timeout = 10
412+
430413 db = DB .get_db (ds .type )
431414 sql = get_version_sql (ds , conf )
432415 if not sql :
0 commit comments