forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more cool stuff

This commit is contained in:
Adam D. Ruppe 2019-07-06 22:49:45 -04:00
parent 2ff7b77ac1
commit 97bb641aa1
2 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cgi.d
View File

@ -7498,6 +7498,7 @@ private auto serveApiInternal(T)(string urlPrefix) {
static foreach(idx, overload; __traits(getOverloads, T, methodName)) {{
static if(is(typeof(overload) P == __parameters))
static if(is(typeof(overload) R == return))
static if(__traits(getProtection, overload) == "public" || __traits(getProtection, overload) == "export")
{
static foreach(urlNameForMethod; urlNamesForMethod!(overload)(urlify(methodName)))
case urlNameForMethod:

69
database_generation.d
View File

@ -51,7 +51,7 @@ struct Nullable(T) {
}
struct Timestamp {
string value;
}
struct Constraint(string sql) {}
@ -350,13 +350,13 @@ private void populateFromDbVal(V)(ref V val, string value) {
val.value = to!P(value);
}
} else static if(is(V == bool)) {
val = value == "true" || value == "1";
val = value == "t" || value == "1" || value == "true";
} else static if(is(V == int) || is(V == string) || is(V == double)) {
val = to!V(value);
} else static if(is(V == enum)) {
val = cast(V) to!int(value);
} else static if(is(T == Timestamp)) {
// FIXME
} else static if(is(V == Timestamp)) {
val.value = value;
} else static if(is(V == Serial)) {
val.value = to!int(value);
}
@ -555,19 +555,68 @@ template where(conditions...) {
// FIXME: convert the value as necessary
static if(is(typeof(value) == Serial))
auto dbvalue = value.value;
else static if(is(typeof(value) == enum))
auto dbvalue = cast(int) value;
else
auto dbvalue = value;
import std.conv;
auto placeholder = "?_internal" ~ to!string(idx);
this_.selectBuilder.wheres ~= name ~ " = " ~ placeholder;
this_.selectBuilder.setVariable(placeholder, dbvalue);
static assert(is(typeof(__traits(getMember, Qbh.TType, name))), Qbh.TType.stringof ~ " has no member " ~ name);
static if(is(typeof(__traits(getMember, Qbh.TType, name)) == int))
static assert(is(typeof(value) == int) || is(typeof(value) == Serial), Qbh.TType.stringof ~ " is a integer key, but you passed an incompatible " ~ typeof(value));
else
static if(is(typeof(__traits(getMember, Qbh.TType, name)) == int)) {
static if(is(typeof(value) : const(int)[])) {
string s;
foreach(v; value) {
if(s.length) s ~= ", ";
s ~= to!string(v);
}
this_.selectBuilder.wheres ~= name ~ " IN (" ~ s ~ ")";
} else {
static assert(is(typeof(value) : const(int)) || is(typeof(value) == Serial), Qbh.TType.stringof ~ " is a integer key, but you passed an incompatible " ~ typeof(value).stringof);
auto placeholder = "?_internal" ~ to!string(idx);
this_.selectBuilder.wheres ~= name ~ " = " ~ placeholder;
this_.selectBuilder.setVariable(placeholder, dbvalue);
}
} else static if(is(typeof(__traits(getMember, Qbh.TType, name)) == Nullable!int)) {
static if(is(typeof(value) : const(int)[])) {
string s;
foreach(v; value) {
if(s.length) s ~= ", ";
s ~= to!string(v);
}
this_.selectBuilder.wheres ~= name ~ " IN (" ~ s ~ ")";
} else {
static assert(is(typeof(value) : const(int)) || is(typeof(value) == Serial), Qbh.TType.stringof ~ " is a integer key, but you passed an incompatible " ~ typeof(value).stringof);
auto placeholder = "?_internal" ~ to!string(idx);
this_.selectBuilder.wheres ~= name ~ " = " ~ placeholder;
this_.selectBuilder.setVariable(placeholder, dbvalue);
}
} else static if(is(typeof(__traits(getMember, Qbh.TType, name)) == Serial)) {
static if(is(typeof(value) : const(int)[])) {
string s;
foreach(v; value) {
if(s.length) s ~= ", ";
s ~= to!string(v);
}
this_.selectBuilder.wheres ~= name ~ " IN (" ~ s ~ ")";
} else {
static assert(is(typeof(value) : const(int)) || is(typeof(value) == Serial), Qbh.TType.stringof ~ " is a integer key, but you passed an incompatible " ~ typeof(value).stringof);
auto placeholder = "?_internal" ~ to!string(idx);
this_.selectBuilder.wheres ~= name ~ " = " ~ placeholder;
this_.selectBuilder.setVariable(placeholder, dbvalue);
}
} else {
static assert(is(typeof(__traits(getMember, Qbh.TType, name)) == typeof(value)), Qbh.TType.stringof ~ "." ~ name ~ " is not of type " ~ typeof(value).stringof);
auto placeholder = "?_internal" ~ to!string(idx);
this_.selectBuilder.wheres ~= name ~ " = " ~ placeholder;
this_.selectBuilder.setVariable(placeholder, dbvalue);
}
}}
this_.selectBuilder.wheres ~= sqlCondition;