Changeset: 686e508e7c4b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=686e508e7c4b
Modified Files:
clients/R/MonetDB.R/R/dbi.R
sql/common/sql_types.c
Branch: embedded
Log Message:
more sqlite compat 2
diffs (27 lines):
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -822,6 +822,11 @@ setMethod("isIdCurrent", signature(dbObj
.Deprecated("dbIsValid")
dbIsValid(dbObj)
})
+setMethod("isIdCurrent", signature(dbObj="MonetDBConnection"),
def=function(dbObj, ...) {
+ .Deprecated("dbIsValid")
+ dbIsValid(dbObj)
+})
+
if (is.null(getGeneric("initExtension"))) setGeneric("initExtension",
function(dbObj, ...) standardGeneric("initExtension"))
setMethod("initExtension", signature(dbObj="MonetDBConnection"),
def=function(dbObj, ...) {
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
@@ -1622,6 +1622,8 @@ sqltypeinit( sql_allocator *sa)
sql_create_func(sa, "locate", "str", "locate", *t, *t, INT,
SCALE_NONE);
sql_create_func3(sa, "locate", "str", "locate", *t, *t, INT,
INT, SCALE_NONE);
+ sql_create_func(sa, "charindex", "str", "locate", *t, *t, INT,
SCALE_NONE);
+ sql_create_func3(sa, "charindex", "str", "locate", *t, *t, INT,
INT, SCALE_NONE);
sql_create_func3(sa, "splitpart", "str", "splitpart", *t, *t,
INT, *t, INOUT);
sql_create_func(sa, "substring", "str", "substring", *t, INT,
*t, INOUT);
sql_create_func3(sa, "substring", "str", "substring", *t, INT,
INT, *t, INOUT);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
