|
|
@@ -301,13 +301,12 @@ namespace CNAS_DBSync |
|
|
|
{ |
|
|
|
case DataSourceType.MySQL: |
|
|
|
dtTableType = SelectTableType.MySqlsec(strTableName_Instru); |
|
|
|
|
|
|
|
break; |
|
|
|
case DataSourceType.Dm: |
|
|
|
dtTableType = SelectTableType.DmSql(strTableName_Instru); |
|
|
|
break; |
|
|
|
case DataSourceType.Oracle: |
|
|
|
|
|
|
|
dtTableType = SelectTableType.OrcSql(strTableName_Instru, currentSyncItem); |
|
|
|
break; |
|
|
|
case DataSourceType.PostgreSQL: |
|
|
|
dtTableType = SelectTableType.PostgreSql(strTableName_Instru); |
|
|
@@ -315,17 +314,9 @@ namespace CNAS_DBSync |
|
|
|
case DataSourceType.SQL: |
|
|
|
dtTableType = SelectTableType.Sqlserversec(strTableName_Instru, currentSyncItem); |
|
|
|
break; |
|
|
|
case DataSourceType.SQLLite: |
|
|
|
default: |
|
|
|
|
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//dtTableType = CnasDataOperationFact.CnasDataOperation().GetCNASTableTypeLenth(strTableName_Instru, currentSyncItem.SyncTargetDBInfo); |
|
|
|
|
|
|
|
//string strTableName_Instru = cbxInstrument.Text.ToString(); |
|
|
|
|
|
|
|
DataTable dtInstruShow = new DataTable(); |
|
|
|
dtInstruShow.Columns.Add("InstruFieldName"); |
|
|
|
dtInstruShow.Columns.Add("InstruDataType"); |
|
|
@@ -336,23 +327,7 @@ namespace CNAS_DBSync |
|
|
|
} |
|
|
|
|
|
|
|
dgvInstruDS.DataSource = dtInstruShow; |
|
|
|
//if (dictInstruTables.ContainsKey(strTableName_Instru)) |
|
|
|
//{ |
|
|
|
// DataTable dt = dictInstruTables[strTableName_Instru]; |
|
|
|
// if (dt != null) |
|
|
|
// { |
|
|
|
// DataTable dtInstruShow = new DataTable(); |
|
|
|
// dtInstruShow.Columns.Add("InstruFieldName"); |
|
|
|
// dtInstruShow.Columns.Add("InstruDataType"); |
|
|
|
|
|
|
|
// foreach (DataColumn dc in dt.Columns) |
|
|
|
// { |
|
|
|
// dtInstruShow.Rows.Add(new object[] { dc.ColumnName,dc.DataType}); |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
|
//} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/// <summary> |
|
|
@@ -366,26 +341,12 @@ namespace CNAS_DBSync |
|
|
|
|
|
|
|
string strTableName_Cnas = cbxCnas.Text.ToString(); |
|
|
|
|
|
|
|
//if (currentSyncItem.CnasInstrumentColumn != null && currentSyncItem.CnasInstrumentColumn != "") |
|
|
|
//{ |
|
|
|
// DialogResult dr = MessageBox.Show("已存在配置完成的CNAS仪器对应列,切换表将导致该配置失效,是否继续?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1); |
|
|
|
// if (dr == DialogResult.No) |
|
|
|
// { |
|
|
|
// return; |
|
|
|
// } |
|
|
|
//} |
|
|
|
|
|
|
|
DataTable dtTableStruct = CnasDataOperationFact.CnasDataOperation().GetCNASTableTypeLenth(strTableName_Cnas, currentSyncItem.SyncTargetDBInfo); |
|
|
|
|
|
|
|
//从数据库中加载数据表结构 |
|
|
|
//DataTable dtTableStruct = CnasDataOperationFact.CnasDataOperation().GetCNASTablesStruct(strTableName_Cnas,currentSyncItem.SyncTargetDBInfo); |
|
|
|
if (dtTableStruct != null) |
|
|
|
{ |
|
|
|
|
|
|
|
//DataTable dtTableType = CnasDataOperationFact.CnasDataOperation().GetCNASTableTypeLenth(strTableName_Instru, currentSyncItem.SyncTargetDBInfo); |
|
|
|
|
|
|
|
//string strTableName_Instru = cbxInstrument.Text.ToString(); |
|
|
|
|
|
|
|
DataTable dtCnasShow = new DataTable(); |
|
|
|
dtCnasShow.Columns.Add("CnasFieldName"); |
|
|
|
dtCnasShow.Columns.Add("CnasDataType"); |
|
|
|