Changeset: 89824478c266 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/89824478c266
Modified Files:
sql/server/sql_atom.c
Branch: default
Log Message:
String vs not string fix
diffs (26 lines):
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -328,13 +328,18 @@ atom_general_ptr( sql_allocator *sa, sql
return NULL;
a->tpe = *tpe;
a->data.vtype = tpe->type->localtype;
- if (ATOMextern(a->data.vtype)) {
- a->data.len = ATOMlen(a->data.vtype, v);
+ if (!ATOMextern(a->data.vtype)) {
+ VALset(&a->data, a->data.vtype, v);
+ } else if (a->data.vtype == TYPE_str) {
+ const char *p = (const char*) v;
+ a->data.len = strLen(p);
a->data.val.sval = sa_alloc(sa, a->data.len);
memcpy(a->data.val.sval, v, a->data.len);
} else {
- VALset(&a->data, a->data.vtype, v);
- }
+ a->data.len = ATOMlen(a->data.vtype, v);
+ a->data.val.pval = sa_alloc(sa, a->data.len);
+ memcpy(a->data.val.pval, v, a->data.len);
+ }
a->isnull = VALisnil(&a->data);
return a;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
