Change sample codes to call Close method when done reading. (#8438)

rikat-ms · web-flow · commit 5a24c869049a · 2022-09-29T12:42:45.000-07:00
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/Project.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
+  
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/source.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/CS/source.cs
@@ -23,10 +23,12 @@ private static void CreateCommand(string queryString,
             connection.Open();
 
             SqlCommand command = new SqlCommand(queryString, connection);
-            SqlDataReader reader = command.ExecuteReader();
-            while (reader.Read())
+            using(SqlDataReader reader = command.ExecuteReader())
             {
-                Console.WriteLine(String.Format("{0}", reader[0]));
+                while (reader.Read())
+                {
+                    Console.WriteLine(String.Format("{0}", reader[0]));
+                }
             }
         }
     }
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/Project.csproj b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/Project.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
+  
+</Project>
diff --git a/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/mysample.cs b/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/CS/mysample.cs
@@ -22,11 +22,13 @@ private static void CreateCommand(string queryString,
         {
             SqlCommand command = new SqlCommand(queryString, connection);
             connection.Open();
-            SqlDataReader reader =
-                command.ExecuteReader(CommandBehavior.CloseConnection);
-            while (reader.Read())
+            using(SqlDataReader reader =
+                command.ExecuteReader(CommandBehavior.CloseConnection))
             {
-                Console.WriteLine(String.Format("{0}", reader[0]));
+                while (reader.Read())
+                {
+                    Console.WriteLine(String.Format("{0}", reader[0]));
+                }
             }
         }
     }
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/source.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader Example/VB/source.vb
@@ -21,9 +21,14 @@ Module Module1
 
             Dim command As New SqlCommand(queryString, connection)
             Dim reader As SqlDataReader = command.ExecuteReader()
-            While reader.Read()
-                Console.WriteLine("{0}", reader(0))
-            End While
+            Try
+                While reader.Read()
+                    Console.WriteLine("{0}", reader(0))
+                End While
+            Finally
+                ' Always call Close when done reading.
+                reader.Close()
+            End Try
         End Using
     End Sub
     ' </Snippet1>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/mysample.vb b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.ExecuteReader2/VB/mysample.vb
@@ -21,9 +21,14 @@ Module Module1
             connection.Open()
             Dim reader As SqlDataReader = _
                 command.ExecuteReader(CommandBehavior.CloseConnection)
-            While reader.Read()
-                Console.WriteLine("{0}", reader(0))
-            End While
+            Try
+                While reader.Read()
+                    Console.WriteLine("{0}", reader(0))
+                End While
+            Finally
+                ' Always call Close when done reading.
+                reader.Close()
+            End Try
         End Using
     End Sub
     ' </Snippet1>
diff --git a/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/Project.vbproj b/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData SqlCommand.SqlCommand2 Example/VB/Project.vbproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
+
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,12 @@ private static void CreateCommand(string queryString,`
`23`	`23`	`connection.Open();`
`24`	`24`
`25`	`25`	`SqlCommand command = new SqlCommand(queryString, connection);`
`26`		`- SqlDataReader reader = command.ExecuteReader();`
`27`		`- while (reader.Read())`
	`26`	`+ using(SqlDataReader reader = command.ExecuteReader())`
`28`	`27`	`{`
`29`		`- Console.WriteLine(String.Format("{0}", reader[0]));`
	`28`	`+ while (reader.Read())`
	`29`	`+ {`
	`30`	`+ Console.WriteLine(String.Format("{0}", reader[0]));`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,13 @@ private static void CreateCommand(string queryString,`
`22`	`22`	`{`
`23`	`23`	`SqlCommand command = new SqlCommand(queryString, connection);`
`24`	`24`	`connection.Open();`
`25`		`- SqlDataReader reader =`
`26`		`- command.ExecuteReader(CommandBehavior.CloseConnection);`
`27`		`- while (reader.Read())`
	`25`	`+ using(SqlDataReader reader =`
	`26`	`+ command.ExecuteReader(CommandBehavior.CloseConnection))`
`28`	`27`	`{`
`29`		`- Console.WriteLine(String.Format("{0}", reader[0]));`
	`28`	`+ while (reader.Read())`
	`29`	`+ {`
	`30`	`+ Console.WriteLine(String.Format("{0}", reader[0]));`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`	`}`