Skip to content

Commit 88c0651

Browse files
committed
CommandBehavior is bit flags
1 parent 0b1155e commit 88c0651

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

DuckDB.NET.Data/DuckDBCommand.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
138138
{
139139
EnsureConnectionOpen();
140140

141-
return new DuckDBDataReader(this, GetStatements(), behavior);
141+
var closeConnection = behavior.HasFlag(CommandBehavior.CloseConnection);
142+
143+
return new DuckDBDataReader(this, GetStatements(), closeConnection);
142144
}
143145

144146
public override void Prepare() { }

DuckDB.NET.Data/DuckDBDataReader.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace DuckDB.NET.Data;
1212
public class DuckDBDataReader : DbDataReader
1313
{
1414
private readonly DuckDBCommand command;
15-
private readonly CommandBehavior behavior;
15+
private readonly bool closeConnection;
1616

1717
private DuckDBResult? currentResult;
1818
private DuckDBDataChunk? currentChunk;
@@ -31,10 +31,10 @@ public class DuckDBDataReader : DbDataReader
3131
private VectorDataReaderBase[] vectorReaders = [];
3232
private Dictionary<string, int> columnMapping = [];
3333

34-
internal DuckDBDataReader(DuckDBCommand command, IEnumerable<PreparedStatement.PreparedStatement> statements, CommandBehavior behavior)
34+
internal DuckDBDataReader(DuckDBCommand command, IEnumerable<PreparedStatement.PreparedStatement> statements, bool closeConnection)
3535
{
3636
this.command = command;
37-
this.behavior = behavior;
37+
this.closeConnection = closeConnection;
3838
statementEnumerator = statements.GetEnumerator();
3939

4040
InitNextReader();
@@ -386,7 +386,7 @@ public override void Close()
386386

387387
closed = true;
388388

389-
if (behavior == CommandBehavior.CloseConnection)
389+
if (closeConnection)
390390
{
391391
command.CloseConnection();
392392
}

0 commit comments

Comments
 (0)