poly (WIP), etc...

array util
into
nullable
rows/results
writeRow
width
ColumnSet/Columns/Column
auto run query in statement if not run when rows accessed
chars fix
row level into
into(Range) (WIP)

Author: cruisercoder

README.md

@@ -35,9 +35,8 @@ import std.database.mysql;
 auto db = createDatabase("mysql://127.0.0.1/test");
 auto con = db.connection();
 auto stmt = con.statement("select * from table");
-auto rowSet = stmt.query();
-auto range = stmt[];
-foreach (row; range) {
+auto rows = stmt.query.rows;
+foreach (row; rows) {
     for(size_t col = 0; col != row.columns; ++col) write(rowr[col]), " ");
     writeln();
 }
@@ -47,17 +46,17 @@ foreach (row; range) {
 ```D
 import std.database.sqlite;
 createDatabase("file:///demo.sqlite")
-    .connection()
+    .connection
     .query("select * from t1")
-    .writeResult();
+    .writeRows;
 ```
 
 #### field access
 ```D
 import std.database.sqlite;
 auto db = createDatabase("file:///testdb");
-auto rowSet = db.connection().query("select name,score from score");
-foreach (r; rowSet) {
+auto rows = db.connection.query("select name,score from score").rows;
+foreach (r; rows) {
     writeln(r[0].as!string,",",r[1].as!int);
 }
 ```
@@ -67,9 +66,9 @@ foreach (r; rowSet) {
 import std.database.sqlite;
 int minScore = 50;
 createDatabase("file:///demo.sqlite")
-    .connection()
+    .connection
     .query("select * from t1 where score >= ?", minScore)
-    .writeResult();
+    .writeRows;
 ```
 
 #### insert with input binding

freetds/test.d

@@ -24,16 +24,16 @@ void dateTest() {
     con.query("drop table d1");
     con.query("create table d1(a date)");
     con.query("insert into d1 values ('2016-01-15')");
-    auto rs = con.query("select * from d1");
-    writeResult(rs[]);
+    auto rows = con.query("select * from d1").rows;
+    rows.writeRows;
 }
 
 void example() {
     import std.database.freetds;
     //auto db = createDatabase("freetds://server/test?username=sa&password=admin");
     auto db = createDatabase("freetds://10.211.55.3:1433/test?username=sa&password=admin");
-    auto result = db.query("SELECT 1,2,'abc'");
-    foreach (r; result) {
+    auto rows = db.query("SELECT 1,2,'abc'").rows;
+    foreach (r; rows) {
         for(int c = 0; c != r.columns; ++c) writeln("column: ",c,", value: ",r[c].as!string);
     }
 }

mysql/test.d

@@ -12,19 +12,19 @@ unittest {
     testAll!DB("mysql");
 
     //negativeNotExecuteTest();
-
 }
 
+
 void negativeNotExecuteTest() {
     auto db = createDatabase("mysql://127.0.0.1/test");
     auto con = db.connection();
-    //con.statement("select * from score").writeResult();
-    con.statement("select * from score").writeResult();
+    //con.statement("select * from score").writeRows;
+    con.statement("select * from score").writeRows;
 }
 
 unittest {
     //perf1();
-    //con.query("select * from tuple").writeResult();
+    //con.query("select * from tuple").writeRows;
 }
 
 //auto db = createDatabase("mysql://127.0.0.1/test");

oracle/dub.json

@@ -8,7 +8,6 @@
     ],
     "sourcePaths": [".", "../src"],
     "libs" : ["occi","clntsh"],
-    "versions": ["StdLoggerDisableLogging"],
     "dependencies": {
     },
     "configurations": [

oracle/test.d

@@ -17,33 +17,9 @@ unittest {
     /*
        auto database3 = createDatabase();
        auto database4 = std.database.oracle.createDatabase();
-     */
 
     //auto database = Database!DefaultPolicy.create("oracle");
     //auto database = Database.create("oracle");
-
-    //auto database = database("oracle");
-    //auto con = database.connection();
-
-    /*
-       auto db = database("oracle");
-       auto con = db.connection();
-
-       try {
-       con.query("drop table t");
-       } catch (Exception e) {
-       }
-
-       con.query("create table t(name varchar(20), age int)");
-       con.query("insert into t values('Bob',12)");
-       con.query("insert into t values('Joe',9)");
-
-       con.statement("select * from t");
-    //auto res = result(stmt);
-    //writeResult(res);
-
-    //writeResultRange(stmt.range());
-    writeResultRange(con.statement("select * from t").range());
      */
 
 }
@@ -71,12 +47,12 @@ void testArrayOutputBinding() {
     real[N] durationsUsecs;
 
     foreach(i; 0..N) {
-        auto rs = con.rowArraySize(100).query("select * from t1");
+        auto rows = con.rowArraySize(100).query("select * from t1").rows;
         StopWatch sw;
         sw.start();
 
         int s;
-        foreach(r;rs) {
+        foreach(r;rows) {
             s += r[0].as!int + r[1].as!int;
         }
 
@@ -102,7 +78,7 @@ void dateTest() {
     con.query("drop table d1");
     con.query("create table d1(a date, b int)");
     con.query("insert into d1 values(to_date('2015/04/05','yyyy/mm/dd'), 123)");
-    auto rs = con.query("select * from d1");
-    assert(rs[].front()[0].as!Date == Date(2015,4,5));
+    auto rows = con.query("select * from d1").rows;
+    assert(rows.front()[0].as!Date == Date(2015,4,5));
 }
 

poly/dub.json

@@ -0,0 +1,26 @@
+{
+    "name": "oracle",
+    "description": "Phobos std.database candidate",
+    "homepage": "",
+    "copyright": "Copyright © 2015-, Erik Smith",
+    "authors": [
+        "Erik Smith"
+    ],
+    "sourcePaths": [".", "../src"],
+    "libs" : ["occi","clntsh"],
+    "dependencies": {
+    },
+    "configurations": [
+    {
+        "name": "library",
+        "targetType": "executable",
+    },
+    {
+        "name": "unittest",
+        "targetType": "executable",
+        "targetName": "unittest",
+        "dflags": ["-main"],
+    },
+    ],
+}
+

poly/test.d

@@ -0,0 +1,187 @@
+import std.database.util;
+import std.stdio;
+import std.database.oracle;
+import std.experimental.logger;
+import std.datetime;
+import std.variant;
+
+struct Resource(T) {}
+struct Policy {}
+
+auto create(alias T)() {
+    T!Policy r;
+    return r;
+}
+
+auto r = create!Resource;
+
+struct TestOutputRange {
+    void put(int i) {
+        log("I: ", i);
+    }
+    void put(string s) {
+        log("S: ", s);
+    }
+}
+
+
+unittest {
+    import std.database.testsuite;
+    //alias DB = Database!DefaultPolicy;
+    //testAll!DB("oracle");
+
+    // these are all heading to test suite
+
+    if (true) {
+        auto db = createDatabase;
+        auto con1 = db.connection("oracle").autoCommit(false);
+        auto con2 = db.connection("oracle").autoCommit(false);
+
+        scope(failure) con1.rollback;
+        scope(failure) con2.rollback;
+
+        //con1.begin.query("insert into account(id,amount) values(1,100)");
+        //con2.begin.query("insert into account(id,amount) values(2,-100)");
+        
+        con1.commit;
+        con2.commit;
+    }
+
+    if (false) {
+        auto db = createDatabase("oracle");
+        auto con = db.connection;
+        auto stmt = con.statement("select * from score");
+        auto row = stmt.query.rows.front();
+        //stmt.query.rows.writeRows;
+
+        TestOutputRange r; 
+        row.into(r);
+    }
+
+    if (false) {
+        auto db = createDatabase("oracle");
+        auto con = db.connection;
+        auto stmt = con.statement("select * from score");
+        auto rows = stmt.query.rows;
+        //stmt.query.rows.writeRows;
+
+        foreach (row; rows) {
+            string name;
+            int score;
+            row.into(name,score);
+            writeln("name: ", name, ", score: ", score);
+        }
+    }
+
+    if (false) { // classic example 2
+        auto db = createDatabase("oracle");
+        auto con = db.connection;
+        auto stmt = con.statement("select * from t");
+        auto rows = stmt.query.rows;
+
+        foreach (row; rows) {
+            foreach (column; rows.columns) {
+                auto field = row[column];
+                writeln("name: ", column.name, ", value: ", field);
+            }
+            writeln;
+        }
+    }
+
+    if (false) { // classic example
+        auto db = createDatabase("oracle");
+        auto con = db.connection;
+        auto stmt = con.statement("select * from t");
+        auto rows = stmt.query.rows;
+
+        foreach (row; rows) {
+            for(int c = 0; c != row.width; ++c) {
+                auto field = row[c];
+                write(field," ");
+            }
+            writeln;
+        }
+    }
+
+
+    if (false) {
+        auto db = createDatabase;
+        //auto db =  Database.create();
+        //auto db =  DB.create;
+
+        auto con = db.connection("oracle");
+        con.query("drop table t");
+        con.query("create table t (a varchar(10), b integer, c integer, d date)");
+        con.query("insert into t values('one', 2, 3, TO_DATE('2015/02/03', 'yyyy/mm/dd'))");
+        auto row = con.query("select * from t").rows.front;
+        assert(row[0].option!string == "one");
+        assert(row[1].option!int == 2);
+    }
+
+    if (false) {
+        auto db = createDatabase;
+        auto con = db.connection("oracle");
+        con.query("drop table t");
+        con.query("create table t (a varchar(10), b integer, c integer, d date)");
+        con.query("insert into t values('one', 2, 3, TO_DATE('2015/02/03', 'yyyy/mm/dd'))");
+        auto row = con.query("select * from t").rows.front;
+        assert(row[0].get!string == "one");
+        assert(row[1].get!int == 2);
+    }
+
+    if (false) {
+        // into
+        auto db = createDatabase;
+        auto con = db.connection("oracle");
+        con.query("drop table t");
+        con.query("create table t (a varchar(10), b integer, c integer, d date)");
+        con.query("insert into t values('one', 2, 3, TO_DATE('2015/02/03', 'yyyy/mm/dd'))");
+        string a;
+        int b;
+        Variant c;
+        Date d;
+        con.query("select * from t").into(a,b,c,d);
+        assert(a == "one");
+        assert(b == 2);
+
+        auto v = Variant(234);
+        assert(v == 234);
+
+        assert(c == "3"); // fix variant to support string
+        assert(d == Date(2015,2,3));
+    }
+
+    if (false) {
+        alias DB = Database!DefaultPolicy;
+        polyTest!DB("oracle");
+
+        if (false) {
+            auto db = createDatabase;
+            auto con = db.connection("oracle");
+            con.query("select * from score").writeRows;
+        }
+
+    }
+}
+
+void polyTest(DB) (string source) {
+    import std.database.poly;
+    import std.experimental.logger;
+    import std.database.front: Feature;
+
+    registerDatabase!DB("oracle");
+    auto polyDB = createDatabase;
+
+    auto db = polyDB.database("oracle");
+
+    log("ConnectionPool: ", db.hasFeature(Feature.ConnectionPool));
+    log("OutputArrayBinding: ", db.hasFeature(Feature.OutputArrayBinding));
+
+    auto con = db.connection("oracle");
+    auto stmt = con.statement("select * from score");
+
+    stmt.query("joe",20);
+    stmt.query();
+
+}
+

sqlite/test.d

@@ -11,9 +11,9 @@ unittest {
 
 unittest {
     auto db = createDatabase("path:///testdb");
-    //auto rowSet = db.connection().statement("select name,score from score").query;
-    auto rowSet = db.connection().query("select name,score from score");
-    foreach (r; rowSet) {
+    //auto rows = db.connection().statement("select name,score from score").query.rows;
+    auto rows = db.connection().query("select name,score from score").rows;
+    foreach (r; rows) {
         writeln(r[0].as!string,",",r[1].as!int);
         //writeln(r[0],", ",r[1]);
     }