Skip to content

Commit 4f39be9

Browse files
escarlsescarls
committed
Changed CLR types to keywords according to the rules
1 parent e8c4962 commit 4f39be9

File tree

68 files changed

+206
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+206
-206
lines changed

‎src/FluentMigrator.Runner.Core/Generators/Base/ColumnBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ public virtual string FormatForeignKey(ForeignKeyDefinition foreignKey, Func<For
250250
return string.Format(
251251
ForeignKeyConstraint,
252252
constraintClause,
253-
String.Join(", ", foreignColumns.ToArray()),
253+
string.Join(", ", foreignColumns.ToArray()),
254254
Quoter.QuoteTableName(foreignKey.PrimaryTable, foreignKey.PrimaryTableSchema),
255-
String.Join(", ", primaryColumns.ToArray()),
255+
string.Join(", ", primaryColumns.ToArray()),
256256
FormatCascade("DELETE", foreignKey.OnDelete),
257257
FormatCascade("UPDATE", foreignKey.OnUpdate)
258258
);
@@ -316,9 +316,9 @@ public virtual bool ShouldPrimaryKeysBeAddedSeparately(IEnumerable<ColumnDefinit
316316
public virtual string AddPrimaryKeyConstraint(string tableName, IEnumerable<ColumnDefinition> primaryKeyColumns)
317317
{
318318
var pkColDefs = primaryKeyColumns.ToList();
319-
var keyColumns = String.Join(", ", pkColDefs.Select(x => Quoter.QuoteColumnName(x.Name)).ToArray());
319+
var keyColumns = string.Join(", ", pkColDefs.Select(x => Quoter.QuoteColumnName(x.Name)).ToArray());
320320

321-
return String.Format(", {0}PRIMARY KEY ({1})", GetPrimaryKeyConstraintName(pkColDefs, tableName), keyColumns);
321+
return string.Format(", {0}PRIMARY KEY ({1})", GetPrimaryKeyConstraintName(pkColDefs, tableName), keyColumns);
322322
}
323323

324324
/// <summary>

‎src/FluentMigrator.Runner.Core/Generators/Generic/GenericGenerator.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ public override string Generate(CreateTableExpression expression)
103103

104104
public override string Generate(DeleteTableExpression expression)
105105
{
106-
return String.Format(DropTable, Quoter.QuoteTableName(expression.TableName, expression.SchemaName));
106+
return string.Format(DropTable, Quoter.QuoteTableName(expression.TableName, expression.SchemaName));
107107
}
108108

109109
public override string Generate(RenameTableExpression expression)
110110
{
111-
return String.Format(RenameTable, Quoter.QuoteTableName(expression.OldName, expression.SchemaName), Quoter.Quote(expression.NewName));
111+
return string.Format(RenameTable, Quoter.QuoteTableName(expression.OldName, expression.SchemaName), Quoter.Quote(expression.NewName));
112112
}
113113

114114
public override string Generate(CreateColumnExpression expression)
@@ -119,7 +119,7 @@ public override string Generate(CreateColumnExpression expression)
119119
return errors;
120120
}
121121

122-
return String.Format(AddColumn, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), Column.Generate(expression.Column));
122+
return string.Format(AddColumn, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), Column.Generate(expression.Column));
123123
}
124124

125125
public override string Generate(AlterColumnExpression expression)
@@ -130,7 +130,7 @@ public override string Generate(AlterColumnExpression expression)
130130
return errors;
131131
}
132132

133-
return String.Format(AlterColumn, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), Column.Generate(expression.Column));
133+
return string.Format(AlterColumn, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), Column.Generate(expression.Column));
134134
}
135135

136136
public override string Generate(DeleteColumnExpression expression)
@@ -150,7 +150,7 @@ public override string Generate(DeleteColumnExpression expression)
150150

151151
public override string Generate(RenameColumnExpression expression)
152152
{
153-
return String.Format(RenameColumn,
153+
return string.Format(RenameColumn,
154154
Quoter.QuoteTableName(expression.TableName, expression.SchemaName),
155155
Quoter.QuoteColumnName(expression.OldName),
156156
Quoter.QuoteColumnName(expression.NewName)
@@ -175,17 +175,17 @@ public override string Generate(CreateIndexExpression expression)
175175
}
176176
}
177177

178-
return String.Format(CreateIndex
178+
return string.Format(CreateIndex
179179
, GetUniqueString(expression)
180180
, GetClusterTypeString(expression)
181181
, Quoter.QuoteIndexName(expression.Index.Name)
182182
, Quoter.QuoteTableName(expression.Index.TableName, expression.Index.SchemaName)
183-
, String.Join(", ", indexColumns));
183+
, string.Join(", ", indexColumns));
184184
}
185185

186186
public override string Generate(DeleteIndexExpression expression)
187187
{
188-
return String.Format(DropIndex, Quoter.QuoteIndexName(expression.Index.Name), Quoter.QuoteTableName(expression.Index.TableName, expression.Index.SchemaName));
188+
return string.Format(DropIndex, Quoter.QuoteIndexName(expression.Index.Name), Quoter.QuoteTableName(expression.Index.TableName, expression.Index.SchemaName));
189189
}
190190

191191
public override string Generate(CreateForeignKeyExpression expression)
@@ -210,7 +210,7 @@ public override string Generate(CreateConstraintExpression expression)
210210
return string.Format(CreateConstraint, Quoter.QuoteTableName(expression.Constraint.TableName, expression.Constraint.SchemaName),
211211
Quoter.QuoteConstraintName(expression.Constraint.ConstraintName),
212212
constraintType,
213-
String.Join(", ", columns));
213+
string.Join(", ", columns));
214214
}
215215

216216
public override string Generate(DeleteConstraintExpression expression)
@@ -278,8 +278,8 @@ protected List<KeyValuePair<string,string>> GenerateColumnNamesAndValues(InsertD
278278
columnValues.Add(Quoter.QuoteValue(item.Value));
279279
}
280280

281-
var columns = String.Join(", ", columnNames.ToArray());
282-
var values = String.Join(", ", columnValues.ToArray());
281+
var columns = string.Join(", ", columnNames.ToArray());
282+
var values = string.Join(", ", columnValues.ToArray());
283283
insertStrings.Add(new KeyValuePair<string, string>(columns, values));
284284
}
285285

@@ -328,7 +328,7 @@ public override string Generate(UpdateDataExpression expression)
328328
op, Quoter.QuoteValue(item.Value)));
329329
}
330330
}
331-
return String.Format(UpdateData, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), String.Join(", ", updateItems.ToArray()), String.Join(" AND ", whereClauses.ToArray()));
331+
return string.Format(UpdateData, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), string.Join(", ", updateItems.ToArray()), string.Join(" AND ", whereClauses.ToArray()));
332332
}
333333

334334
public override string Generate(DeleteDataExpression expression)
@@ -355,7 +355,7 @@ public override string Generate(DeleteDataExpression expression)
355355
Quoter.QuoteValue(item.Value)));
356356
}
357357

358-
deleteItems.Add(string.Format(DeleteData, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), String.Join(" AND ", whereClauses.ToArray())));
358+
deleteItems.Add(string.Format(DeleteData, Quoter.QuoteTableName(expression.TableName, expression.SchemaName), string.Join(" AND ", whereClauses.ToArray())));
359359
}
360360
}
361361

‎src/FluentMigrator.Runner.Core/Generators/Generic/GenericQuoter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public virtual string FormatEnum(object value)
174174
/// <inheritdoc />
175175
public virtual bool IsQuoted(string name)
176176
{
177-
if (String.IsNullOrEmpty(name)) return false;
177+
if (string.IsNullOrEmpty(name)) return false;
178178
//This can return true incorrectly in some cases edge cases.
179179
//If a string say [myname]] is passed in this is not correctly quote for MSSQL but this function will
180180
//return true.

‎src/FluentMigrator.Runner.Core/Infrastructure/RuntimeHost.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static IEnumerable<string> GetFullGacDirectories()
117117
return GetFullGacDirectoriesOnWindows(winDir);
118118
}
119119

120-
var asmPath = typeof(Int32).Assembly.Location;
120+
var asmPath = typeof(int).Assembly.Location;
121121
var isMono = asmPath.Contains("/mono/");
122122
if (!isMono)
123123
return _noNames;

‎src/FluentMigrator.Runner.Firebird/Generators/Firebird/FirebirdGenerator.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public FirebirdGenerator(
8888
public override string Generate(AlterDefaultConstraintExpression expression)
8989
{
9090
Truncator.Truncate(expression);
91-
return String.Format("ALTER TABLE {0} ALTER COLUMN {1} SET DEFAULT {2}",
91+
return string.Format("ALTER TABLE {0} ALTER COLUMN {1} SET DEFAULT {2}",
9292
Quoter.QuoteTableName(expression.TableName),
9393
Quoter.QuoteColumnName(expression.ColumnName),
9494
Quoter.QuoteValue(expression.DefaultValue)
@@ -98,7 +98,7 @@ public override string Generate(AlterDefaultConstraintExpression expression)
9898
public override string Generate(DeleteDefaultConstraintExpression expression)
9999
{
100100
Truncator.Truncate(expression);
101-
return String.Format("ALTER TABLE {0} ALTER COLUMN {1} DROP DEFAULT",
101+
return string.Format("ALTER TABLE {0} ALTER COLUMN {1} DROP DEFAULT",
102102
Quoter.QuoteTableName(expression.TableName),
103103
Quoter.QuoteColumnName(expression.ColumnName)
104104
);
@@ -130,7 +130,7 @@ public override string Generate(CreateIndexExpression expression)
130130

131131
}
132132

133-
return String.Format(CreateIndex
133+
return string.Format(CreateIndex
134134
, GetUniqueString(expression)
135135
, indexDirection == Direction.Ascending ? "ASC " : "DESC "
136136
, Quoter.QuoteIndexName(expression.Index.Name)
@@ -148,22 +148,22 @@ public override string Generate(AlterColumnExpression expression)
148148
public override string Generate(CreateSequenceExpression expression)
149149
{
150150
Truncator.Truncate(expression);
151-
return String.Format("CREATE SEQUENCE {0}", Quoter.QuoteSequenceName(expression.Sequence.Name));
151+
return string.Format("CREATE SEQUENCE {0}", Quoter.QuoteSequenceName(expression.Sequence.Name));
152152
}
153153

154154
public override string Generate(DeleteSequenceExpression expression)
155155
{
156156
Truncator.Truncate(expression);
157-
return String.Format("DROP SEQUENCE {0}", Quoter.QuoteSequenceName(expression.SequenceName));
157+
return string.Format("DROP SEQUENCE {0}", Quoter.QuoteSequenceName(expression.SequenceName));
158158
}
159159

160160
public string GenerateAlterSequence(SequenceDefinition sequence)
161161
{
162162
Truncator.Truncate(sequence);
163163
if (sequence.StartWith != null)
164-
return String.Format("ALTER SEQUENCE {0} RESTART WITH {1}", Quoter.QuoteSequenceName(sequence.Name), sequence.StartWith.ToString());
164+
return string.Format("ALTER SEQUENCE {0} RESTART WITH {1}", Quoter.QuoteSequenceName(sequence.Name), sequence.StartWith.ToString());
165165

166-
return String.Empty;
166+
return string.Empty;
167167
}
168168

169169
public override string Generate(CreateTableExpression expression)
@@ -259,7 +259,7 @@ public override string Generate(DeleteDataExpression expression)
259259
public virtual string GenerateSetNullPre3(string tableName, ColumnDefinition column)
260260
{
261261
Truncator.Truncate(column);
262-
return String.Format(AlterColumnSetNullablePre3,
262+
return string.Format(AlterColumnSetNullablePre3,
263263
!column.IsNullable.HasValue || !column.IsNullable.Value ? "1" : "NULL",
264264
Quoter.QuoteValue(tableName),
265265
Quoter.QuoteValue(column.Name)
@@ -271,7 +271,7 @@ public virtual string GenerateSetNull3(string tableName, ColumnDefinition column
271271
Truncator.Truncate(column);
272272
var dropSet = !column.IsNullable.HasValue ? "DROP" : "SET";
273273
var nullable = column.IsNullable.GetValueOrDefault() ? "NULL" : "NOT NULL";
274-
return String.Format(AlterColumnSetNullable3,
274+
return string.Format(AlterColumnSetNullable3,
275275
Quoter.QuoteTableName(tableName),
276276
Quoter.QuoteColumnName(column.Name),
277277
dropSet,
@@ -282,7 +282,7 @@ public virtual string GenerateSetNull3(string tableName, ColumnDefinition column
282282
public virtual string GenerateSetType(string tableName, ColumnDefinition column)
283283
{
284284
Truncator.Truncate(column);
285-
return String.Format(AlterColumnSetType,
285+
return string.Format(AlterColumnSetType,
286286
Quoter.QuoteTableName(tableName),
287287
Quoter.QuoteColumnName(column.Name),
288288
((FirebirdColumn) Column).GenerateForTypeAlter(column)

‎src/FluentMigrator.Runner.Firebird/Generators/Firebird/FirebirdTruncator.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region License
1+
#region License
22
//
33
// Copyright (c) 2018, Fluent Migrator Project
44
//
@@ -253,12 +253,12 @@ public void TruncateColumns(ICollection<ColumnDefinition> columns)
253253

254254
public string Truncate(string name)
255255
{
256-
if (!String.IsNullOrEmpty(name))
256+
if (!string.IsNullOrEmpty(name))
257257
{
258258
if (name.Length > FirebirdOptions.MaxNameLength)
259259
{
260260
if (!_enabled)
261-
throw new ArgumentException(String.Format("Name too long: {0}", name));
261+
throw new ArgumentException(string.Format("Name too long: {0}", name));
262262

263263
return name.Substring(0, Math.Min(FirebirdOptions.MaxNameLength, name.Length));
264264
}
@@ -268,12 +268,12 @@ public string Truncate(string name)
268268

269269
public string Pack(string name)
270270
{
271-
if (!String.IsNullOrEmpty(name))
271+
if (!string.IsNullOrEmpty(name))
272272
{
273273
if (name.Length > FirebirdOptions.MaxNameLength)
274274
{
275275
if (!_enabled)
276-
throw new ArgumentException(String.Format("Name too long: {0}", name));
276+
throw new ArgumentException(string.Format("Name too long: {0}", name));
277277

278278
byte[] byteHash = MD5.Create().ComputeHash(Encoding.ASCII.GetBytes(name));
279279
string hash = Convert.ToBase64String(byteHash);
@@ -286,7 +286,7 @@ public string Pack(string name)
286286
sb.Append(c);
287287
}
288288
hash = sb.ToString();
289-
return String.Format("fk_{0}", hash.Substring(0, Math.Min(28, hash.Length)));
289+
return string.Format("fk_{0}", hash.Substring(0, Math.Min(28, hash.Length)));
290290
}
291291
}
292292
return name;

‎src/FluentMigrator.Runner.Firebird/Processors/Firebird/FirebirdSchemaInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private object GetDefaultValue(object val)
177177
return DBNull.Value;
178178

179179
string src = val.ToString().Trim();
180-
if (String.IsNullOrEmpty(src))
180+
if (string.IsNullOrEmpty(src))
181181
return DBNull.Value;
182182

183183
if (src.StartsWith("DEFAULT ", StringComparison.InvariantCultureIgnoreCase))
@@ -202,7 +202,7 @@ private object GetDefaultValue(object val)
202202

203203
}
204204
}
205-
throw new NotSupportedException(String.Format("Can't parse default value {0}", src));
205+
throw new NotSupportedException(string.Format("Can't parse default value {0}", src));
206206
}
207207
}
208208

‎src/FluentMigrator.Runner.Firebird/Processors/Firebird/FirebirdTableSchema.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public FirebirdTableSchema(string tableName, FirebirdProcessor processor, Firebi
4949
Definition = new FirebirdTableDefinition()
5050
{
5151
Name = tableName,
52-
SchemaName = String.Empty
52+
SchemaName = string.Empty
5353
};
5454
Load();
5555
}

‎src/FluentMigrator.Runner.Hana/Generators/Hana/HanaColumn.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override string FormatNullable(ColumnDefinition column)
3838

3939
return column.IsNullable.HasValue
4040
? (column.IsNullable.Value ? "NULL" : "NOT NULL")
41-
: String.Empty;
41+
: string.Empty;
4242
}
4343

4444
protected override string GetPrimaryKeyConstraintName(IEnumerable<ColumnDefinition> primaryKeyColumns, string tableName)
@@ -68,9 +68,9 @@ protected override string GetPrimaryKeyConstraintName(IEnumerable<ColumnDefiniti
6868

6969
public override string AddPrimaryKeyConstraint(string tableName, IEnumerable<ColumnDefinition> primaryKeyColumns)
7070
{
71-
var keyColumns = String.Join(", ", primaryKeyColumns.Select(x => Quoter.QuoteColumnName(x.Name)).ToArray());
71+
var keyColumns = string.Join(", ", primaryKeyColumns.Select(x => Quoter.QuoteColumnName(x.Name)).ToArray());
7272

73-
return String.Format(", PRIMARY KEY ({0})", keyColumns);
73+
return string.Format(", PRIMARY KEY ({0})", keyColumns);
7474
}
7575
}
7676
}

‎src/FluentMigrator.Runner.Jet/Processors/Jet/JetProcessor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public override DataSet Read(string template, params object[] args)
134134
EnsureConnectionIsOpen();
135135

136136
var ds = new DataSet();
137-
using (var command = new OleDbCommand(String.Format(template, args), Connection, Transaction))
137+
using (var command = new OleDbCommand(string.Format(template, args), Connection, Transaction))
138138
using (var adapter = new OleDbDataAdapter(command))
139139
{
140140
adapter.Fill(ds);
@@ -146,7 +146,7 @@ public override bool Exists(string template, params object[] args)
146146
{
147147
EnsureConnectionIsOpen();
148148

149-
using (var command = new OleDbCommand(String.Format(template, args), Connection, Transaction))
149+
using (var command = new OleDbCommand(string.Format(template, args), Connection, Transaction))
150150
using (var reader = command.ExecuteReader())
151151
{
152152
Debug.Assert(reader != null, nameof(reader) + " != null");
@@ -161,7 +161,7 @@ public override bool SequenceExists(string schemaName, string sequenceName)
161161

162162
public override void Execute(string template, params object[] args)
163163
{
164-
Process(String.Format(template, args));
164+
Process(string.Format(template, args));
165165
}
166166

167167
public override bool SchemaExists(string tableName)

0 commit comments

Comments
 (0)