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

make query data object easier to use with custom stuff

This commit is contained in:
Adam D. Ruppe 2011-08-07 23:37:56 -04:00
parent d8e5da4ea2
commit 24304f2e3c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
database.d
View File

@ -231,6 +231,8 @@ enum UpdateOrInsertMode {
AlwaysInsert AlwaysInsert
} }
// BIG FIXME: this should really use prepared statements
int updateOrInsert(Database db, string table, string[string] values, string where, UpdateOrInsertMode mode = UpdateOrInsertMode.CheckForMe, string key = "id") { int updateOrInsert(Database db, string table, string[string] values, string where, UpdateOrInsertMode mode = UpdateOrInsertMode.CheckForMe, string key = "id") {
bool insert = false; bool insert = false;
@ -401,6 +403,12 @@ string fixupSqlForDataObjectUse(string sql) {
*/ */
mixin template DataObjectConstructors() {
this(Database db, string[string] res, Tuple!(string, string)[string] mappings) {
super(db, res, mappings);
}
}
string yield(string what) { return `if(auto result = dg(`~what~`)) return result;`; } string yield(string what) { return `if(auto result = dg(`~what~`)) return result;`; }
import std.typecons; import std.typecons;

10
mysql.d
View File

@ -300,12 +300,12 @@ class MySql : Database {
ResultByDataObject queryDataObject(T...)(string sql, T t) { ResultByDataObject!R queryDataObject(R = DataObject, T...)(string sql, T t) {
// modify sql for the best data object grabbing // modify sql for the best data object grabbing
sql = fixupSqlForDataObjectUse(sql); sql = fixupSqlForDataObjectUse(sql);
auto magic = query(sql, t); auto magic = query(sql, t);
return ResultByDataObject(cast(MySqlResult) magic, this); return ResultByDataObject!R(cast(MySqlResult) magic, this);
} }
@ -539,7 +539,7 @@ class MySql : Database {
MYSQL* mysql; MYSQL* mysql;
} }
struct ResultByDataObject { struct ResultByDataObject(ObjType) if (is(ObjType : DataObject)) {
this(MySqlResult r, MySql mysql) { this(MySqlResult r, MySql mysql) {
result = r; result = r;
auto fields = r.fields(); auto fields = r.fields();
@ -560,8 +560,8 @@ struct ResultByDataObject {
ulong length() { return result.length; } ulong length() { return result.length; }
bool empty() { return result.empty; } bool empty() { return result.empty; }
void popFront() { result.popFront(); } void popFront() { result.popFront(); }
DataObject front() { ObjType front() {
return new DataObject(mysql, result.front.toAA, mappings); return new ObjType(mysql, result.front.toAA, mappings);
} }
// would it be good to add a new() method? would be valid even if empty // would it be good to add a new() method? would be valid even if empty
// it'd just fill in the ID's at random and allow you to do the rest // it'd just fill in the ID's at random and allow you to do the rest