Merge pull request #10 from lslv1243/master

add support for interval
isoos · Aug 21, 2021 · 1d74c21 · 1d74c21
2 parents 9f66256 + dd904fc
commit 1d74c21
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.1
+
+- Support for type `interval`, [#10](https://github.com/isoos/postgresql-dart/pull/10).
+
 ## 2.4.0
 
 - Support for type `numeric` / `decimal` ([#7](https://github.com/isoos/postgresql-dart/pull/7), [#9](https://github.com/isoos/postgresql-dart/pull/9)).

diff --git a/lib/src/binary_codec.dart b/lib/src/binary_codec.dart
@@ -148,6 +148,18 @@ class PostgresBinaryEncoder extends Converter<dynamic, Uint8List?> {
               'Invalid type for parameter value. Expected: DateTime Got: ${value.runtimeType}');
         }
 
+      case PostgreSQLDataType.interval:
+        {
+          if (value is Duration) {
+            final bd = ByteData(16);
+            bd.setInt64(0, value.inMicroseconds);
+            // ignoring the second 8 bytes
+            return bd.buffer.asUint8List();
+          }
+          throw FormatException(
+              'Invalid type for parameter value. Expected: Duration Got: ${value.runtimeType}');
+        }
+
       case PostgreSQLDataType.numeric:
         {
           if (value is double || value is int) {
@@ -422,6 +434,12 @@ class PostgresBinaryDecoder extends Converter<Uint8List, dynamic> {
         return DateTime.utc(2000)
             .add(Duration(microseconds: buffer.getInt64(0)));
 
+      case PostgreSQLDataType.interval:
+        {
+          if (buffer.getInt64(8) != 0) throw UnimplementedError();
+          return Duration(microseconds: buffer.getInt64(0));
+        }
+
       case PostgreSQLDataType.numeric:
         return _decodeNumeric(value);
 
@@ -541,6 +559,7 @@ class PostgresBinaryDecoder extends Converter<Uint8List, dynamic> {
     1082: PostgreSQLDataType.date,
     1114: PostgreSQLDataType.timestampWithoutTimezone,
     1184: PostgreSQLDataType.timestampWithTimezone,
+    1186: PostgreSQLDataType.interval,
     1700: PostgreSQLDataType.numeric,
     2950: PostgreSQLDataType.uuid,
     3802: PostgreSQLDataType.jsonb,

diff --git a/lib/src/query.dart b/lib/src/query.dart
@@ -321,6 +321,7 @@ class PostgreSQLFormatIdentifier {
     'date': PostgreSQLDataType.date,
     'timestamp': PostgreSQLDataType.timestampWithoutTimezone,
     'timestamptz': PostgreSQLDataType.timestampWithTimezone,
+    'interval': PostgreSQLDataType.interval,
     'numeric': PostgreSQLDataType.numeric,
     'jsonb': PostgreSQLDataType.jsonb,
     'bytea': PostgreSQLDataType.byteArray,

diff --git a/lib/src/substituter.dart b/lib/src/substituter.dart
@@ -37,6 +37,8 @@ class PostgreSQLFormat {
         return 'timestamp';
       case PostgreSQLDataType.timestampWithTimezone:
         return 'timestamptz';
+      case PostgreSQLDataType.interval:
+        return 'interval';
       case PostgreSQLDataType.numeric:
         return 'numeric';
       case PostgreSQLDataType.date:

diff --git a/lib/src/types.dart b/lib/src/types.dart
@@ -42,6 +42,9 @@ enum PostgreSQLDataType {
   /// Must be a [DateTime] (microsecond date and time precision)
   timestampWithTimezone,
 
+  /// Must be a [Duration]
+  interval,
+
   /// Must be a [List<int>]
   numeric,
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: postgres
 description: PostgreSQL database driver. Supports statement reuse and binary protocol.
-version: 2.4.0
+version: 2.4.1
 homepage: https://github.com/isoos/postgresql-dart
 
 environment:

diff --git a/test/encoding_test.dart b/test/encoding_test.dart
@@ -183,6 +183,25 @@ void main() {
       }
     });
 
+    test('interval', () async {
+      await expectInverse(Duration(minutes: 15), PostgreSQLDataType.interval);
+      await expectInverse(
+          Duration(days: 1, minutes: 15), PostgreSQLDataType.interval);
+      await expectInverse(
+          -Duration(days: 1, seconds: 5), PostgreSQLDataType.interval);
+      await expectInverse(Duration(days: 365 * 100000, microseconds: 1),
+          PostgreSQLDataType.interval);
+      await expectInverse(-Duration(days: 365 * 100000, microseconds: 1),
+          PostgreSQLDataType.interval);
+      try {
+        await conn.query('INSERT INTO t (v) VALUES (@v:interval)',
+            substitutionValues: {'v': 'not-interval'});
+        fail('unreachable');
+      } on FormatException catch (e) {
+        expect(e.toString(), contains('Expected: Duration'));
+      }
+    });
+
     test('numeric', () async {
       final binaries = {
         '-123400000.20000': [