text array fix

denizzzka · Apr 19, 2015 · 90dd91e · 90dd91e
1 parent afb5220
commit 90dd91e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/example/example.d b/example/example.d
@@ -24,7 +24,7 @@ void main()
         "$2::timestamp with time zone as time_field, "
         "$3::text, "
         "$4::text as null_field, "
-        "array['first', 'second', 'NULL']::text[] as array_field, "
+        "array['first', 'second', NULL]::text[] as array_field, "
         "$5::integer[] as multi_array";
 
     p.args.length = 5;

diff --git a/src/dpq2/answer.d b/src/dpq2/answer.d
@@ -251,9 +251,11 @@ struct Value
 
     /// Returns cell value as native string type
     @property T as(T)() const
-    if( isSomeString!(T) )
+    if(is(T == string))
     {
-        return to!T( cast(immutable(char)*) value.ptr );
+        import std.utf: toUTF8;
+
+        return toUTF8(cast(const(char[])) value);
     }
 
     /// Returns cell value as native integer or decimal values
@@ -425,7 +427,7 @@ const struct Array
         {
             assert( _arguments[i] == typeid(int) );
             args[i] = va_arg!(int)(_argptr);
-            enforce( dimsSize[i] > args[i] ); // TODO: here is need exception, not enforce
+            enforce(dimsSize[i] > args[i], "Out of range"); // TODO: here is need exception, not enforce
         }
 
         // Calculates serial number of the element