Skip to content

Commit 596b638

Browse files
cincuranetcincuranet
committed
Using var.
1 parent 3dfa93c commit 596b638

File tree

130 files changed

+1558
-1558
lines changed

Some content is hidden

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

130 files changed

+1558
-1558
lines changed

‎Provider/src/EntityFramework.Firebird.Tests/InfrastructureTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ public void DbProviderServicesTest()
3838
[Test]
3939
public void ProviderManifestTest()
4040
{
41-
DbProviderManifest manifest = GetProviderServices().GetProviderManifest("foobar");
41+
var manifest = GetProviderServices().GetProviderManifest("foobar");
4242
Assert.IsNotNull(manifest);
4343
}
4444

4545
[Test]
4646
public void ProviderManifestTokenTest()
4747
{
48-
string token = GetProviderServices().GetProviderManifestToken(Connection);
48+
var token = GetProviderServices().GetProviderManifestToken(Connection);
4949
Assert.IsNotNull(token);
5050
Assert.IsNotEmpty(token);
51-
Version v = new Version(token);
51+
var v = new Version(token);
5252
Assert.Greater(v.Major, 0);
5353
Assert.GreaterOrEqual(v.Minor, 0);
5454
Assert.AreEqual(v.Build, -1);

‎Provider/src/EntityFramework.Firebird/FbProviderManifest.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,18 @@ public override TypeUsage GetEdmType(TypeUsage storeType)
119119
throw new ArgumentNullException("storeType");
120120
}
121121

122-
string storeTypeName = storeType.EdmType.Name.ToLowerInvariant();
122+
var storeTypeName = storeType.EdmType.Name.ToLowerInvariant();
123123
if (!StoreTypeNameToEdmPrimitiveType.ContainsKey(storeTypeName))
124124
{
125125
throw new ArgumentException(string.Format("The underlying provider does not support the type '{0}'.", storeTypeName));
126126
}
127127

128-
PrimitiveType edmPrimitiveType = base.StoreTypeNameToEdmPrimitiveType[storeTypeName];
128+
var edmPrimitiveType = base.StoreTypeNameToEdmPrimitiveType[storeTypeName];
129129

130-
int maxLength = 0;
131-
bool isUnicode = true;
132-
bool isFixedLen = false;
133-
bool isUnbounded = true;
130+
var maxLength = 0;
131+
var isUnicode = true;
132+
var isFixedLen = false;
133+
var isUnbounded = true;
134134

135135
PrimitiveTypeKind newPrimitiveTypeKind;
136136

@@ -236,13 +236,13 @@ public override TypeUsage GetStoreType(TypeUsage edmType)
236236
}
237237
Debug.Assert(edmType.EdmType.BuiltInTypeKind == BuiltInTypeKind.PrimitiveType);
238238

239-
PrimitiveType primitiveType = edmType.EdmType as PrimitiveType;
239+
var primitiveType = edmType.EdmType as PrimitiveType;
240240
if (primitiveType == null)
241241
{
242242
throw new ArgumentException(string.Format("The underlying provider does not support the type '{0}'.", edmType));
243243
}
244244

245-
ReadOnlyMetadataCollection<Facet> facets = edmType.Facets;
245+
var facets = edmType.Facets;
246246

247247
switch (primitiveType.PrimitiveTypeKind)
248248
{
@@ -281,11 +281,11 @@ public override TypeUsage GetStoreType(TypeUsage edmType)
281281

282282
case PrimitiveTypeKind.Binary: // blob
283283
{
284-
bool isFixedLength = null != facets[MetadataHelpers.FixedLengthFacetName].Value && (bool)facets[MetadataHelpers.FixedLengthFacetName].Value;
285-
Facet f = facets[MetadataHelpers.MaxLengthFacetName];
284+
var isFixedLength = null != facets[MetadataHelpers.FixedLengthFacetName].Value && (bool)facets[MetadataHelpers.FixedLengthFacetName].Value;
285+
var f = facets[MetadataHelpers.MaxLengthFacetName];
286286

287-
bool isMaxLength = f.IsUnbounded || null == f.Value || (int)f.Value > BinaryMaxSize;
288-
int maxLength = !isMaxLength ? (int)f.Value : Int32.MinValue;
287+
var isMaxLength = f.IsUnbounded || null == f.Value || (int)f.Value > BinaryMaxSize;
288+
var maxLength = !isMaxLength ? (int)f.Value : Int32.MinValue;
289289

290290
TypeUsage tu;
291291
if (isFixedLength)
@@ -309,13 +309,13 @@ public override TypeUsage GetStoreType(TypeUsage edmType)
309309

310310
case PrimitiveTypeKind.String: // char, varchar, text blob
311311
{
312-
bool isUnicode = null == facets[MetadataHelpers.UnicodeFacetName].Value || (bool)facets[MetadataHelpers.UnicodeFacetName].Value;
313-
bool isFixedLength = null != facets[MetadataHelpers.FixedLengthFacetName].Value && (bool)facets[MetadataHelpers.FixedLengthFacetName].Value;
314-
Facet f = facets[MetadataHelpers.MaxLengthFacetName];
312+
var isUnicode = null == facets[MetadataHelpers.UnicodeFacetName].Value || (bool)facets[MetadataHelpers.UnicodeFacetName].Value;
313+
var isFixedLength = null != facets[MetadataHelpers.FixedLengthFacetName].Value && (bool)facets[MetadataHelpers.FixedLengthFacetName].Value;
314+
var f = facets[MetadataHelpers.MaxLengthFacetName];
315315
// maxlen is true if facet value is unbounded, the value is bigger than the limited string sizes *or* the facet
316316
// value is null. this is needed since functions still have maxlength facet value as null
317-
bool isMaxLength = f.IsUnbounded || null == f.Value || (int)f.Value > (isUnicode ? UnicodeVarcharMaxSize : AsciiVarcharMaxSize);
318-
int maxLength = !isMaxLength ? (int)f.Value : Int32.MinValue;
317+
var isMaxLength = f.IsUnbounded || null == f.Value || (int)f.Value > (isUnicode ? UnicodeVarcharMaxSize : AsciiVarcharMaxSize);
318+
var maxLength = !isMaxLength ? (int)f.Value : Int32.MinValue;
319319

320320
TypeUsage tu;
321321

@@ -399,8 +399,8 @@ private XmlReader GetStoreSchemaDescription(string ssdlName)
399399

400400
private static XmlReader GetXmlResource(string resourceName)
401401
{
402-
Assembly executingAssembly = Assembly.GetExecutingAssembly();
403-
Stream stream = executingAssembly.GetManifestResourceStream(resourceName);
402+
var executingAssembly = Assembly.GetExecutingAssembly();
403+
var stream = executingAssembly.GetManifestResourceStream(resourceName);
404404
return XmlReader.Create(stream);
405405
}
406406

@@ -422,7 +422,7 @@ public override bool SupportsEscapingLikeArgument(out char escapeCharacter)
422422

423423
public override string EscapeLikeArgument(string argument)
424424
{
425-
StringBuilder sb = new StringBuilder(argument);
425+
var sb = new StringBuilder(argument);
426426
sb.Replace(LikeEscapeCharacter.ToString(), LikeEscapeCharacter.ToString() + LikeEscapeCharacter.ToString());
427427
sb.Replace("%", LikeEscapeCharacter + "%");
428428
sb.Replace("_", LikeEscapeCharacter + "_");

‎Provider/src/EntityFramework.Firebird/FbProviderServices.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private DbCommand CreateCommand(DbProviderManifest manifest, DbCommandTree comma
7777
}
7878

7979
// Now make sure we populate the command's parameters from the CQT's parameters:
80-
foreach (KeyValuePair<string, TypeUsage> queryParameter in commandTree.Parameters)
80+
foreach (var queryParameter in commandTree.Parameters)
8181
{
8282
FbParameter parameter;
8383

@@ -106,7 +106,7 @@ private DbCommand CreateCommand(DbProviderManifest manifest, DbCommandTree comma
106106
throw new InvalidOperationException("SqlGenParametersNotPermitted");
107107
}
108108

109-
foreach (DbParameter parameter in parameters)
109+
foreach (var parameter in parameters)
110110
{
111111
command.Parameters.Add(parameter);
112112
}
@@ -148,9 +148,9 @@ protected override DbProviderManifest GetDbProviderManifest(string versionHint)
148148

149149
internal static FbParameter CreateSqlParameter(string name, TypeUsage type, ParameterMode mode, object value)
150150
{
151-
FbParameter result = new FbParameter(name, value);
151+
var result = new FbParameter(name, value);
152152

153-
ParameterDirection direction = MetadataHelpers.ParameterModeToParameterDirection(mode);
153+
var direction = MetadataHelpers.ParameterModeToParameterDirection(mode);
154154
if (result.Direction != direction)
155155
{
156156
result.Direction = direction;
@@ -159,7 +159,7 @@ internal static FbParameter CreateSqlParameter(string name, TypeUsage type, Para
159159
// output parameters are handled differently (we need to ensure there is space for return
160160
// values where the user has not given a specific Size/MaxLength)
161161
var isOutParam = mode != ParameterMode.In;
162-
FbDbType sqlDbType = GetSqlDbType(type, isOutParam, out var size);
162+
var sqlDbType = GetSqlDbType(type, isOutParam, out var size);
163163

164164
if (result.FbDbType != sqlDbType)
165165
{
@@ -185,7 +185,7 @@ internal static FbParameter CreateSqlParameter(string name, TypeUsage type, Para
185185
private static FbDbType GetSqlDbType(TypeUsage type, bool isOutParam, out int? size)
186186
{
187187
// only supported for primitive type
188-
PrimitiveTypeKind primitiveTypeKind = MetadataHelpers.GetPrimitiveTypeKind(type);
188+
var primitiveTypeKind = MetadataHelpers.GetPrimitiveTypeKind(type);
189189

190190
size = default;
191191

‎Provider/src/EntityFramework.Firebird/MetadataHelpers.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ internal static bool IsFacetValueConstant(TypeUsage type, string facetName)
285285

286286
private static FacetDescription GetFacet(IEnumerable<FacetDescription> facetCollection, string facetName)
287287
{
288-
foreach (FacetDescription facetDescription in facetCollection)
288+
foreach (var facetDescription in facetCollection)
289289
{
290290
if (facetDescription.FacetName == facetName)
291291
{
@@ -308,8 +308,8 @@ internal static bool TryGetTypeFacetDescriptionByName(EdmType edmType, string fa
308308
facetDescription = null;
309309
if (MetadataHelpers.IsPrimitiveType(edmType))
310310
{
311-
PrimitiveType primitiveType = (PrimitiveType)edmType;
312-
foreach (FacetDescription fd in primitiveType.FacetDescriptions)
311+
var primitiveType = (PrimitiveType)edmType;
312+
foreach (var fd in primitiveType.FacetDescriptions)
313313
{
314314
if (facetName.Equals(fd.FacetName, StringComparison.OrdinalIgnoreCase))
315315
{

‎Provider/src/EntityFramework.Firebird/SqlGen/DmlSqlGenerator.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ internal static class DmlSqlGenerator
3737

3838
internal static string GenerateUpdateSql(DbUpdateCommandTree tree, out List<DbParameter> parameters, bool generateParameters = true)
3939
{
40-
StringBuilder commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
41-
ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, generateParameters);
42-
bool first = true;
40+
var commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
41+
var translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, generateParameters);
42+
var first = true;
4343

4444
commandText.Append("UPDATE ");
4545
tree.Target.Expression.Accept(translator);
@@ -73,9 +73,9 @@ internal static string GenerateUpdateSql(DbUpdateCommandTree tree, out List<DbPa
7373
// - we acquire the appropriate locks
7474
// - server-gen columns (e.g. timestamp) get recomputed
7575

76-
EntitySetBase table = ((DbScanExpression)tree.Target.Expression).Target;
76+
var table = ((DbScanExpression)tree.Target.Expression).Target;
7777
// hope this column isn't indexed to not waste power
78-
EdmMember someColumn = table.ElementType.Members.Last(x => !MetadataHelpers.IsStoreGenerated(x));
78+
var someColumn = table.ElementType.Members.Last(x => !MetadataHelpers.IsStoreGenerated(x));
7979
commandText.AppendFormat("{0} = {0}", GenerateMemberSql(someColumn));
8080
}
8181
commandText.AppendLine();
@@ -94,8 +94,8 @@ internal static string GenerateUpdateSql(DbUpdateCommandTree tree, out List<DbPa
9494

9595
internal static string GenerateDeleteSql(DbDeleteCommandTree tree, out List<DbParameter> parameters, bool generateParameters = true)
9696
{
97-
StringBuilder commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
98-
ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, false, generateParameters);
97+
var commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
98+
var translator = new ExpressionTranslator(commandText, tree, false, generateParameters);
9999

100100
commandText.Append("DELETE FROM ");
101101
tree.Target.Expression.Accept(translator);
@@ -111,9 +111,9 @@ internal static string GenerateDeleteSql(DbDeleteCommandTree tree, out List<DbPa
111111

112112
internal static string GenerateInsertSql(DbInsertCommandTree tree, out List<DbParameter> parameters, bool generateParameters = true)
113113
{
114-
StringBuilder commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
115-
ExpressionTranslator translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, generateParameters);
116-
bool first = true;
114+
var commandText = new StringBuilder(CommandTextBuilderInitialCapacity);
115+
var translator = new ExpressionTranslator(commandText, tree, null != tree.Returning, generateParameters);
116+
var first = true;
117117

118118
commandText.Append("INSERT INTO ");
119119
tree.Target.Expression.Accept(translator);
@@ -188,14 +188,14 @@ private static void GenerateReturningSql(
188188
return;
189189
}
190190

191-
EntitySetBase table = ((DbScanExpression)tree.Target.Expression).Target;
192-
IEnumerable<EdmMember> columnsToFetch =
191+
var table = ((DbScanExpression)tree.Target.Expression).Target;
192+
var columnsToFetch =
193193
table.ElementType.Members
194194
.Where(m => MetadataHelpers.IsStoreGenerated(m))
195195
.Except((!(tree is DbInsertCommandTree) ? table.ElementType.KeyMembers : Enumerable.Empty<EdmMember>()));
196196

197-
StringBuilder startBlock = new StringBuilder();
198-
string separator = string.Empty;
197+
var startBlock = new StringBuilder();
198+
var separator = string.Empty;
199199

200200
startBlock.Append("EXECUTE BLOCK ");
201201
if (translator.Parameters.Any())
@@ -207,7 +207,7 @@ private static void GenerateReturningSql(
207207
startBlock.Append(separator);
208208
startBlock.Append(param.ParameterName.Replace("@", string.Empty));
209209
startBlock.Append(" ");
210-
EdmMember member = translator.MemberValues.First(m => m.Value.Contains(param)).Key;
210+
var member = translator.MemberValues.First(m => m.Value.Contains(param)).Key;
211211
startBlock.Append(SqlGenerator.GetSqlPrimitiveType(member.TypeUsage));
212212
if (param.FbDbType == FbDbType.VarChar || param.FbDbType == FbDbType.Char)
213213
startBlock.Append(" CHARACTER SET UTF8");
@@ -222,7 +222,7 @@ private static void GenerateReturningSql(
222222

223223
startBlock.AppendLine("RETURNS (");
224224
separator = string.Empty;
225-
foreach (EdmMember m in columnsToFetch)
225+
foreach (var m in columnsToFetch)
226226
{
227227
startBlock.Append(separator);
228228
startBlock.Append(GenerateMemberSql(m));
@@ -234,14 +234,14 @@ private static void GenerateReturningSql(
234234
startBlock.AppendLine(")");
235235
startBlock.AppendLine("AS BEGIN");
236236

237-
string newCommand = ChangeParamsToPSQLParams(commandText.ToString(), translator.Parameters.Select(p => p.ParameterName).ToArray());
237+
var newCommand = ChangeParamsToPSQLParams(commandText.ToString(), translator.Parameters.Select(p => p.ParameterName).ToArray());
238238
commandText.Remove(0, commandText.Length);
239239
commandText.Insert(0, newCommand);
240240
commandText.Insert(0, startBlock.ToString());
241241

242242
commandText.Append("RETURNING ");
243243
separator = string.Empty;
244-
foreach (EdmMember m in columnsToFetch)
244+
foreach (var m in columnsToFetch)
245245
{
246246
commandText.Append(separator);
247247
commandText.Append(GenerateMemberSql(m));
@@ -250,7 +250,7 @@ private static void GenerateReturningSql(
250250
}
251251
commandText.Append(" INTO ");
252252
separator = string.Empty;
253-
foreach (EdmMember m in columnsToFetch)
253+
foreach (var m in columnsToFetch)
254254
{
255255
commandText.Append(separator);
256256
commandText.Append(":" + GenerateMemberSql(m));
@@ -266,8 +266,8 @@ private static void GenerateReturningSql(
266266

267267
private static string ChangeParamsToPSQLParams(string commandText, string[] parametersUsed)
268268
{
269-
StringBuilder command = new StringBuilder(commandText);
270-
foreach (string param in parametersUsed)
269+
var command = new StringBuilder(commandText);
270+
foreach (var param in parametersUsed)
271271
{
272272
command.Replace(param, ":" + param.Remove(0, 1));
273273
}

‎Provider/src/EntityFramework.Firebird/SqlGen/ExpressionTranslator.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ public override void Visit(DbNewInstanceExpression expression)
289289
{
290290
// assumes all arguments are self-describing (no need to use aliases
291291
// because no renames are ever used in the projection)
292-
bool first = true;
292+
var first = true;
293293

294-
foreach (DbExpression argument in expression.Arguments)
294+
foreach (var argument in expression.Arguments)
295295
{
296296
if (first)
297297
{
@@ -336,10 +336,10 @@ internal ExpressionTranslator(
336336
// generate parameter (name based on parameter ordinal)
337337
internal FbParameter CreateParameter(object value, TypeUsage type)
338338
{
339-
string parameterName = string.Concat("@p", _parameterNameCount.ToString(CultureInfo.InvariantCulture));
339+
var parameterName = string.Concat("@p", _parameterNameCount.ToString(CultureInfo.InvariantCulture));
340340
_parameterNameCount++;
341341

342-
FbParameter parameter = FbProviderServices.CreateSqlParameter(parameterName, type, ParameterMode.In, value);
342+
var parameter = FbProviderServices.CreateSqlParameter(parameterName, type, ParameterMode.In, value);
343343

344344
_parameters.Add(parameter);
345345

@@ -362,15 +362,15 @@ internal void RegisterMemberValue(DbExpression propertyExpression, DbExpression
362362
"DML predicates and setters must be of the form property = value");
363363

364364
// get name of left property
365-
EdmMember property = ((DbPropertyExpression)propertyExpression).Property;
365+
var property = ((DbPropertyExpression)propertyExpression).Property;
366366

367367
// don't track null values
368368
if (value.ExpressionKind != DbExpressionKind.Null)
369369
{
370370
Debug.Assert(value.ExpressionKind == DbExpressionKind.Constant, "value must either constant or null");
371371

372372
// retrieve the last parameter added (which describes the parameter)
373-
DbParameter p = _parameters[_parameters.Count - 1];
373+
var p = _parameters[_parameters.Count - 1];
374374
if (!_memberValues.ContainsKey(property))
375375
_memberValues.Add(property, new List<DbParameter>(new[] { p }));
376376
else

‎Provider/src/EntityFramework.Firebird/SqlGen/FirstClause.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal FirstClause(ISqlFragment firstCount)
5656
/// <param name="topCount"></param>
5757
internal FirstClause(int firstCount)
5858
{
59-
SqlBuilder sqlBuilder = new SqlBuilder();
59+
var sqlBuilder = new SqlBuilder();
6060
sqlBuilder.Append(firstCount.ToString(CultureInfo.InvariantCulture));
6161
_firstCount = sqlBuilder;
6262
}

‎Provider/src/EntityFramework.Firebird/SqlGen/JoinSymbol.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public JoinSymbol(string name, TypeUsage type, List<Symbol> extents)
8787
_extentList = new List<Symbol>(extents.Count);
8888
_nameToExtent = new Dictionary<string, Symbol>(extents.Count, StringComparer.OrdinalIgnoreCase);
8989

90-
foreach (Symbol symbol in extents)
90+
foreach (var symbol in extents)
9191
{
9292
_nameToExtent[symbol.Name] = symbol;
9393
ExtentList.Add(symbol);

‎Provider/src/EntityFramework.Firebird/SqlGen/SkipClause.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal SkipClause(ISqlFragment skipCount)
5656
/// <param name="topCount"></param>
5757
internal SkipClause(int skipCount)
5858
{
59-
SqlBuilder sqlBuilder = new SqlBuilder();
59+
var sqlBuilder = new SqlBuilder();
6060
sqlBuilder.Append(skipCount.ToString(CultureInfo.InvariantCulture));
6161
_skipCount = sqlBuilder;
6262
}

‎Provider/src/EntityFramework.Firebird/SqlGen/SqlBuilder.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ public void WriteSql(SqlWriter writer, SqlGenerator sqlGenerator)
9090
{
9191
if (null != _sqlFragments)
9292
{
93-
foreach (object o in _sqlFragments)
93+
foreach (var o in _sqlFragments)
9494
{
95-
string str = (o as string);
95+
var str = (o as string);
9696
if (null != str)
9797
{
9898
writer.Write(str);
9999
}
100100
else
101101
{
102-
ISqlFragment sqlFragment = (o as ISqlFragment);
102+
var sqlFragment = (o as ISqlFragment);
103103
if (null != sqlFragment)
104104
{
105105
sqlFragment.WriteSql(writer, sqlGenerator);

0 commit comments

Comments
 (0)