Skip to content

Commit 8303f59

Browse files
committed
fix queryMode
1 parent 37c6784 commit 8303f59

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 2.0.0-rc.4
1+
## 2.0.0-rc.5
22

33
- Migrate to `postgres` v3.
44
- Add `concatColumns` to `OnConflictActionDoUpdate` for allowing incremental updates in `upset`.

lib/src/database_access.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {
176176
fmtString,
177177
values: values,
178178
timeoutInSeconds: timeoutInSeconds,
179-
queryMode: useExtendedQuery ? QueryMode.extended : null,
179+
queryMode: useExtendedQuery ? QueryMode.extended : QueryMode.simple,
180180
);
181181
result = sqlResult.affectedRows;
182182
if (expectedResultCount != null && result != expectedResultCount) {
@@ -195,19 +195,23 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {
195195
Future<Result> query(
196196
String fmtString, {
197197
Map<String, Object?>? values,
198-
bool allowReuse = true,
199198
int? timeoutInSeconds,
200199
QueryMode? queryMode,
201200
}) async {
202201
assert(_assertCorrectValues(values));
202+
queryMode ??= values == null || values.isEmpty
203+
? QueryMode.simple
204+
: QueryMode.extended;
203205
try {
204206
// _logger.finest('QUERY: $fmtString');
205-
return _conn.execute(Sql.named(fmtString),
206-
parameters: values,
207-
queryMode: queryMode,
208-
timeout: timeoutInSeconds == null
209-
? null
210-
: Duration(seconds: timeoutInSeconds));
207+
return _conn.execute(
208+
Sql.named(fmtString),
209+
parameters: values,
210+
queryMode: queryMode,
211+
timeout: timeoutInSeconds == null
212+
? null
213+
: Duration(seconds: timeoutInSeconds),
214+
);
211215
} catch (e, stackTrace) {
212216
_logger.warning(
213217
'Error while running statement $fmtString', e, stackTrace);

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: postgres_utils
22
description: A few utils for working with postgresql databases.
3-
version: 2.0.0-rc.4
3+
version: 2.0.0-rc.5
44
homepage: https://github.com/authpass/postgres_utils.dart
55
issue_tracker: https://github.com/authpass/postgres_utils.dart/issues
66

0 commit comments

Comments
 (0)