Changeset: 5b5a9c6d36a2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b5a9c6d36a2 Modified Files: sql/common/sql_types.c sql/common/sql_types.h Branch: geo Log Message:
following Niels explanation: removed classes EC_MBR and EC_GEOMA and added MBR to class EC_EXTERNAL diffs (27 lines): diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c --- a/sql/common/sql_types.c +++ b/sql/common/sql_types.c @@ -1273,9 +1273,9 @@ sqltypeinit( sql_allocator *sa) GEOM = *t++ = sql_create_type(sa, "GEOMETRY", 0, SCALE_NONE, 0, EC_GEOM, "wkb"); /*POINT =*/ //*t++ = sql_create_type(sa, "POINT", 0, SCALE_FIX, 0, EC_GEOM, "wkb"); - *t++ = sql_create_type(sa, "GEOMETRYA", 0, SCALE_NONE, 0, EC_GEOMA, "wkba"); + *t++ = sql_create_type(sa, "GEOMETRYA", 0, SCALE_NONE, 0, EC_EXTERNAL, "wkba"); - MBR = *t++ = sql_create_type(sa, "MBR", 0, SCALE_NONE, 0, EC_MBR, "mbr"); + MBR = *t++ = sql_create_type(sa, "MBR", 0, SCALE_NONE, 0, EC_EXTERNAL, "mbr"); /* mbr operator functions */ sql_create_func(sa, "mbr_overlap", "geom", "mbrOverlaps", GEOM, GEOM, BIT, SCALE_FIX); diff --git a/sql/common/sql_types.h b/sql/common/sql_types.h --- a/sql/common/sql_types.h +++ b/sql/common/sql_types.h @@ -39,8 +39,6 @@ #define EC_TIMESTAMP 14 #define EC_TEMP(e) (e==EC_TIME||e==EC_DATE||e==EC_TIMESTAMP) #define EC_GEOM 15 -#define EC_GEOMA 15 -#define EC_MBR 16 #define EC_EXTERNAL 17 #define EC_TEMP_FRAC(e) (e==EC_TIME||e==EC_TIMESTAMP) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list