Changeset: 2534b0026ac9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2534b0026ac9
Modified Files:
sql/include/sql_catalog.h
sql/server/rel_psm.c
sql/server/sql_parser.y
Branch: default
Log Message:
Removed embedded javascript "support" (some vestiges, it was never implemented).
diffs (50 lines):
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -479,7 +479,6 @@ typedef enum sql_flang {
FUNC_LANG_INT = 0, /* internal */
FUNC_LANG_MAL = 1, /* create sql external mod.func */
FUNC_LANG_SQL = 2, /* create ... sql function/procedure */
- FUNC_LANG_J = 5, /* create .. language JAVASCRIPT (not implemented) */
/* this should probably be done in a better way */
FUNC_LANG_PY = 6, /* create .. language PYTHON */
/* values 8 and 9 were for Python 2 */
@@ -487,6 +486,7 @@ typedef enum sql_flang {
/* values 7 and 11 were old map python code */
/* values 4 and 12 were C language code */
/* value 3 was R language code */
+ /* value 5 was Javascript language code (never implemented) */
} sql_flang;
#define LANG_EXT(l) ((l)>FUNC_LANG_SQL)
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1016,10 +1016,6 @@ rel_create_func(sql_query *query, dlist
if (body && LANG_EXT(lang)) {
const char *lang_body = body->h->data.sval, *mod = "unknown",
*slang = "Unknown", *imp = "Unknown";
switch (lang) {
- case FUNC_LANG_J:
- mod = "japi";
- slang = "Javascript";
- break;
case FUNC_LANG_PY:
case FUNC_LANG_PY3:
mod = "pyapi3";
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -2659,11 +2659,8 @@ func_def:
} else {
lang = FUNC_LANG_PY;
}
- }
- else if (l == 'J' || l == 'j')
- lang = FUNC_LANG_J; /* Javascript */
- else {
- sqlformaterror(m, "Language name PYTHON,
PYTHON3 or J(avascript) expected, received '%s'", $9);
+ } else {
+ sqlformaterror(m, "Language name PYTHON or
PYTHON3 expected, received '%s'", $9);
}
append_list(f, $3);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
