Changeset 95

Timestamp:

10/28/08 19:16:04 (4 years ago)

Author:

larsivi

Message:

Initial commit for the next phase of DDBI development (I am really sorry that it has taken this long).

• First revision of the new base interfaces (in dbi/model)
  
• Implemented interfaces (95%) for mySQL - it is heavily tested, and since this commit does a lot, there may be some glitches
  
• Support for other databases will be added (sqlite is next in line), although this commit clear out all of the old implementations. They can still be found in the tags/branches area of the repository.
  
• I want feedback! In particular regarding how to fetch values not as strings
  
• Is this an ideal minimal API that more complex functionality can be built on top of?
  
• This code is only tested on 32 bit linux
  

Files:

• trunk/buildme.d (deleted)
• trunk/dbi/DBIException.d (deleted)
• trunk/dbi/Database.d (deleted)
• trunk/dbi/ErrorCode.d (modified) (1 diff)
• trunk/dbi/Exception.d (added)
• trunk/dbi/Metadata.d (deleted)
• trunk/dbi/PreparedStatement.d (deleted)
• trunk/dbi/Registry.d (deleted)
• trunk/dbi/Result.d (deleted)
• trunk/dbi/Row.d (deleted)
• trunk/dbi/SqlGen.d (deleted)
• trunk/dbi/Statement.d (deleted)
• trunk/dbi/ib (deleted)
• trunk/dbi/model (added)
• trunk/dbi/model/Database.d (added)
• trunk/dbi/model/Result.d (added)
• trunk/dbi/model/Statement.d (added)
• trunk/dbi/model/Types.d (added)
• trunk/dbi/msql (deleted)
• trunk/dbi/mssql (deleted)
• trunk/dbi/mysql/MysqlDatabase.d (modified) (1 diff)
• trunk/dbi/mysql/MysqlError.d (modified) (3 diffs)
• trunk/dbi/mysql/MysqlPreparedStatement.d (deleted)
• trunk/dbi/mysql/MysqlResult.d (modified) (1 diff)
• trunk/dbi/mysql/MysqlStatement.d (added)
• trunk/dbi/mysql/all.d (deleted)
• trunk/dbi/mysql/c (added)
• trunk/dbi/mysql/c/mysql.d (moved) (moved from trunk/dbi/mysql/imp.d) (1 diff, 1 prop)
• trunk/dbi/mysql/imp_win.d (deleted)
• trunk/dbi/odbc (deleted)
• trunk/dbi/oracle (deleted)
• trunk/dbi/pg (deleted)
• trunk/dbi/sqlite (deleted)
• trunk/docs (deleted)
• trunk/dsss.conf (modified) (2 diffs)
• trunk/test (added)
• trunk/test/mysql.d (added)
• trunk/testddbi.d (deleted)

trunk/dbi/ErrorCode.d

@@ -81 +81 @@
-            return "Not a valid ErrorCode";
-    }
-Bugfix for DMD 0.162
+Return workaround
-    return "Not a valid ErrorCode";
-}

trunk/dbi/mysql/MysqlDatabase.d

@@ -1 @@
-
+
- * Authors: The D DBI project
- * Copyright: BSD license
- */
+
-module dbi.mysql.MysqlDatabase;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            mysql_close(connection);
-            if (uint error = mysql_errno(connection)) {
-                        Cout("close(): ");
-                        Cout(toDString(mysql_error(connection)));
-                        Cout("\n").flush;           
-                throw new DBIException("Unable to close the MySQL database.", error, specificToGeneral(error));
-            }
-            connection = null;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        if (error) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-SqlGenerator : SqlGenerator
+Tables : Tables
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-static this() {
-    Cout("Attempting to register MysqlDatabase in Registry").newline;
-    registerDatabase(new MysqlRegister());
-}
-
-debug(UnitTest) {
-unittest {
-
-    void s1 (char[] s) {
-        tango.io.Stdout.Stdout(s).newline();
-    }
-
-    void s2 (char[] s) {
-        tango.io.Stdout.Stdout("   ..." ~ s).newline();
-    }
-
-    s1("dbi.mysql.MysqlDatabase:");
-    MysqlDatabase db = new MysqlDatabase();
-/+  s2("connect");
-    db.connect("dbname=test", "test", "test");
-
-    s2("query");
-    Result res = db.query("SELECT * FROM test");
-    assert (res !is null);
-
-    s2("fetchRow");
-    Row row = res.fetchRow();
-    assert (row !is null);
-    assert (row.getFieldIndex("id") == 0);
-    assert (row.getFieldIndex("name") == 1);
-    assert (row.getFieldIndex("dateofbirth") == 2);
-    assert (row.get("id") == "1");
-    assert (row.get("name") == "John Doe");
-    assert (row.get("dateofbirth") == "1970-01-01");
-    /** Todo: MySQL type retrieval is not functioning */
-    //assert (row.getFieldType(1) == FIELD_TYPE_STRING);
-    //assert (row.getFieldDecl(1) == "char(40)");
-    res.finish();
-
-    s2("prepare");
-    Statement stmt = db.prepare("SELECT * FROM test WHERE id = ?");
-    stmt.bind(1, "1");
-    res = stmt.query();
-    row = res.fetchRow();
-    res.finish();
-    assert (row[0] == "1");
-
-    s2("fetchOne");
-    row = db.queryFetchOne("SELECT * FROM test");
-    assert (row[0] == "1");
-
-    s2("execute(INSERT)");
-    db.execute("INSERT INTO test VALUES (2, 'Jane Doe', '2000-12-31')");
-
-    s2("execute(DELETE via prepare statement)");
-    stmt = db.prepare("DELETE FROM test WHERE id=?");
-    stmt.bind(1, "2");
-    stmt.execute();
-
-    s2("close");
-    db.close();+/
-    auto sqlgen = db.getSqlGenerator;
-    auto res = sqlgen.makeInsertSql("user", ["name", "date"]);
-    assert(res == "INSERT INTO `user` (`name`,`date`) VALUES(?,?)", res);
-}
-}
-
-}

trunk/dbi/mysql/MysqlError.d

@@ -8 +8 @@
-
-private import dbi.ErrorCode;
+
+package:
-
-/**
@@ -21 +23 @@
- *  Written against the MySQL 5.1 documentation (revision 2737)
- */
-
+
+
-    if (error > 999  && error < 2000) {
-        return ErrorCode.ServerError;
@@ -141 +144 @@
-            return ErrorCode.Unknown;
-    }
-Bugfix for DMD 0.162
-   
+Return workaround
+    
-}
-

trunk/dbi/mysql/MysqlResult.d

@@ -3 +3 @@
- * Copyright: BSD license
- */
+
-module dbi.mysql.MysqlResult;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/dbi/mysql/c/mysql.d

@@ -1 @@
-
+
- * Authors: The D DBI project
- * Copyright: BSD license
- */
-imp
+c.mysql
-
-version (dbi_mysql) {
-
-C
+System
-
-version (Windows) {
-    pragma (lib, "libmysql.lib");
-
-
-
-
-
-
-
-
-
+
-
-version(MySQL_51) {

trunk/dsss.conf

@@ -1 +1 @@
-name=dbi
-exclude=buildme.d
-
-[testddbi.d]
@@ -6 +5 @@
-
-[dbi]
+version (dbi_mysql) {
+    buildflags += -L-lmysqlclient
+}
-target=dbi
-