Skip to content

Commit a03d8e8

Browse files
committed
Remove TypeId mentions
1 parent 7b328ef commit a03d8e8

1 file changed

Lines changed: 17 additions & 18 deletions

File tree

Orm/Xtensive.Orm.Tests/Storage/Performance/SqlClientCrudTest.cs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,11 @@ private void InsertTest(int insertCount)
106106
cmd.Parameters.AddWithValue("@pId", (long) 0);
107107
cmd.Parameters.AddWithValue("@pTypeId", (long) 0);
108108
cmd.CommandText = "INSERT INTO " +
109-
"[dbo].[Simplest] ([Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value]) " +
110-
"VALUES (@pId, @pTypeId, @pId)";
109+
"[dbo].[Simplest] ([Simplest].[Id], [Simplest].[Value]) " +
110+
"VALUES (@pId, @pId)";
111111

112112
for (int i = 0; i < insertCount; i++) {
113113
cmd.Parameters["@pId"].SqlValue = (long) i;
114-
cmd.Parameters["@pTypeId"].SqlValue = (long) 0;
115114
cmd.ExecuteNonQuery();
116115
}
117116

@@ -133,15 +132,15 @@ private void MaterializeTest(int count)
133132
while (i < count) {
134133
SqlCommand cmd = connection.CreateCommand();
135134
cmd.Transaction = transaction;
136-
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value] " +
135+
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[Value] " +
137136
"FROM [dbo].[Simplest]";
138137
SqlDataReader dr = cmd.ExecuteReader();
139138
while (dr.Read()) {
140139
var s = new Simplest();
141140
if (!dr.IsDBNull(0))
142141
s.Id = (long) dr.GetValue(0);
143-
if (!dr.IsDBNull(2))
144-
s.Value = (long) dr.GetValue(2);
142+
if (!dr.IsDBNull(1))
143+
s.Value = (long) dr.GetValue(1);
145144
sum += s.Id;
146145
if (++i >= count)
147146
break;
@@ -163,7 +162,7 @@ private void FetchTest(int count)
163162
SqlCommand cmd = connection.CreateCommand();
164163
cmd.Transaction = transaction;
165164
cmd.Parameters.AddWithValue("@pId", 0);
166-
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value] " +
165+
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[Value] " +
167166
"FROM [dbo].[Simplest] WHERE [Simplest].[Id] = @pId";
168167
SqlDataReader dr;
169168

@@ -177,8 +176,8 @@ private void FetchTest(int count)
177176
while (dr.Read()) {
178177
if (!dr.IsDBNull(0))
179178
s.Id = (long) dr.GetValue(0);
180-
if (!dr.IsDBNull(2))
181-
s.Value = (long) dr.GetValue(2);
179+
if (!dr.IsDBNull(1))
180+
s.Value = (long) dr.GetValue(1);
182181
}
183182
sum -= s.Id;
184183
dr.Close();
@@ -197,7 +196,7 @@ private void QueryTest(int count)
197196
SqlCommand cmd = connection.CreateCommand();
198197
cmd.Transaction = transaction;
199198
cmd.Parameters.AddWithValue("@pId", 0);
200-
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value] " +
199+
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[Value] " +
201200
"FROM [dbo].[Simplest] WHERE [Simplest].[id] = @pId";
202201
SqlDataReader dr;
203202

@@ -211,8 +210,8 @@ private void QueryTest(int count)
211210
while (dr.Read()) {
212211
if (!dr.IsDBNull(0))
213212
s.Id = (long) dr.GetValue(0);
214-
if (!dr.IsDBNull(2))
215-
s.Value = (long) dr.GetValue(2);
213+
if (!dr.IsDBNull(1))
214+
s.Value = (long) dr.GetValue(1);
216215
}
217216
dr.Close();
218217
}
@@ -229,16 +228,16 @@ private void UpdateTest()
229228
SqlTransaction transaction = connection.BeginTransaction();
230229
SqlCommand cmd = connection.CreateCommand();
231230
cmd.Transaction = transaction;
232-
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value] " +
231+
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[Value] " +
233232
"FROM [dbo].[Simplest]";
234233
cmd.Parameters.AddWithValue("@pId", 0);
235234
cmd.Parameters.AddWithValue("@pValue", 0);
236235

237236
SqlDataReader dr = cmd.ExecuteReader();
238237
var list = new List<Simplest>();
239238
while (dr.Read()) {
240-
if (!dr.IsDBNull(0) && !dr.IsDBNull(2))
241-
list.Add(new Simplest((long)dr.GetValue(0), (long)dr.GetValue(2)));
239+
if (!dr.IsDBNull(0) && !dr.IsDBNull(1))
240+
list.Add(new Simplest((long) dr.GetValue(0), (long) dr.GetValue(1)));
242241
}
243242
dr.Close();
244243

@@ -279,15 +278,15 @@ private void RemoveTest()
279278
SqlTransaction transaction = connection.BeginTransaction();
280279
SqlCommand cmd = connection.CreateCommand();
281280
cmd.Transaction = transaction;
282-
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[TypeId], [Simplest].[Value] " +
281+
cmd.CommandText = "SELECT [Simplest].[Id], [Simplest].[Value] " +
283282
"FROM [dbo].[Simplest]";
284283
cmd.Parameters.AddWithValue("@pId", 0);
285284

286285
SqlDataReader dr = cmd.ExecuteReader();
287286
var list = new List<Simplest>();
288287
while (dr.Read()) {
289-
if (!dr.IsDBNull(0) && !dr.IsDBNull(2))
290-
list.Add(new Simplest((long) dr.GetValue(0), (long) dr.GetValue(2)));
288+
if (!dr.IsDBNull(0) && !dr.IsDBNull(1))
289+
list.Add(new Simplest((long) dr.GetValue(0), (long) dr.GetValue(1)));
291290
}
292291
dr.Close();
293292

0 commit comments

Comments
 (0)