Skip to content

Commit

Permalink
Format with dfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
o3o committed Nov 20, 2019
1 parent e6e4158 commit 0898612
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dfmt_split_operator_at_line_end = false

trim_trailing_whitespace = true
end_of_line = lf
indent_size = 4
indent_size = 3
indent_style = space
insert_final_newline = true
max_line_length = 180
tab_width = 3
tab_width = 0
74 changes: 35 additions & 39 deletions source/dpq/serialisers/string.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,58 +12,54 @@ import dpq.value : Type;

struct StringSerialiser
{
static bool isSupportedType(T)()
{
return isSomeString!T;
}
static bool isSupportedType(T)()
{
return isSomeString!T;
}

static Nullable!(ubyte[]) serialise(T)(T val)
{
static assert (
isSupportedType!T,
"'%s' is not supported by StringSerialiser".format(T.stringof));
static Nullable!(ubyte[]) serialise(T)(T val)
{
static assert(isSupportedType!T, "'%s' is not supported by StringSerialiser".format(T.stringof));

alias RT = Nullable!(ubyte[]);
alias RT = Nullable!(ubyte[]);

if (isAnyNull(val))
return RT.init;
if (isAnyNull(val))
return RT.init;

return RT(val.representation.dup);
}
return RT(val.representation.dup);
}

static T deserialise(T)(const (ubyte)[] bytes)
{
static assert (
isSupportedType!T,
"'%s' is not supported by StringSerialiser".format(T.stringof));
static T deserialise(T)(const(ubyte)[] bytes)
{
static assert(isSupportedType!T, "'%s' is not supported by StringSerialiser".format(T.stringof));

// Is casting good enough? Let's hope so
return cast(T) bytes;
}
// Is casting good enough? Let's hope so
return cast(T)bytes;
}

static Oid oidForType(T)()
{
return Type.TEXT;
}
static Oid oidForType(T)()
{
return Type.TEXT;
}

static string nameForType(T)()
{
return "TEXT";
}
static string nameForType(T)()
{
return "TEXT";
}

static void ensureExistence(T)(Connection c)
{
return;
}
static void ensureExistence(T)(Connection c)
{
return;
}
}

unittest
{
import std.stdio;
import std.stdio;

writeln(" * StringSerialiser");
writeln(" * StringSerialiser");

string str = "1234567890qwertyuiop[]asdfghjkl;'zxcvbnm,./ščžèéêëē";
auto serialised = StringSerialiser.serialise(str);
assert(str == StringSerialiser.deserialise!string(serialised.get));
string str = "1234567890qwertyuiop[]asdfghjkl;'zxcvbnm,./ščžèéêëē";
auto serialised = StringSerialiser.serialise(str);
assert(str == StringSerialiser.deserialise!string(serialised.get));
}
11 changes: 7 additions & 4 deletions source/dpq/serialisers/systime.d
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ struct SysTimeSerialiser
static Nullable!(ubyte[]) serialise(T)(T val)
{
import std.datetime.timezone : UTC;
static assert (isSupportedType!T, "'%s' is not supported by SysTimeSerialiser".format(T.stringof));

static assert(isSupportedType!T, "'%s' is not supported by SysTimeSerialiser".format(T.stringof));

alias RT = Nullable!(ubyte[]);

if (isAnyNull(val)) {
if (isAnyNull(val))
{
return RT.init;
}

Expand All @@ -36,11 +38,12 @@ struct SysTimeSerialiser
return RT(nativeToBigEndian(diff / 10).dup);
}

static T deserialise(T)(const (ubyte)[] bytes)
static T deserialise(T)(const(ubyte)[] bytes)
{
static assert (isSupportedType!T, "'%s' is not supported by SysTimeSerialiser".format(T.stringof));
static assert(isSupportedType!T, "'%s' is not supported by SysTimeSerialiser".format(T.stringof));

import std.datetime.timezone : UTC;

return SysTime(fromBytes!long(bytes, long.sizeof) * 10 + SysTime(POSTGRES_EPOCH, UTC()).stdTime);
}

Expand Down

0 comments on commit 0898612

Please sign in to comment.