Skip to content

Commit 471c397

Browse files
cincuranetcincuranet
committed
Code unification.
1 parent 51101ec commit 471c397

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ public override ISqlFragment Visit(DbCastExpression e)
543543
var result = new SqlBuilder();
544544
var sqlPrimitiveType = GetSqlPrimitiveType(e.ResultType);
545545

546-
switch (sqlPrimitiveType.ToLowerInvariant())
546+
switch (sqlPrimitiveType.ToUpperInvariant())
547547
{
548548
default:
549549
result.Append("CAST(");

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,8 @@ private string BuildStoredProcedureSql(string spName, bool returnsSet)
11811181
var sql = spName == null ? string.Empty : spName.Trim();
11821182

11831183
if (sql.Length > 0 &&
1184-
!sql.ToLowerInvariant().StartsWith("execute procedure ") &&
1185-
!sql.ToLowerInvariant().StartsWith("select "))
1184+
!sql.ToUpperInvariant().StartsWith("EXECUTE PROCEDURE ") &&
1185+
!sql.ToUpperInvariant().StartsWith("SELECT "))
11861186
{
11871187
var paramsText = new StringBuilder();
11881188

‎Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionString.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,17 +538,17 @@ private IsolationLevel GetIsolationLevel(string key)
538538

539539
private void CheckIsolationLevel()
540540
{
541-
var il = _options[DefaultKeyIsolationLevel].ToString().ToLowerInvariant();
541+
var il = _options[DefaultKeyIsolationLevel].ToString().ToUpperInvariant();
542542

543543
switch (il)
544544
{
545-
case "readcommitted":
546-
case "readuncommitted":
547-
case "repeatableread":
548-
case "serializable":
549-
case "chaos":
550-
case "unspecified":
551-
case "snapshot":
545+
case "READCOMMITTED":
546+
case "READUNCOMMITTED":
547+
case "REPEATABLEREAD":
548+
case "SERIALIZABLE":
549+
case "CHAOS":
550+
case "UNSPECIFIED":
551+
case "SNAPSHOT":
552552
break;
553553

554554
default:

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbColumns.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected override DataTable ProcessResult(DataTable schema)
139139
row["IS_ARRAY"] = (row["COLUMN_ARRAY"] != DBNull.Value);
140140

141141
var dbType = (FbDbType)TypeHelper.GetDbDataTypeFromBlrType(blrType, subType, scale);
142-
row["COLUMN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLower(CultureInfo.InvariantCulture);
142+
row["COLUMN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLowerInvariant();
143143

144144
if (dbType == FbDbType.Binary || dbType == FbDbType.Text)
145145
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbDomains.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected override DataTable ProcessResult(DataTable schema)
120120
row["IS_ARRAY"] = (row["COLUMN_ARRAY"] != DBNull.Value);
121121

122122
var dbType = (FbDbType)TypeHelper.GetDbDataTypeFromBlrType(blrType, subType, scale);
123-
row["DOMAIN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLower(CultureInfo.InvariantCulture);
123+
row["DOMAIN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLowerInvariant();
124124

125125
if (dbType == FbDbType.Char || dbType == FbDbType.VarChar)
126126
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbProcedureParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected override DataTable ProcessResult(DataTable schema)
132132
row["IS_NULLABLE"] = (row["COLUMN_NULLABLE"] == DBNull.Value);
133133

134134
var dbType = (FbDbType)TypeHelper.GetDbDataTypeFromBlrType(blrType, subType, scale);
135-
row["PARAMETER_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLower(CultureInfo.InvariantCulture);
135+
row["PARAMETER_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLowerInvariant();
136136

137137
if (dbType == FbDbType.Char || dbType == FbDbType.VarChar)
138138
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbSchemaFactory.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -107,109 +107,109 @@ private static DataTable PrepareCollection(FbConnection connection, string colle
107107
{
108108
FbSchema returnSchema = null;
109109

110-
switch (collectionName.ToLower(CultureInfo.InvariantCulture))
110+
switch (collectionName.ToUpperInvariant())
111111
{
112-
case "charactersets":
112+
case "CHARACTERSETS":
113113
returnSchema = new FbCharacterSets();
114114
break;
115115

116-
case "checkconstraints":
116+
case "CHECKCONSTRAINTS":
117117
returnSchema = new FbCheckConstraints();
118118
break;
119119

120-
case "checkconstraintsbytable":
120+
case "CHECKCONSTRAINTSBYTABLE":
121121
returnSchema = new FbChecksByTable();
122122
break;
123123

124-
case "collations":
124+
case "COLLATIONS":
125125
returnSchema = new FbCollations();
126126
break;
127127

128-
case "columns":
128+
case "COLUMNS":
129129
returnSchema = new FbColumns();
130130
break;
131131

132-
case "columnprivileges":
132+
case "COLUMNPRIVILEGES":
133133
returnSchema = new FbColumnPrivileges();
134134
break;
135135

136-
case "domains":
136+
case "DOMAINS":
137137
returnSchema = new FbDomains();
138138
break;
139139

140-
case "foreignkeycolumns":
140+
case "FOREIGNKEYCOLUMNS":
141141
returnSchema = new FbForeignKeyColumns();
142142
break;
143143

144-
case "foreignkeys":
144+
case "FOREIGNKEYS":
145145
returnSchema = new FbForeignKeys();
146146
break;
147147

148-
case "functions":
148+
case "FUNCTIONS":
149149
returnSchema = new FbFunctions();
150150
break;
151151

152-
case "generators":
152+
case "GENERATORS":
153153
returnSchema = new FbGenerators();
154154
break;
155155

156-
case "indexcolumns":
156+
case "INDEXCOLUMNS":
157157
returnSchema = new FbIndexColumns();
158158
break;
159159

160-
case "indexes":
160+
case "INDEXES":
161161
returnSchema = new FbIndexes();
162162
break;
163163

164-
case "primarykeys":
164+
case "PRIMARYKEYS":
165165
returnSchema = new FbPrimaryKeys();
166166
break;
167167

168-
case "procedures":
168+
case "PROCEDURES":
169169
returnSchema = new FbProcedures();
170170
break;
171171

172-
case "procedureparameters":
172+
case "PROCEDUREPARAMETERS":
173173
returnSchema = new FbProcedureParameters();
174174
break;
175175

176-
case "procedureprivileges":
176+
case "PROCEDUREPRIVILEGES":
177177
returnSchema = new FbProcedurePrivilegesSchema();
178178
break;
179179

180-
case "roles":
180+
case "ROLES":
181181
returnSchema = new FbRoles();
182182
break;
183183

184-
case "tables":
184+
case "TABLES":
185185
returnSchema = new FbTables();
186186
break;
187187

188-
case "tableconstraints":
188+
case "TABLECONSTRAINTS":
189189
returnSchema = new FbTableConstraints();
190190
break;
191191

192-
case "tableprivileges":
192+
case "TABLEPRIVILEGES":
193193
returnSchema = new FbTablePrivileges();
194194
break;
195195

196-
case "triggers":
196+
case "TRIGGERS":
197197
returnSchema = new FbTriggers();
198198
break;
199199

200-
case "uniquekeys":
200+
case "UNIQUEKEYS":
201201
returnSchema = new FbUniqueKeys();
202202
break;
203203

204-
case "viewcolumns":
204+
case "VIEWCOLUMNS":
205205
returnSchema = new FbViewColumns();
206206
break;
207207

208-
case "views":
208+
case "VIEWS":
209209
returnSchema = new FbViews();
210210
break;
211211

212-
case "viewprivileges":
212+
case "VIEWPRIVILEGES":
213213
returnSchema = new FbViewPrivileges();
214214
break;
215215

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbTableConstraints.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected override string[] ParseRestrictions(string[] restrictions)
121121
{
122122
if (parsed.Length == 7 && parsed[6] != null)
123123
{
124-
switch (parsed[6].ToString().ToUpper(CultureInfo.InvariantCulture))
124+
switch (parsed[6].ToString().ToUpperInvariant())
125125
{
126126
case "UNIQUE":
127127
parsed[3] = "u";

‎Provider/src/FirebirdSql.Data.FirebirdClient/Schema/FbViewColumns.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected override DataTable ProcessResult(DataTable schema)
132132
row["IS_ARRAY"] = (row["COLUMN_ARRAY"] != DBNull.Value);
133133

134134
var dbType = (FbDbType)TypeHelper.GetDbDataTypeFromBlrType(blrType, subType, scale);
135-
row["COLUMN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLower(CultureInfo.InvariantCulture);
135+
row["COLUMN_DATA_TYPE"] = TypeHelper.GetDataTypeName((DbDataType)dbType).ToLowerInvariant();
136136

137137
if (dbType == FbDbType.Char || dbType == FbDbType.VarChar)
138138
{

0 commit comments

Comments
 (0)