X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Fcore%2Fdata_test.c;h=a41a3c2a5c584f0eaca5911e6dae1ecd7ac616e8;hb=2f85566fbc79498eb7abfaf1cbd279f71f7ea8d1;hp=606eae53b1cf69415eb2076a8c868be0ae890f40;hpb=432bf5c5ed16fcd5a1b6a305cfe93715384a8bcf;p=sysdb.git

diff --git a/t/unit/core/data_test.c b/t/unit/core/data_test.c
index 606eae5..a41a3c2 100644
--- a/t/unit/core/data_test.c
+++ b/t/unit/core/data_test.c
@@ -28,13 +28,20 @@
 #include "core/data.h"
 #include "libsysdb_test.h"
 
+#include <assert.h>
 #include <check.h>
 
+static regex_t empty_re;
+
 START_TEST(test_data)
 {
 	sdb_data_t d1, d2;
 	int check;
 
+	int64_t int_values[] = { 47, 11, 23 };
+	char *string_values[] = { "foo", "bar", "qux" "baz" };
+	size_t i;
+
 	d2.type = SDB_TYPE_INTEGER;
 	d2.data.integer = 4711;
 	memset(&d1, 0, sizeof(d1));
@@ -73,6 +80,22 @@ START_TEST(test_data)
 	fail_unless(d1.data.string == NULL,
 			"sdb_data_free_datum() didn't free string data");
 
+	d1.type = 0;
+	d2.type = SDB_TYPE_STRING;
+	d2.data.string = NULL;
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+	fail_unless(d1.data.string == d2.data.string,
+			"sdb_data_copy() didn't copy string data: got: %s; expected: %s",
+			d1.data.string, d2.data.string);
+
+	sdb_data_free_datum(&d1);
+	fail_unless(d1.data.string == NULL,
+			"sdb_data_free_datum() didn't free string data");
+
 	d2.type = SDB_TYPE_DATETIME;
 	d2.data.datetime = 4711;
 	check = sdb_data_copy(&d1, &d2);
@@ -98,18 +121,115 @@ START_TEST(test_data)
 	fail_unless(!memcmp(d1.data.binary.datum, d2.data.binary.datum,
 				d2.data.binary.length),
 			"sdb_data_copy() didn't copy binary data: got: %s; expected: %s",
-			d1.data.string, d2.data.string);
+			d1.data.binary.datum, d2.data.binary.datum);
 
 	sdb_data_free_datum(&d1);
 	fail_unless(d1.data.binary.length == 0,
 			"sdb_data_free_datum() didn't reset binary datum length");
 	fail_unless(d1.data.binary.datum == NULL,
 			"sdb_data_free_datum() didn't free binary datum");
+
+	d1.type = 0;
+	d2.type = SDB_TYPE_BINARY;
+	d2.data.binary.datum = NULL;
+	d2.data.binary.length = 0;
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+	fail_unless(d1.data.binary.length == d2.data.binary.length,
+			"sdb_data_copy() didn't copy length; got: %d; expected: 5d",
+			d1.data.binary.length, d2.data.binary.length);
+	fail_unless(d1.data.binary.datum == d2.data.binary.datum,
+			"sdb_data_copy() didn't copy binary data: got: %s; expected: %s",
+			d1.data.binary.datum, d2.data.binary.datum);
+
+	sdb_data_free_datum(&d1);
+	fail_unless(d1.data.binary.length == 0,
+			"sdb_data_free_datum() didn't reset binary datum length");
+	fail_unless(d1.data.binary.datum == NULL,
+			"sdb_data_free_datum() didn't free binary datum");
+
+	check = sdb_data_parse(".", SDB_TYPE_REGEX, &d2);
+	fail_unless(check == 0,
+			"INTERNAL ERROR: Failed to parse regex '.'");
+	assert(d2.type == SDB_TYPE_REGEX);
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+	fail_unless(d1.data.re.raw != d2.data.re.raw,
+			"sdb_data_copy() copy string pointer");
+	fail_unless(!strcmp(d1.data.re.raw, d2.data.re.raw),
+			"sdb_data_copy() didn't copy raw regex: got: %s; expected: %s",
+			d1.data.re.raw, d2.data.re.raw);
+	sdb_data_free_datum(&d2);
+
+	sdb_data_free_datum(&d1);
+	fail_unless(d1.data.re.raw == NULL,
+			"sdb_data_free_datum() didn't reset raw regex");
+
+	d2.type = SDB_TYPE_REGEX;
+	d2.data.re.raw = NULL;
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+
+	d2.type = SDB_TYPE_ARRAY | SDB_TYPE_INTEGER;
+	d2.data.array.length = SDB_STATIC_ARRAY_LEN(int_values);
+	d2.data.array.values = int_values;
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+	fail_unless(d1.data.array.values != d2.data.array.values,
+			"sdb_data_copy() didn't copy values: got: %p; expected: %p",
+			d1.data.array.values, d2.data.array.values);
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(int_values); ++i) {
+		int *i1 = d1.data.array.values;
+		int *i2 = d2.data.array.values;
+		fail_unless(i1[i] == i2[i],
+				"sdb_data_copy() modified integer value %d: "
+				"got: %d; expected: %d", i, i1[i], i2[i]);
+	}
+	sdb_data_free_datum(&d1);
+
+	d2.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING;
+	d2.data.array.length = SDB_STATIC_ARRAY_LEN(string_values);
+	d2.data.array.values = string_values;
+	check = sdb_data_copy(&d1, &d2);
+	fail_unless(!check, "sdb_data_copy() = %i; expected: 0", check);
+	fail_unless(d1.type == d2.type,
+			"sdb_data_copy() didn't copy type; got: %i; expected: %i",
+			d1.type, d2.type);
+	fail_unless(d1.data.array.values != d2.data.array.values,
+			"sdb_data_copy() didn't copy values: got: %p; expected: %p",
+			d1.data.array.values, d2.data.array.values);
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(string_values); ++i) {
+		char **s1 = d1.data.array.values;
+		char **s2 = d2.data.array.values;
+		fail_unless(s1[i] != s2[i],
+				"sdb_data_copy() didn't copy string value %d", i);
+		fail_unless(!strcmp(s1[i], s2[i]),
+				"sdb_data_copy() modified string value %d: "
+				"got: %s; expected: %s", i, s1[i], s2[i]);
+	}
+	sdb_data_free_datum(&d1);
 }
 END_TEST
 
 START_TEST(test_cmp)
 {
+	int64_t int_values1[] = { 1, 2, 3 };
+	int64_t int_values2[] = { 1, 3, 2 };
+	char *string_values1[] = { "a", "b", "c" };
+	char *string_values2[] = { "a", "c", "b" };
+
 	struct {
 		sdb_data_t d1;
 		sdb_data_t d2;
@@ -270,6 +390,87 @@ START_TEST(test_cmp)
 			},
 			1,
 		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			0,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			1,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+			},
+			0,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values2), int_values2 } },
+			},
+			-1,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values2), int_values2 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values1), int_values1 } },
+			},
+			1,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+			},
+			0,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values2), string_values2 } },
+			},
+			-1,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values2), string_values2 } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values1), string_values1 } },
+			},
+			1,
+		},
 	};
 
 	size_t i;
@@ -290,8 +491,289 @@ START_TEST(test_cmp)
 }
 END_TEST
 
+START_TEST(test_strcmp)
+{
+	struct {
+		sdb_data_t d1;
+		sdb_data_t d2;
+		int expected;
+	} golden_data[] = {
+		/* same data as for the sdb_data_cmp test; in case the types match,
+		 * both functions should behave the same (except for some loss in
+		 * precision, e.g. when formatting datetime values) */
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 47 } },
+			{ SDB_TYPE_INTEGER, { .integer = 4711 } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 4711 } },
+			{ SDB_TYPE_INTEGER, { .integer = 4711 } },
+			0,
+		},
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 4711 } },
+			{ SDB_TYPE_INTEGER, { .integer = 47 } },
+			1,
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 65535.9 } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 65536.0 } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 65536.0 } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 65536.0 } },
+			0,
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 65536.0 } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 65535.9 } },
+			1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = NULL } },
+			{ SDB_TYPE_STRING, { .string = "" } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = NULL } },
+			{ SDB_TYPE_STRING, { .string = NULL } },
+			0,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "" } },
+			{ SDB_TYPE_STRING, { .string = NULL } },
+			1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			{ SDB_TYPE_STRING, { .string = "b" } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			{ SDB_TYPE_STRING, { .string = "ab" } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			0,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "b" } },
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "ab" } },
+			{ SDB_TYPE_STRING, { .string = "a" } },
+			1,
+		},
+		{
+			{ SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
+			{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
+			{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
+			0,
+		},
+		{
+			{ SDB_TYPE_DATETIME, { .datetime = 471147114711471100 } },
+			{ SDB_TYPE_DATETIME, { .datetime = 471047114711471100 } },
+			1,
+		},
+		{
+			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+			0,
+		},
+		{
+			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+			1,
+		},
+		{
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0a" } },
+			},
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0b" } },
+			},
+			-1,
+		},
+		{
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 1, (unsigned char *)"a" } },
+			},
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0\0" } },
+			},
+			-1,
+		},
+		{
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0a" } },
+			},
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0a" } },
+			},
+			0,
+		},
+		{
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0b" } },
+			},
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0a" } },
+			},
+			1,
+		},
+		{
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 3, (unsigned char *)"a\0\0" } },
+			},
+			{
+				SDB_TYPE_BINARY,
+				{ .binary = { 1, (unsigned char *)"a" } },
+			},
+			1,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			0,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "b", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { "a", empty_re } } },
+			1,
+		},
+		/* type mismatches */
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 123 } },
+			{ SDB_TYPE_STRING, { .string = "123" } },
+			0,
+		},
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 120 } },
+			{ SDB_TYPE_STRING, { .string = "123" } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "123" } },
+			{ SDB_TYPE_INTEGER, { .integer = 120 } },
+			1,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "12.3" } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+			0,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "12.0" } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+			-1,
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+			{ SDB_TYPE_STRING, { .string = "12.0" } },
+			1,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "regex", empty_re } } },
+			{ SDB_TYPE_STRING, { .string = "/regex/" } },
+			0,
+		},
+	};
+
+	size_t i;
+
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+		int check = sdb_data_strcmp(&golden_data[i].d1, &golden_data[i].d2);
+		check = check < 0 ? -1 : check > 0 ? 1 : 0;
+		if (check != golden_data[i].expected) {
+			char d1_str[64] = "", d2_str[64] = "";
+			sdb_data_format(&golden_data[i].d1, d1_str, sizeof(d1_str),
+					SDB_DOUBLE_QUOTED);
+			sdb_data_format(&golden_data[i].d2, d2_str, sizeof(d2_str),
+					SDB_DOUBLE_QUOTED);
+			fail("sdb_data_strcmp(%s, %s) = %d; expected: %d",
+					d1_str, d2_str, check, golden_data[i].expected);
+		}
+	}
+}
+END_TEST
+
+START_TEST(test_parse_op)
+{
+	struct {
+		const char *op;
+		int id;
+	} golden_data[] = {
+		{ "+",  SDB_DATA_ADD },
+		{ "-",  SDB_DATA_SUB },
+		{ "*",  SDB_DATA_MUL },
+		{ "/",  SDB_DATA_DIV },
+		{ "%",  SDB_DATA_MOD },
+		{ "||", SDB_DATA_CONCAT },
+		{ "&&", -1 },
+	};
+
+	size_t i;
+
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
+		const char *op;
+		int id;
+
+		id = sdb_data_parse_op(golden_data[i].op);
+		fail_unless(id == golden_data[i].id,
+				"sdb_data_parse_op(%s) = %d; expected: %d",
+				golden_data[i].op, id, golden_data[i].id);
+
+		if (id <= 0)
+			continue;
+
+		op = SDB_DATA_OP_TO_STRING(id);
+		fail_unless(!strcmp(op, golden_data[i].op),
+				"SDB_DATA_OP_TO_STRING(%d) = '%s'; expected: '%s'",
+				id, op, golden_data[i].op);
+	}
+}
+END_TEST
+
 START_TEST(test_expr_eval)
 {
+	sdb_data_t err = { -1, { .integer = 0 } };
+
+	int64_t int_values[] = { 47, 11, 23 };
+	int64_t expected_int_concat[] = { 47, 11, 23, 47, 11, 23 };
+	char *string_values[] = { "foo", "bar", "qux" "baz" };
+	char *expected_string_concat[] =
+		{ "foo", "bar", "qux" "baz", "foo", "bar", "qux" "baz" };
+
 	struct {
 		sdb_data_t d1;
 		sdb_data_t d2;
@@ -310,7 +792,7 @@ START_TEST(test_expr_eval)
 			{ SDB_TYPE_INTEGER, { .integer = 221417 } },
 			{ SDB_TYPE_INTEGER, { .integer = 100 } },
 			{ SDB_TYPE_INTEGER, { .integer = 11 } },
-			SDB_DATA_INIT,
+			err,
 		},
 		{
 			{ SDB_TYPE_DECIMAL, { .decimal = 35.0 } },
@@ -320,46 +802,46 @@ START_TEST(test_expr_eval)
 			{ SDB_TYPE_DECIMAL, { .decimal = 612.5 } },
 			{ SDB_TYPE_DECIMAL, { .decimal = 2.0 } },
 			{ SDB_TYPE_DECIMAL, { .decimal = 0.0 } },
-			SDB_DATA_INIT,
+			err,
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = NULL } },
 			{ SDB_TYPE_STRING, { .string = "" } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_STRING, { .string = "" } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = NULL } },
 			{ SDB_TYPE_STRING, { .string = NULL } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_STRING, { .string = NULL } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = "" } },
 			{ SDB_TYPE_STRING, { .string = NULL } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_STRING, { .string = "" } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = "a" } },
 			{ SDB_TYPE_STRING, { .string = "b" } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
+			err,
+			err,
+			err,
 			{ SDB_TYPE_STRING, { .string = "ab" } },
 		},
 		{
@@ -370,37 +852,37 @@ START_TEST(test_expr_eval)
 			{ SDB_TYPE_DATETIME, { .datetime = 221957403521 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 10001 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 0 } },
-			SDB_DATA_INIT,
+			err,
 		},
 		{
 			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
 			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
 			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
 			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
 		},
 		{
 			{
@@ -411,60 +893,244 @@ START_TEST(test_expr_eval)
 				SDB_TYPE_BINARY,
 				{ .binary = { 3, (unsigned char *)"b\0b" } },
 			},
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
+			err,
+			err,
+			err,
 			{
 				SDB_TYPE_BINARY,
 				{ .binary = { 6, (unsigned char *)"a\0ab\0b" } },
 			},
 		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+			{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+			err,
+			err,
+			err,
+			err,
+			err,
+			err,
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = { SDB_STATIC_ARRAY_LEN(int_values), int_values } },
+			},
+			err,
+			err,
+			err,
+			err,
+			err,
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_INTEGER,
+				{ .array = {
+						SDB_STATIC_ARRAY_LEN(expected_int_concat),
+						expected_int_concat
+				} },
+			},
+		},
+		{
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+			},
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = { SDB_STATIC_ARRAY_LEN(string_values), string_values } },
+			},
+			err,
+			err,
+			err,
+			err,
+			err,
+			{
+				SDB_TYPE_ARRAY | SDB_TYPE_STRING,
+				{ .array = {
+						SDB_STATIC_ARRAY_LEN(expected_string_concat),
+						expected_string_concat
+				} },
+			},
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_INTEGER, { .integer = 42 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_INTEGER, { .integer = 42 } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_DECIMAL, { .decimal = 47.11 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 47.11 } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_STRING, { .string = "47.11" } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_STRING, { .string = "47.11" } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_DATETIME, { .datetime = 4711 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_DATETIME, { .datetime = 4711 } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_BINARY, { .binary = { 1, (unsigned char *)"a" } } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { ".", empty_re } } },
+			{ SDB_TYPE_NULL, { .integer = 0 } },
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+			SDB_DATA_NULL,
+		},
 		/* supported type-mismatches */
 		{
 			/* int * datetime */
 			{ SDB_TYPE_INTEGER,  { .integer  = 20 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 2 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
 			{ SDB_TYPE_DATETIME, { .datetime = 40 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
+			err,
 		},
 		{
 			/* datetime * int, datetime / int, datetime % int */
 			{ SDB_TYPE_DATETIME, { .datetime = 20 } },
 			{ SDB_TYPE_INTEGER,  { .integer  = 2 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
 			{ SDB_TYPE_DATETIME, { .datetime = 40 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 10 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 0 } },
-			SDB_DATA_INIT,
+			err,
 		},
 		{
 			/* float * datetime */
 			{ SDB_TYPE_DECIMAL,  { .decimal  = 20.0 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 2 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
 			{ SDB_TYPE_DATETIME, { .datetime = 40 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
+			err,
 		},
 		{
 			/* datetime * float, datetime / float, datetime % float */
 			{ SDB_TYPE_DATETIME, { .datetime = 20 } },
 			{ SDB_TYPE_DECIMAL,  { .decimal  = 2.0 } },
-			SDB_DATA_INIT,
-			SDB_DATA_INIT,
+			err,
+			err,
 			{ SDB_TYPE_DATETIME, { .datetime = 40 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 10 } },
 			{ SDB_TYPE_DATETIME, { .datetime = 0 } },
-			SDB_DATA_INIT,
+			err,
 		},
 	};
 
@@ -496,13 +1162,22 @@ START_TEST(test_expr_eval)
 
 			check = sdb_data_expr_eval(tests[j].op,
 					&golden_data[i].d1, &golden_data[i].d2, &res);
-			fail_unless((check == 0) == (tests[j].expected.type != 0),
+			fail_unless((check == 0) == (tests[j].expected.type != -1),
 					"sdb_data_expr_eval(%s, %s, %s) = %d; expected: %d",
 					SDB_DATA_OP_TO_STRING(tests[j].op), d1_str, d2_str, check,
-					tests[j].expected.type == 0 ? -1 : 0);
-			if (tests[j].expected.type == 0)
+					tests[j].expected.type == -1 ? -1 : 0);
+			if (tests[j].expected.type == -1)
 				continue;
 
+			if (tests[j].expected.type == SDB_TYPE_NULL) {
+				fail_unless(res.type == SDB_TYPE_NULL,
+						"sdb_data_expr_eval(%s, %s, %s) evaluated to "
+						"type %d; expected: SDB_TYPE_NULL",
+						SDB_DATA_OP_TO_STRING(tests[j].op),
+						d1_str, d2_str, res.type);
+				continue;
+			}
+
 			check = sdb_data_cmp(&res, &tests[j].expected);
 			if (check != 0) {
 				char res_str[64] = "", expected_str[64] = "";
@@ -510,9 +1185,11 @@ START_TEST(test_expr_eval)
 						SDB_DOUBLE_QUOTED);
 				sdb_data_format(&tests[j].expected, expected_str,
 						sizeof(expected_str), SDB_DOUBLE_QUOTED);
-				fail("sdb_data_expr_eval(%s, %s, %s) evaluated to %s; "
-						"expected: %s", SDB_DATA_OP_TO_STRING(tests[j].op),
-						d1_str, d2_str, res_str, expected_str);
+				fail("sdb_data_expr_eval(%s, %s, %s) evaluated to %s "
+						"(type %d); expected: %s (type %d)",
+						SDB_DATA_OP_TO_STRING(tests[j].op),
+						d1_str, d2_str, res_str, res.type,
+						expected_str, tests[j].expected.type);
 			}
 
 			sdb_data_free_datum(&res);
@@ -533,11 +1210,15 @@ START_TEST(test_format)
 		},
 		{
 			{ SDB_TYPE_DECIMAL, { .decimal = 65536.0 } },
-			"0x1p+16",
+			"65536",
+		},
+		{
+			{ SDB_TYPE_DECIMAL, { .decimal = 12.3 } },
+			"12.3",
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = NULL } },
-			"\"NULL\"",
+			"\"<NULL>\"",
 		},
 		{
 			{ SDB_TYPE_STRING, { .string = "this is a test" } },
@@ -553,7 +1234,7 @@ START_TEST(test_format)
 		},
 		{
 			{ SDB_TYPE_BINARY, { .binary = { 0, NULL } } },
-			"\"\"",
+			"\"<NULL>\"",
 		},
 		{
 			{
@@ -562,6 +1243,10 @@ START_TEST(test_format)
 			},
 			"\"\\x62\\x69\\x6e\\x61\\x72\\x79\\x0\\x63\\x72\\x61\\x70\\x42\"",
 		},
+		{
+			{ SDB_TYPE_REGEX, { .re = { "some regex", empty_re } } },
+			"\"/some regex/\"",
+		},
 	};
 
 	size_t i;
@@ -604,18 +1289,20 @@ START_TEST(test_parse)
 		sdb_data_t result;
 		int expected;
 	} golden_data[] = {
-		{ "4711",    { SDB_TYPE_INTEGER,  { .integer  = 4711 } },       0 },
-		{ "0x10",    { SDB_TYPE_INTEGER,  { .integer  = 16 } },         0 },
-		{ "010",     { SDB_TYPE_INTEGER,  { .integer  = 8 } },          0 },
-		{ "abc",     { SDB_TYPE_INTEGER,  { .integer  = 0 } },         -1 },
-		{ "1.2",     { SDB_TYPE_DECIMAL,  { .decimal  = 1.2 } },        0 },
-		{ "0x1p+16", { SDB_TYPE_DECIMAL,  { .decimal  = 65536.0 } },    0 },
-		{ "abc",     { SDB_TYPE_DECIMAL,  { .decimal  = 0.0 } },       -1 },
-		{ "abc",     { SDB_TYPE_STRING,   { .string   = "abc" } },      0 },
-		{ ".4",      { SDB_TYPE_DATETIME, { .datetime = 400000000 } },  0 },
-		{ "abc",     { SDB_TYPE_DATETIME, { .datetime = 0 } },         -1 },
+		{ "4711",    { SDB_TYPE_INTEGER,  { .integer  = 4711 } },          0 },
+		{ "0x10",    { SDB_TYPE_INTEGER,  { .integer  = 16 } },            0 },
+		{ "010",     { SDB_TYPE_INTEGER,  { .integer  = 8 } },             0 },
+		{ "abc",     { SDB_TYPE_INTEGER,  { .integer  = 0 } },            -1 },
+		{ "1.2",     { SDB_TYPE_DECIMAL,  { .decimal  = 1.2 } },           0 },
+		{ "0x1p+16", { SDB_TYPE_DECIMAL,  { .decimal  = 65536.0 } },       0 },
+		{ "abc",     { SDB_TYPE_DECIMAL,  { .decimal  = 0.0 } },          -1 },
+		{ "abc",     { SDB_TYPE_STRING,   { .string   = "abc" } },         0 },
+		{ ".4",      { SDB_TYPE_DATETIME, { .datetime = 400000000 } },     0 },
+		{ "abc",     { SDB_TYPE_DATETIME, { .datetime = 0 } },            -1 },
 		{ "abc",     { SDB_TYPE_BINARY,
 					 { .binary = { 3, (unsigned char *)"abc" } } }, 0 },
+		{ "abc",     { SDB_TYPE_REGEX,    { .re = { "abc", empty_re } } }, 0 },
+		{ "(|",      { SDB_TYPE_REGEX,    { .re = { "", empty_re } } },   -1 },
 	};
 
 	size_t i;
@@ -646,6 +1333,12 @@ START_TEST(test_parse)
 			fail_unless(golden_data[i].input == (char *)result.data.binary.datum,
 					"sdb_data_parse(%s, %d, <d>) modified input string",
 					golden_data[i].input, type);
+		if (type == SDB_TYPE_REGEX) {
+			fail_unless(golden_data[i].input != result.data.re.raw,
+					"sdb_data_parse(%s, %d, <d>) copied input string",
+					golden_data[i].input, type);
+			sdb_data_free_datum(&result);
+		}
 	}
 }
 END_TEST
@@ -659,6 +1352,8 @@ core_data_suite(void)
 	tc = tcase_create("core");
 	tcase_add_test(tc, test_data);
 	tcase_add_test(tc, test_cmp);
+	tcase_add_test(tc, test_strcmp);
+	tcase_add_test(tc, test_parse_op);
 	tcase_add_test(tc, test_expr_eval);
 	tcase_add_test(tc, test_format);
 	tcase_add_test(tc, test_parse);