Changeset: feee86ad66c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feee86ad66c0
Added Files:
gdk/gdk_geomlogger.h
gdk/gdk_logger_internals.h
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single
Modified Files:
clients/Tests/exports.stable.out
clients/odbc/driver/SQLGetTypeInfo.c
common/utils/msabaoth.c
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_qsort.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geom_upgrade.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/sql_mvc.c
sql/storage/bat/bat_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_sequence.c
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err
sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.out
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/Tests/comment-on.stable.err
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/subquery/Tests/scalar.sql
sql/test/subquery/Tests/scalar.stable.out
sql/test/subquery/Tests/subquery4.sql
sql/test/subquery/Tests/subquery4.stable.err
sql/test/subquery/Tests/subquery4.stable.out
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/client.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 4532 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -485,7 +485,7 @@ geomcatalogfix_fptr geomcatalogfix_get(v
void geomcatalogfix_set(geomcatalogfix_fptr);
geomsqlfix_fptr geomsqlfix_get(void);
void geomsqlfix_set(geomsqlfix_fptr);
-int geomversion_get(void);
+bool geomversion_get(void);
void geomversion_set(void);
bat getBBPsize(void);
char *get_bin_path(void);
diff --git a/clients/odbc/driver/SQLGetTypeInfo.c
b/clients/odbc/driver/SQLGetTypeInfo.c
--- a/clients/odbc/driver/SQLGetTypeInfo.c
+++ b/clients/odbc/driver/SQLGetTypeInfo.c
@@ -58,10 +58,10 @@ static const struct types {
* to paste into an SQL query (i.e. including quotes). */
{
.type_name = "uuid",
- .data_type = SQL_GUID,
+ .data_type = SQL_GUID, /* -11 */
.column_size = 36,
- .literal_prefix = "NULL",
- .literal_suffix = "NULL",
+ .literal_prefix = "'uuid '''",
+ .literal_suffix = "''''",
.create_params = "NULL",
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
@@ -69,7 +69,7 @@ static const struct types {
.unsigned_attribute = -1,
.fixed_prec_scale = SQL_FALSE,
.auto_unique_value = -1,
- .local_type_name = "NULL",
+ .local_type_name = "'uuid'",
.minimum_scale = -1,
.maximum_scale = -1,
.sql_data_type = SQL_GUID,
@@ -79,7 +79,7 @@ static const struct types {
},
{
.type_name = "character large object",
- .data_type = SQL_WLONGVARCHAR,
+ .data_type = SQL_WLONGVARCHAR, /* -10 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -99,8 +99,50 @@ static const struct types {
.interval_precision = -1,
},
{
+ .type_name = "json",
+ .data_type = SQL_WLONGVARCHAR, /* -10 */
+ .column_size = 1000000,
+ .literal_prefix = "'json '''",
+ .literal_suffix = "''''",
+ .create_params = "NULL",
+ .nullable = SQL_NULLABLE,
+ .case_sensitive = SQL_TRUE,
+ .searchable = SQL_SEARCHABLE,
+ .unsigned_attribute = -1,
+ .fixed_prec_scale = SQL_FALSE,
+ .auto_unique_value = SQL_FALSE,
+ .local_type_name = "'json'",
+ .minimum_scale = -1,
+ .maximum_scale = -1,
+ .sql_data_type = SQL_WLONGVARCHAR,
+ .sql_datetime_sub = -1,
+ .num_prec_radix = -1,
+ .interval_precision = -1,
+ },
+ {
+ .type_name = "url",
+ .data_type = SQL_WLONGVARCHAR, /* -10 */
+ .column_size = 1000000,
+ .literal_prefix = "'url '''",
+ .literal_suffix = "''''",
+ .create_params = "NULL",
+ .nullable = SQL_NULLABLE,
+ .case_sensitive = SQL_TRUE,
+ .searchable = SQL_SEARCHABLE,
+ .unsigned_attribute = -1,
+ .fixed_prec_scale = SQL_FALSE,
+ .auto_unique_value = SQL_FALSE,
+ .local_type_name = "'url'",
+ .minimum_scale = -1,
+ .maximum_scale = -1,
+ .sql_data_type = SQL_WLONGVARCHAR,
+ .sql_datetime_sub = -1,
+ .num_prec_radix = -1,
+ .interval_precision = -1,
+ },
+ {
.type_name = "varchar",
- .data_type = SQL_WVARCHAR,
+ .data_type = SQL_WVARCHAR, /* -9 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -121,7 +163,7 @@ static const struct types {
},
{
.type_name = "character",
- .data_type = SQL_WCHAR,
+ .data_type = SQL_WCHAR, /* -8 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -142,7 +184,7 @@ static const struct types {
},
{
.type_name = "char",
- .data_type = SQL_WCHAR,
+ .data_type = SQL_WCHAR, /* -8 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -163,7 +205,7 @@ static const struct types {
},
{
.type_name = "boolean",
- .data_type = SQL_BIT,
+ .data_type = SQL_BIT, /* -7 */
.column_size = 1,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
@@ -171,10 +213,10 @@ static const struct types {
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
.searchable = SQL_PRED_BASIC,
- .unsigned_attribute = SQL_FALSE,
+ .unsigned_attribute = SQL_TRUE,
.fixed_prec_scale = SQL_TRUE,
.auto_unique_value = SQL_FALSE,
- .local_type_name = "NULL",
+ .local_type_name = "'boolean'",
.minimum_scale = -1,
.maximum_scale = -1,
.sql_data_type = SQL_BIT,
@@ -184,11 +226,11 @@ static const struct types {
},
{
.type_name = "tinyint",
- .data_type = SQL_TINYINT,
- .column_size = 2,
+ .data_type = SQL_TINYINT, /* -6 */
+ .column_size = 3,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
- .create_params = "'precision'",
+ .create_params = "NULL",
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
.searchable = SQL_PRED_BASIC,
@@ -205,11 +247,11 @@ static const struct types {
},
{
.type_name = "bigint",
- .data_type = SQL_BIGINT,
+ .data_type = SQL_BIGINT, /* -5 */
.column_size = 19,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
- .create_params = "'precision'",
+ .create_params = "NULL",
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
.searchable = SQL_PRED_BASIC,
@@ -225,10 +267,31 @@ static const struct types {
.interval_precision = -1,
},
{
+ .type_name = "bigserial",
+ .data_type = SQL_BIGINT, /* -5 */
+ .column_size = 19,
+ .literal_prefix = "NULL",
+ .literal_suffix = "NULL",
+ .create_params = "NULL",
+ .nullable = SQL_NO_NULLS,
+ .case_sensitive = SQL_FALSE,
+ .searchable = SQL_PRED_BASIC,
+ .unsigned_attribute = SQL_FALSE,
+ .fixed_prec_scale = SQL_FALSE,
+ .auto_unique_value = SQL_TRUE,
+ .local_type_name = "'bigserial'",
+ .minimum_scale = 0,
+ .maximum_scale = 0,
+ .sql_data_type = SQL_BIGINT,
+ .sql_datetime_sub = -1,
+ .num_prec_radix = 10,
+ .interval_precision = -1,
+ },
+ {
.type_name = "binary large object",
- .data_type = SQL_LONGVARBINARY,
+ .data_type = SQL_LONGVARBINARY, /* -4 */
.column_size = 1000000,
- .literal_prefix = "''''",
+ .literal_prefix = "'x'''",
.literal_suffix = "''''",
.create_params = "NULL",
.nullable = SQL_NULLABLE,
@@ -247,9 +310,9 @@ static const struct types {
},
{
.type_name = "binary large object",
- .data_type = SQL_VARBINARY,
+ .data_type = SQL_VARBINARY, /* -3 */
.column_size = 1000000,
- .literal_prefix = "''''",
+ .literal_prefix = "'x'''",
.literal_suffix = "''''",
.create_params = "'length'",
.nullable = SQL_NULLABLE,
@@ -258,7 +321,7 @@ static const struct types {
.unsigned_attribute = -1,
.fixed_prec_scale = SQL_FALSE,
.auto_unique_value = SQL_FALSE,
- .local_type_name = "NULL",
+ .local_type_name = "'blob(max_length)'",
.minimum_scale = -1,
.maximum_scale = -1,
.sql_data_type = SQL_VARBINARY,
@@ -266,10 +329,10 @@ static const struct types {
.num_prec_radix = -1,
.interval_precision = -1,
},
- /* SQL_BINARY */
+ /* SQL_BINARY -2 */
{
.type_name = "character large object",
- .data_type = SQL_LONGVARCHAR,
+ .data_type = SQL_LONGVARCHAR, /* -1 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -290,7 +353,7 @@ static const struct types {
},
{
.type_name = "char",
- .data_type = SQL_CHAR,
+ .data_type = SQL_CHAR, /* 1 */
.column_size = 1000000,
.literal_prefix = "''''",
.literal_suffix = "''''",
@@ -311,7 +374,7 @@ static const struct types {
},
{
.type_name = "numeric",
- .data_type = SQL_NUMERIC,
+ .data_type = SQL_NUMERIC, /* 2 */
.column_size = 19,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
@@ -324,7 +387,7 @@ static const struct types {
.auto_unique_value = SQL_FALSE,
.local_type_name = "NULL",
.minimum_scale = 0,
- .maximum_scale = 19,
+ .maximum_scale = 18,
.sql_data_type = SQL_NUMERIC,
.sql_datetime_sub = -1,
.num_prec_radix = 10,
@@ -332,7 +395,7 @@ static const struct types {
},
{
.type_name = "decimal",
- .data_type = SQL_DECIMAL,
+ .data_type = SQL_DECIMAL, /* 3 */
.column_size = 19,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
@@ -345,7 +408,7 @@ static const struct types {
.auto_unique_value = SQL_FALSE,
.local_type_name = "NULL",
.minimum_scale = 0,
- .maximum_scale = 19,
+ .maximum_scale = 18,
.sql_data_type = SQL_DECIMAL,
.sql_datetime_sub = -1,
.num_prec_radix = 10,
@@ -353,11 +416,11 @@ static const struct types {
},
{
.type_name = "integer",
- .data_type = SQL_INTEGER,
- .column_size = 9,
+ .data_type = SQL_INTEGER, /* 4 */
+ .column_size = 10,
.literal_prefix = "NULL",
.literal_suffix = "NULL",
- .create_params = "'precision'",
+ .create_params = "NULL",
.nullable = SQL_NULLABLE,
.case_sensitive = SQL_FALSE,
.searchable = SQL_PRED_BASIC,
@@ -374,11 +437,11 @@ static const struct types {
},
{
.type_name = "int",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
