Changeset 90

Show
Ignore:
Timestamp:
05/20/08 18:08:33 (7 months ago)
Author:
larsivi
Message:

Update sqlite backend for recent Tango, it still has other compile errors though.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dbi/sqlite/SqliteDatabase.d

    r81 r90  
    1 /** 
     1/** 
    22 * Authors: The D DBI project 
    33 * Copyright: BSD license 
    …… 
    88 
    99 
    10 version (Phobos) { 
    11     private import std.string : toDString = toString, toCString = toStringz; 
    12     debug (UnitTest) private import std.stdio; 
    13 } else { 
    14     private import tango.stdc.stringz : toDString = fromUtf8z, toCString = toUtf8z; 
    15     private import tango.util.log.Log; 
    16 } 
    17 private import dbi.Database, dbi.DBIException, dbi.Result, dbi.Row, dbi.Statement, dbi.Registry, dbi.PreparedStatemt; 
     10private import tango.stdc.stringz : toDString = fromStringz, toCString = toStringz; 
     11private import tango.util.log.Log; 
     12     
     13private import dbi.Database, dbi.DBIException, dbi.Result, dbi.Row, dbi.Statement, dbi.Registry, dbi.PreparedStatement; 
    1814private import dbi.sqlite.imp, dbi.sqlite.SqliteError, dbi.sqlite.SqliteResult; 
    1915 
    …… 
    332328    private bool wasReset = false; 
    333329     
    334     int setParamTypes(BindType[] paramTypes) 
     330    void setParamTypes(BindType[] paramTypes) 
    335331    { 
    336332        this.paramTypes = paramTypes; 
    337333    } 
    338334     
    339     int setResultTypes(BindType[] resTypes) 
     335    void setResultTypes(BindType[] resTypes) 
    340336    { 
    341337        this.resTypes = resTypes;    
    …… 
    530526 
    531527unittest { 
    532     version (Phobos) { 
    533         void s1 (char[] s) { 
    534             std.stdio.writefln("%s", s); 
    535         } 
    536  
    537         void s2 (char[] s) { 
    538             std.stdio.writefln("   ...%s", s); 
    539         } 
    540     } else { 
    541         void s1 (char[] s) { 
    542             tango.io.Stdout.Stdout(s).newline(); 
    543         } 
    544  
    545         void s2 (char[] s) { 
    546             tango.io.Stdout.Stdout("   ..." ~ s).newline(); 
    547         } 
    548     } 
     528    void s1 (char[] s) { 
     529        tango.io.Stdout.Stdout(s).newline(); 
     530    } 
     531 
     532    void s2 (char[] s) { 
     533        tango.io.Stdout.Stdout("   ..." ~ s).newline(); 
     534    } 
    549535 
    550536    s1("dbi.sqlite.SqliteDatabase:"); 

  • trunk/dbi/sqlite/SqliteResult.d

    r70 r90  
    1 /** 
     1/** 
    22 * Authors: The D DBI project 
    33 * Copyright: BSD license 
    …… 
    77version (dbi_sqlite) { 
    88 
    9 version (Phobos) { 
    10     private import std.string : asString = toString; 
    11 } else { 
    12     private import tango.stdc.stringz : asString = fromUtf8z; 
    13 } 
     9private import tango.stdc.stringz : asString = fromStringz; 
     10     
    1411private import dbi.Result, dbi.Row; 
    1512private import dbi.sqlite.imp;