Skip to content

Commit c6960aa

Browse files
SeriaWeiSeriaWei
committed
fix warning
1 parent f55aa79 commit c6960aa

File tree

7 files changed

+49
-49
lines changed

7 files changed

+49
-49
lines changed

‎tools/MsSql2Any/ScriptGenerators/DamengScriptGenerator.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ private string MapDataType(ColumnInfo column)
9696
"smallint" => "SMALLINT",
9797
"tinyint" => "TINYINT",
9898
"bit" => "BIT",
99-
"decimal" => column.Scale > 0
100-
? $"DECIMAL({column.Precision}, {column.Scale})"
99+
"decimal" => column.Scale > 0
100+
? $"DECIMAL({column.Precision}, {column.Scale})"
101101
: $"DECIMAL({column.Precision})",
102-
"numeric" => column.Scale > 0
103-
? $"NUMERIC({column.Precision}, {column.Scale})"
102+
"numeric" => column.Scale > 0
103+
? $"NUMERIC({column.Precision}, {column.Scale})"
104104
: $"NUMERIC({column.Precision})",
105105
"money" => "DECIMAL(19, 4)",
106106
"smallmoney" => "DECIMAL(10, 4)",
@@ -115,7 +115,7 @@ private string MapDataType(ColumnInfo column)
115115
"nchar" => $"CHAR({Math.Max(1, column.MaxLength)})",
116116
"varchar" => column.MaxLength > 0
117117
? $"VARCHAR({column.MaxLength})"
118-
: "TEXT",
118+
: "TEXT",
119119
"nvarchar" => column.MaxLength > 0
120120
? $"NVARCHAR({column.MaxLength} char)"
121121
: "TEXT",
@@ -136,7 +136,7 @@ private string FormatValue(object value, string dataType)
136136
{
137137
if (value == DBNull.Value)
138138
return "NULL";
139-
139+
140140
return dataType.ToLower() switch
141141
{
142142
"char" or "nchar" or "varchar" or "nvarchar" or
@@ -146,7 +146,7 @@ private string FormatValue(object value, string dataType)
146146
"binary" or "varbinary" or "image" or "rowversion" =>
147147
$"0x{BitConverter.ToString((byte[])value).Replace("-", "")}",
148148
"bit" => ((bool)value) ? "1" : "0",
149-
_ => value.ToString()
149+
_ => value.ToString() ?? string.Empty
150150
};
151151
}
152152

@@ -155,10 +155,10 @@ private string FormatDateTimeValue(object value)
155155
if (value is DateTime dateTime)
156156
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
157157
else
158-
return $"'{EscapeString(value.ToString())}'";
158+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
159159
}
160160

161-
private string EscapeString(string input)
161+
private string EscapeString(string? input)
162162
{
163163
if (string.IsNullOrEmpty(input))
164164
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/MysqlScriptGenerator.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@ public string GenerateCreateTableScript(string tableName, List<ColumnInfo> colum
1010
{
1111
var script = new System.Text.StringBuilder();
1212
script.AppendLine($"CREATE TABLE `{tableName}` (");
13-
13+
1414
var columnDefs = new List<string>();
1515
foreach (var col in columns)
1616
{
1717
var columnDef = $" `{col.Name}` {MapDataType(col)}";
18-
18+
1919
if (!col.IsNullable)
2020
columnDef += " NOT NULL";
21-
21+
2222
if (!string.IsNullOrEmpty(col.DefaultValue))
2323
{
2424
columnDef += $" DEFAULT {col.DefaultValue}";
2525
}
26-
26+
2727
if (col.IsIdentity)
2828
columnDef += " AUTO_INCREMENT";
29-
29+
3030
columnDefs.Add(columnDef);
3131
}
32-
32+
3333
script.Append(string.Join(",\n", columnDefs));
34-
34+
3535
var primaryKeys = columns.Where(c => c.IsPrimaryKey).Select(c => c.Name).ToList();
3636
if (primaryKeys.Any())
3737
{
3838
script.Append($",\n PRIMARY KEY (`{string.Join("`, `", primaryKeys)}`)");
3939
}
40-
40+
4141
script.AppendLine("\n);");
42-
42+
4343
return script.ToString();
4444
}
4545

@@ -81,11 +81,11 @@ private string MapDataType(ColumnInfo column)
8181
"smallint" => "SMALLINT",
8282
"tinyint" => "TINYINT",
8383
"bit" => "BIT",
84-
"decimal" => column.Scale > 0
85-
? $"DECIMAL({column.Precision}, {column.Scale})"
84+
"decimal" => column.Scale > 0
85+
? $"DECIMAL({column.Precision}, {column.Scale})"
8686
: $"DECIMAL({column.Precision})",
87-
"numeric" => column.Scale > 0
88-
? $"NUMERIC({column.Precision}, {column.Scale})"
87+
"numeric" => column.Scale > 0
88+
? $"NUMERIC({column.Precision}, {column.Scale})"
8989
: $"NUMERIC({column.Precision})",
9090
"money" => "DECIMAL(19, 4)",
9191
"smallmoney" => "DECIMAL(10, 4)",
@@ -98,17 +98,17 @@ private string MapDataType(ColumnInfo column)
9898
"time" => "TIME",
9999
"char" => $"CHAR({Math.Max(1, column.MaxLength)})",
100100
"nchar" => $"CHAR({Math.Max(1, column.MaxLength)})",
101-
"varchar" => column.MaxLength > 0
102-
? $"VARCHAR({column.MaxLength})"
101+
"varchar" => column.MaxLength > 0
102+
? $"VARCHAR({column.MaxLength})"
103103
: "TEXT",
104104
"nvarchar" => column.MaxLength > 0
105105
? $"VARCHAR({column.MaxLength})" // MySQL does not have NVARCHAR, use VARCHAR
106106
: "TEXT",
107107
"text" => "TEXT",
108108
"ntext" => "LONGTEXT",
109109
"binary" => $"BINARY({column.MaxLength})",
110-
"varbinary" => column.MaxLength > 0
111-
? $"VARBINARY({column.MaxLength})"
110+
"varbinary" => column.MaxLength > 0
111+
? $"VARBINARY({column.MaxLength})"
112112
: "LONGBLOB",
113113
"image" => "LONGBLOB",
114114
"uniqueidentifier" => "CHAR(36)", // In MySQL, use CHAR(36) to store UUID
@@ -129,11 +129,11 @@ private string FormatValue(object value, string dataType)
129129
"char" or "nchar" or "varchar" or "nvarchar" or
130130
"text" or "ntext" or "xml" or "uniqueidentifier" =>
131131
$"'{EscapeString(value.ToString())}'",
132-
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value),
132+
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value)!,
133133
"binary" or "varbinary" or "image" =>
134134
$"0x{BitConverter.ToString((byte[])value).Replace("-", "")}",
135135
"bit" => ((bool)value) ? "1" : "0",
136-
_ => value.ToString()
136+
_ => value.ToString() ?? string.Empty
137137
};
138138
}
139139

@@ -142,10 +142,10 @@ private string FormatDateTimeValue(object value)
142142
if (value is DateTime dateTime)
143143
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
144144
else
145-
return $"'{EscapeString(value.ToString())}'";
145+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
146146
}
147147

148-
private string EscapeString(string input)
148+
private string EscapeString(string? input)
149149
{
150150
if (string.IsNullOrEmpty(input))
151151
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/OceanBaseScriptGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ private string FormatValue(object value, string dataType)
131131
"char" or "nchar" or "varchar" or "nvarchar" or
132132
"text" or "ntext" or "xml" or "uniqueidentifier" or
133133
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" =>
134-
$"'{EscapeString(value.ToString())}'",
134+
$"'{EscapeString(value.ToString())!}'",
135135
"binary" or "varbinary" or "image" or "rowversion" =>
136136
$"0x{BitConverter.ToString((byte[])value).Replace("-", "")}",
137137
"bit" => ((bool)value) ? "1" : "0",
138-
_ => value.ToString()
138+
_ => value.ToString() ?? string.Empty
139139
};
140140
}
141141

142-
private string EscapeString(string input)
142+
private string EscapeString(string? input)
143143
{
144144
if (string.IsNullOrEmpty(input))
145145
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/OpenGaussScriptGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ private string FormatValue(object value, string dataType)
126126
"char" or "nchar" or "varchar" or "nvarchar" or
127127
"text" or "ntext" or "xml" or "uniqueidentifier" =>
128128
$"'{EscapeString(value.ToString())}'",
129-
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value),
129+
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value)!,
130130
"binary" or "varbinary" or "image" or "rowversion" or "timestamp" =>
131131
$"\\x{BitConverter.ToString((byte[])value).Replace("-", "").ToLower()}",
132132
"bit" => ((bool)value) ? "true" : "false",
133-
_ => value.ToString()
133+
_ => value.ToString() ?? string.Empty
134134
};
135135
}
136136

@@ -139,10 +139,10 @@ private string FormatDateTimeValue(object value)
139139
if (value is DateTime dateTime)
140140
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
141141
else
142-
return $"'{EscapeString(value.ToString())}'";
142+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
143143
}
144144

145-
private string EscapeString(string input)
145+
private string EscapeString(string? input)
146146
{
147147
if (string.IsNullOrEmpty(input))
148148
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/PostgreSqlScriptGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ private string FormatValue(object value, string dataType)
125125
"char" or "nchar" or "varchar" or "nvarchar" or
126126
"text" or "ntext" or "xml" or "uniqueidentifier" =>
127127
$"'{EscapeString(value.ToString())}'",
128-
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value),
128+
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value)!,
129129
"binary" or "varbinary" or "image" or "rowversion" or "timestamp" =>
130130
$"\\x{BitConverter.ToString((byte[])value).Replace("-", "").ToLower()}",
131131
"bit" => ((bool)value) ? "TRUE" : "FALSE",
132-
_ => value.ToString()
132+
_ => value.ToString() ?? string.Empty
133133
};
134134
}
135135

@@ -138,10 +138,10 @@ private string FormatDateTimeValue(object value)
138138
if (value is DateTime dateTime)
139139
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
140140
else
141-
return $"'{EscapeString(value.ToString())}'";
141+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
142142
}
143143

144-
private string EscapeString(string input)
144+
private string EscapeString(string? input)
145145
{
146146
if (string.IsNullOrEmpty(input))
147147
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/SqliteScriptGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ private string FormatValue(object value, string dataType)
9797
"char" or "nchar" or "varchar" or "nvarchar" or
9898
"text" or "ntext" or "xml" or "uniqueidentifier" =>
9999
$"'{EscapeString(value.ToString())}'",
100-
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value),
100+
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value)!,
101101
"binary" or "varbinary" or "image" =>
102102
$"X'{BitConverter.ToString((byte[])value).Replace("-", "")}'",
103103
"bit" => ((bool)value) ? "1" : "0",
104-
_ => value.ToString()
104+
_ => value.ToString() ?? string.Empty
105105
};
106106
}
107107

@@ -110,10 +110,10 @@ private string FormatDateTimeValue(object value)
110110
if (value is DateTime dateTime)
111111
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
112112
else
113-
return $"'{EscapeString(value.ToString())}'";
113+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
114114
}
115115

116-
private string EscapeString(string input)
116+
private string EscapeString(string? input)
117117
{
118118
if (string.IsNullOrEmpty(input))
119119
return string.Empty;

‎tools/MsSql2Any/ScriptGenerators/VastbaseScriptGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ private string FormatValue(object value, string dataType)
126126
"char" or "nchar" or "varchar" or "nvarchar" or
127127
"text" or "ntext" or "xml" or "uniqueidentifier" =>
128128
$"'{EscapeString(value.ToString())}'",
129-
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value),
129+
"datetime" or "datetime2" or "smalldatetime" or "date" or "time" => FormatDateTimeValue(value)!,
130130
"binary" or "varbinary" or "image" or "rowversion" or "timestamp" =>
131131
$"\\x{BitConverter.ToString((byte[])value).Replace("-", "").ToLower()}",
132132
"bit" => ((bool)value) ? "true" : "false",
133-
_ => value.ToString()
133+
_ => value.ToString() ?? string.Empty
134134
};
135135
}
136136

@@ -139,10 +139,10 @@ private string FormatDateTimeValue(object value)
139139
if (value is DateTime dateTime)
140140
return $"'{dateTime:yyyy-MM-dd HH:mm:ss.fff}'";
141141
else
142-
return $"'{EscapeString(value.ToString())}'";
142+
return $"'{EscapeString(value?.ToString() ?? string.Empty)}'";
143143
}
144144

145-
private string EscapeString(string input)
145+
private string EscapeString(string? input)
146146
{
147147
if (string.IsNullOrEmpty(input))
148148
return string.Empty;

0 commit comments

Comments
 (0)