private SqliteCommand command;
private ArrayList rows;
private string[] columns;
- private Hashtable column_names;
+ private Hashtable column_names_sens, column_names_insens;
private int current_row;
private bool closed;
private bool reading;
{
command = cmd;
rows = new ArrayList ();
- column_names = new Hashtable ();
+ column_names_sens = new Hashtable ();
+ column_names_insens = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant, CaseInsensitiveComparer.DefaultInvariant);
closed = false;
current_row = -1;
reading = true;
}
public object this[string name] {
- get { return ((object[]) rows[current_row])[(int) column_names[name]]; }
+ get {
+ return GetValue (GetOrdinal (name));
+ }
}
public object this[int i] {
- get { return ((object[]) rows[current_row])[i]; }
+ get { return GetValue (i); }
}
public bool IsClosed {
decltypes = new string[pN];
declmode = new int[pN]; // 1 == integer, 2 == datetime
for (int i = 0; i < pN; i++) {
- IntPtr decl = Sqlite.sqlite3_column_decltype (pVm, i);
+ IntPtr decl = Sqlite.sqlite3_column_decltype16 (pVm, i);
if (decl != IntPtr.Zero) {
- decltypes[i] = Marshal.PtrToStringAnsi (decl).ToLower();
+ decltypes[i] = Marshal.PtrToStringUni (decl).ToLower(System.Globalization.CultureInfo.InvariantCulture);
if (decltypes[i] == "int" || decltypes[i] == "integer")
declmode[i] = 1;
else if (decltypes[i] == "date" || decltypes[i] == "datetime")
for (int i = 0; i < pN; i++) {
string colName;
if (version == 2) {
- IntPtr fieldPtr = (IntPtr)Marshal.ReadInt32 (pazColName, i*IntPtr.Size);
- colName = Marshal.PtrToStringAnsi (fieldPtr);
+ IntPtr fieldPtr = Marshal.ReadIntPtr (pazColName, i*IntPtr.Size);
+ colName = Sqlite.HeapToString (fieldPtr, cmd.Connection.Encoding);
} else {
- colName = Marshal.PtrToStringAnsi (Sqlite.sqlite3_column_name (pVm, i));
+ colName = Marshal.PtrToStringUni (Sqlite.sqlite3_column_name16 (pVm, i));
}
columns[i] = colName;
- column_names [colName] = i;
+ column_names_sens [colName] = i;
+ column_names_insens [colName] = i;
}
}
object[] data_row = new object [pN];
for (int i = 0; i < pN; i++) {
if (version == 2) {
- IntPtr fieldPtr = (IntPtr)Marshal.ReadInt32 (pazValue, i*IntPtr.Size);
- data_row[i] = Marshal.PtrToStringAnsi (fieldPtr);
+ IntPtr fieldPtr = Marshal.ReadIntPtr (pazValue, i*IntPtr.Size);
+ data_row[i] = Sqlite.HeapToString (fieldPtr, cmd.Connection.Encoding);
} else {
switch (Sqlite.sqlite3_column_type (pVm, i)) {
case 1:
+ long val = Sqlite.sqlite3_column_int64 (pVm, i);
+
// If the column was declared as an 'int' or 'integer', let's play
// nice and return an int (version 3 only).
- if (declmode[i] == 1)
- data_row[i] = (int)Sqlite.sqlite3_column_int64 (pVm, i);
+ if (declmode[i] == 1 && val >= int.MinValue && val <= int.MaxValue)
+ data_row[i] = (int)val;
+
+ // Or if it was declared a date or datetime, do the reverse of what we
+ // do for DateTime parameters.
+ else if (declmode[i] == 2)
+ data_row[i] = DateTime.FromFileTime(val);
+
else
- data_row[i] = Sqlite.sqlite3_column_int64 (pVm, i);
+ data_row[i] = val;
+
break;
case 2:
data_row[i] = Sqlite.sqlite3_column_double (pVm, i);
break;
case 3:
- data_row[i] = Marshal.PtrToStringAnsi (Sqlite.sqlite3_column_text (pVm, i));
+ data_row[i] = Marshal.PtrToStringUni (Sqlite.sqlite3_column_text16 (pVm, i));
// If the column was declared as a 'date' or 'datetime', let's play
// nice and return a DateTime (version 3 only).
data_row[i] = DateTime.Parse((string)data_row[i]);
break;
case 4:
- int blobbytes = Sqlite.sqlite3_column_bytes (pVm, i);
+ int blobbytes = Sqlite.sqlite3_column_bytes16 (pVm, i);
IntPtr blobptr = Sqlite.sqlite3_column_blob (pVm, i);
byte[] blob = new byte[blobbytes];
Marshal.Copy (blobptr, blob, 0, blobbytes);
public long GetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length)
{
- throw new NotImplementedException ();
+ byte[] data = (byte[])(((object[]) rows[current_row])[i]);
+ if (buffer != null)
+ Array.Copy (data, fieldOffset, buffer, bufferOffset, length);
+ return data.LongLength - fieldOffset;
}
public char GetChar (int i)
int row = current_row;
if (row == -1 && rows.Count == 0) return typeof(string);
if (row == -1) row = 0;
- return ((object[]) rows[row])[i].GetType();
+ object element = ((object[]) rows[row])[i];
+ if (element != null)
+ return element.GetType();
+ else
+ return typeof (string);
+
// Note that the return value isn't guaranteed to
// be the same as the rows are read if different
// types of information are stored in the column.
public int GetOrdinal (string name)
{
- return (int) column_names[name];
+ object v = column_names_sens[name];
+ if (v == null)
+ v = column_names_insens[name];
+ if (v == null)
+ throw new ArgumentException("Column does not exist.");
+ return (int) v;
}
public string GetString (int i)
projects / mono.git / blobdiff