dbi/sqlite/Sqlite.d @@ -6,7 +6,7 @@ file "testddbi.exe" => TEST_SRC do end task :test => ["testddbi.exe"] do - sh "./testddbi" + sh "testddbi" end task :default => ["test"] Rakefile @@ -89,5 +89,5 @@ version(dbi_mysql) { } version(dbi_sqlite) { - import dbi.sqlite.SqliteDatabase; + import dbi.sqlite.Sqlite; } \ No newline at end of file dbi/DBI.d @@ -8,6 +8,7 @@ private static import tango.text.Util; private static import tango.io.Stdout; public import dbi.Exception; public import dbi.util.SqlGen, dbi.model.Statement, dbi.model.Metadata, dbi.model.Result; +import dbi.util.Excerpt; debug(DBITest) public import tango.io.Stdout; @@ -29,6 +30,8 @@ enum DbiFeature * The database interface that all databases must inherit from. * * See_Also: + * The documentation for dbi.model.Result - Database inherits from Result. + * * The database class for the specific database you are using. Many databases have * functions that are specific to themselves, as they wouldn't make sense in any man * other databases. Please reference the documentation for the database you will be @@ -130,6 +133,9 @@ abstract class Database : Result, IStatementProvider { */ abstract ulong lastInsertID(); + /** + * Prepares a statement with the given sql + */ Statement prepare(char[] sql) { auto pSt = sql in cachedStatements; @@ -505,9 +511,11 @@ debug(DBITest) { this(Database db) { this.db = db; + this.log = Log.lookup("dbi.DBTest"); } Database db; + Logger log; void run() { @@ -526,13 +534,17 @@ debug(DBITest) { void setup() { + log.trace("Dropping dbi_test"); char[] drop_test = db.sqlGen.makeDropSql("dbi_test"); - Stdout.formatln("executing: {}", drop_test); + log.trace("Executing: {}", excerpt(drop_test)); db.query(drop_test); + log.trace("Creating dbi_test"); auto create_test = db.sqlGen.makeCreateSql("dbi_test", columns); - Stdout.formatln("executing: {}", create_test); + log.trace("Executing: {}", excerpt(create_test)); db.query(create_test); + + log.trace("Done setuping up dbi_test"); } void teardown() @@ -562,6 +574,7 @@ debug(DBITest) { void initData() { + log.trace("Initializing data"); data.ub = 1; data.b = -56; data.us = 15764; @@ -655,7 +668,7 @@ debug(DBITest) { assert(dataCopy.s == data.s); assert(dataCopy.ui == data.ui); assert(dataCopy.i == data.i); - assert(dataCopy.ul == data.ul); + assert(dataCopy.ul == data.ul,Integer.toString(dataCopy.ul) ~ " != " ~ Integer.toString(data.ul)); assert(dataCopy.l == data.l); assert(abs(dataCopy.f - data.f) < 0.00001); assert(abs(dataCopy.d - data.d) < 0.0000001); dbi/model/Database.d @@ -2,7 +2,7 @@ name=dbi exclude=buildme.d [testddbi.d] -buildflags= -unittest -version=dbi_mysql -debug -debug=DBITest +buildflags= -unittest -version=dbi_sqlite -debug -debug=DBITest -g target=testddbi [dbi] dsss.conf dbi/sqlite/SqliteDatabase.d 9f5042655bc93068258896159700beb6cf111cc0 aaronc aaronc+git@practivist.org http://github.com/aaronc/ddbi/commit/0f8d71c59610913add69d62358fd0a5390e038ff 0f8d71c59610913add69d62358fd0a5390e038ff 2009-01-25T20:54:50-08:00 2009-01-25T20:54:50-08:00 Work getting Sqlite working 4a54cd84633094ea3f0b878f6cffb9508977e441 aaronc aaronc+git@practivist.org