Skip to content

Move *_messages.dart -> lib/src/messages/ #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Move *_messages.dart -> lib/src/messages/ #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
library messages;

export 'src/buffer.dart' show PgByteDataWriter;
export 'src/client_messages.dart';
export 'src/logical_replication_messages.dart';
export 'src/server_messages.dart';
export 'src/shared_messages.dart';
export 'src/messages/client_messages.dart';
export 'src/messages/logical_replication_messages.dart';
export 'src/messages/server_messages.dart';
export 'src/messages/shared_messages.dart';
4 changes: 2 additions & 2 deletions lib/src/auth/clear_text_authenticator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../buffer.dart';
import '../client_messages.dart';
import '../server_messages.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import 'auth.dart';

class ClearAuthenticator extends PostgresAuthenticator {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/auth/md5_authenticator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:buffer/buffer.dart';
import 'package:crypto/crypto.dart';

import '../buffer.dart';
import '../client_messages.dart';
import '../server_messages.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import 'auth.dart';

class MD5Authenticator extends PostgresAuthenticator {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/auth/sasl_authenticator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import 'dart:typed_data';
import 'package:sasl_scram/sasl_scram.dart';

import '../buffer.dart';
import '../client_messages.dart';
import '../exceptions.dart';
import '../server_messages.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import 'auth.dart';

/// Structure for SASL Authenticator
Expand Down
2 changes: 1 addition & 1 deletion lib/src/exceptions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:io';
import 'package:collection/collection.dart';
import 'package:meta/meta.dart';

import 'server_messages.dart';
import 'messages/server_messages.dart';
import 'types.dart';

/// Exception thrown by the package (client or server side).
Expand Down
4 changes: 2 additions & 2 deletions lib/src/message_window.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'package:buffer/buffer.dart';
import 'package:charcode/ascii.dart';

import 'buffer.dart';
import 'server_messages.dart';
import 'shared_messages.dart';
import 'messages/server_messages.dart';
import 'messages/shared_messages.dart';

const int _headerByteSize = 5;

Expand Down
12 changes: 6 additions & 6 deletions lib/src/client_messages.dart → lib/src/messages/client_messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import 'dart:typed_data';
import 'package:buffer/buffer.dart';
import 'package:charcode/ascii.dart';

import 'binary_codec.dart';
import 'buffer.dart';
import 'replication.dart';
import '../binary_codec.dart';
import '../buffer.dart';
import '../replication.dart';
import '../text_codec.dart';
import '../time_converters.dart';
import '../types.dart';
import 'shared_messages.dart';
import 'text_codec.dart';
import 'time_converters.dart';
import 'types.dart';

abstract class ClientMessageFormat {
static const int text = 0;
Expand Down
8 changes: 4 additions & 4 deletions lib/src/logical_replication_messages.dart → ...essages/logical_replication_messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import 'dart:typed_data';

import 'package:buffer/buffer.dart';

import 'binary_codec.dart';
import 'buffer.dart';
import '../binary_codec.dart';
import '../buffer.dart';
import '../time_converters.dart';
import '../types.dart';
import 'server_messages.dart';
import 'shared_messages.dart';
import 'time_converters.dart';
import 'types.dart';

/// A base class for all [Logical Replication Message Formats][] from the server
///
Expand Down
6 changes: 3 additions & 3 deletions lib/src/server_messages.dart → lib/src/messages/server_messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import 'dart:typed_data';

import 'package:meta/meta.dart';

import 'buffer.dart';
import '../buffer.dart';
import '../time_converters.dart';
import '../types.dart';
import 'logical_replication_messages.dart';
import 'shared_messages.dart';
import 'time_converters.dart';
import 'types.dart';

abstract class ServerMessage extends Message {}

Expand Down
2 changes: 1 addition & 1 deletion lib/src/shared_messages.dart → lib/src/messages/shared_messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:typed_data';

import 'buffer.dart';
import '../buffer.dart';
import 'client_messages.dart';
import 'server_messages.dart';

Expand Down
6 changes: 2 additions & 4 deletions lib/src/v2/connection.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,19 @@ import 'package:meta/meta.dart';

import '../../postgres.dart' show ConnectionSettings, Endpoint, Notification;
import '../auth/auth.dart';
import '../client_messages.dart';
import '../exceptions.dart';
import '../message_window.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import '../replication.dart';
import '../server_messages.dart';
import '../types.dart' show Severity;

import 'execution_context.dart';
import 'query.dart';
import 'query_cache.dart';
import 'query_queue.dart';
import 'v2_v3_delegate.dart';

part 'connection_fsm.dart';

part 'transaction_proxy.dart';

typedef PostgreSQLException = ServerException;
Expand Down
4 changes: 2 additions & 2 deletions lib/src/v2/query.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'dart:typed_data';
import 'package:postgres/src/buffer.dart';

import '../binary_codec.dart';
import '../client_messages.dart';
import '../exceptions.dart';
import '../server_messages.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import '../types.dart';
import 'connection.dart';
import 'execution_context.dart';
Expand Down
12 changes: 6 additions & 6 deletions lib/src/v3/protocol.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import 'package:async/async.dart';
import 'package:stream_channel/stream_channel.dart';

import '../buffer.dart';
import '../client_messages.dart';
import '../message_window.dart';
import '../server_messages.dart';
import '../shared_messages.dart';
import '../messages/client_messages.dart';
import '../messages/server_messages.dart';
import '../messages/shared_messages.dart';

export '../client_messages.dart';
export '../server_messages.dart';
export '../shared_messages.dart';
export '../messages/client_messages.dart';
export '../messages/server_messages.dart';
export '../messages/shared_messages.dart';

class AggregatedClientMessage extends ClientMessage {
final List<ClientMessage> messages;
Expand Down
6 changes: 3 additions & 3 deletions test/framer_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'dart:convert';
import 'dart:typed_data';

import 'package:buffer/buffer.dart';
import 'package:postgres/src/logical_replication_messages.dart';
import 'package:postgres/src/message_window.dart';
import 'package:postgres/src/server_messages.dart';
import 'package:postgres/src/shared_messages.dart';
import 'package:postgres/src/messages/logical_replication_messages.dart';
import 'package:postgres/src/messages/server_messages.dart';
import 'package:postgres/src/messages/shared_messages.dart';
import 'package:test/test.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion test/server_messages_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:typed_data';

import 'package:postgres/src/server_messages.dart';
import 'package:postgres/src/messages/server_messages.dart';
import 'package:test/test.dart';

void main() {
Expand Down