diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-21 21:14:18 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-21 21:14:18 +0200 |
commit | a575d90fe1f5680cc35339d4c903003d886aaea5 (patch) | |
tree | ecbdd60fbc87055ca877c76da88aefee49ee9031 /storage/connect/mysql-test | |
parent | 9c6405fefaf7311b31591ab445660e8f34d64295 (diff) | |
download | mariadb-git-a575d90fe1f5680cc35339d4c903003d886aaea5.tar.gz |
Fold all json UDF names to lower case
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/mysql-test/connect/r/json_udf.result
modified: storage/connect/mysql-test/connect/t/json_udf.inc
modified: storage/connect/value.cpp
Diffstat (limited to 'storage/connect/mysql-test')
-rw-r--r-- | storage/connect/mysql-test/connect/r/json_udf.result | 12 | ||||
-rw-r--r-- | storage/connect/mysql-test/connect/t/json_udf.inc | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/storage/connect/mysql-test/connect/r/json_udf.result b/storage/connect/mysql-test/connect/r/json_udf.result index f130d7b5f04..6482e0b53b3 100644 --- a/storage/connect/mysql-test/connect/r/json_udf.result +++ b/storage/connect/mysql-test/connect/r/json_udf.result @@ -14,14 +14,14 @@ SELECT Json_Array(56,3.1416,'My name is "Foo"',NULL); Json_Array(56,3.1416,'My name is "Foo"',NULL) [56,3.141600,"My name is \"Foo\"",null] SELECT Json_Array_Add(Json_Array(56,3.1416,'foo',NULL)) Array; -ERROR HY000: Can't initialize function 'Json_Array_Add'; Json_Array_Add must have at least 2 arguments +ERROR HY000: Can't initialize function 'json_array_add'; json_array_add must have at least 2 arguments SELECT Json_Array_Add(Json_Array(56,3.1416,'foo',NULL),'One more') Array; Array [56,3.141600,"foo",null,"One more"] SELECT Json_Array_Add(JsonValue('one value'),'One more'); -ERROR HY000: Can't initialize function 'Json_Array_Add'; Json_Array_Add first argument must be a json item +ERROR HY000: Can't initialize function 'json_array_add'; json_array_add first argument must be a json item SELECT Json_Array_Add('one value','One more'); -ERROR HY000: Can't initialize function 'Json_Array_Add'; Json_Array_Add first argument must be a json item +ERROR HY000: Can't initialize function 'json_array_add'; json_array_add first argument must be a json item SELECT Json_Array_Add('one value' json_,'One more'); Json_Array_Add('one value' json_,'One more') NULL @@ -30,7 +30,7 @@ Warning 1105 Error 2 opening one value Warning 1105 Void JSON object Warning 1105 First argument is not an array SELECT JsonValue(56,3.1416,'foo',NULL); -ERROR HY000: Can't initialize function 'JsonValue'; JsonValue cannot accept more than 1 argument +ERROR HY000: Can't initialize function 'jsonvalue'; jsonvalue cannot accept more than 1 argument SELECT JsonValue(3.1416); JsonValue(3.1416) 3.141600 @@ -79,7 +79,7 @@ Json_Object(AUTHOR, TITLE, DATEPUB) {"AUTHOR":"Jean-Christophe Bernadac","TITLE":"Construire une application XML","DATEPUB":1999} {"AUTHOR":"William J. Pardi","TITLE":"XML en Action","DATEPUB":1999} SELECT Json_Array_Grp(TITLE, DATEPUB) FROM t1; -ERROR HY000: Can't initialize function 'Json_Array_Grp'; Json_Array_Grp can only accept 1 argument +ERROR HY000: Can't initialize function 'json_array_grp'; json_array_grp can only accept 1 argument SELECT Json_Array_Grp(TITLE) FROM t1; Json_Array_Grp(TITLE) ["Construire une application XML","XML en Action"] @@ -145,7 +145,7 @@ Json_Object(DEPARTMENT, TITLE, Json_Array_Grp(Json_Object(SERIALNO, NAME, SALARY {"DEPARTMENT":"2452","TITLE":"SCIENTIST","EMPLOYES":[{"SERIALNO":"34567","NAME":"BIGHEAD","SALARY":8000.000000},{"SERIALNO":"36666","NAME":"BIGHORN","SALARY":11000.000000}]} {"DEPARTMENT":"2452","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"11111","NAME":"CHERRY","SALARY":4500.000000}]} SELECT Json_Object_Grp(SALARY) FROM t1; -ERROR HY000: Can't initialize function 'Json_Object_Grp'; Json_Object_Grp can only accept 2 arguments +ERROR HY000: Can't initialize function 'json_object_grp'; json_object_grp can only accept 2 arguments SELECT Json_Object_Grp(SALARY, NAME) FROM t1; Json_Object_Grp(SALARY, NAME) {"BANCROFT":9600.000000,"SMITH":9000.000000,"MERCHANT":8700.000000,"FUNNIGUY":8500.000000,"BUGHAPPY":8500.000000,"BIGHEAD":8000.000000,"SHRINKY":7500.000000,"WALTER":7400.000000,"FODDERMAN":7000.000000,"TONGHO":6800.000000,"SHORTSIGHT":5500.000000,"MESSIFUL":5000.500000,"HONEY":4900.000000,"GOOSEPEN":4700.000000,"CHERRY":4500.000000,"MONAPENNY":3800.000000,"KITTY":3000.450000,"PLUMHEAD":2800.000000,"STRONG":23000.000000,"BULLOZER":14800.000000,"WERTHER":14500.000000,"QUINN":14000.000000,"ORELLY":13400.000000,"BIGHORN":11000.000000,"BROWNY":10500.000000,"WHEELFOR":10030.000000,"MARTIN":10000.000000} diff --git a/storage/connect/mysql-test/connect/t/json_udf.inc b/storage/connect/mysql-test/connect/t/json_udf.inc index 0a47d4b690b..a79fced6392 100644 --- a/storage/connect/mysql-test/connect/t/json_udf.inc +++ b/storage/connect/mysql-test/connect/t/json_udf.inc @@ -9,13 +9,13 @@ if (!$HA_CONNECT_SO) { --skip Needs a dynamically built ha_connect.so } -CREATE FUNCTION Json_Array RETURNS STRING SONAME 'ha_connect'; -CREATE FUNCTION Json_Array_Add RETURNS STRING SONAME 'ha_connect'; -CREATE FUNCTION Json_Object RETURNS STRING SONAME 'ha_connect'; -CREATE FUNCTION Json_Object_Nonull RETURNS STRING SONAME 'ha_connect'; -CREATE FUNCTION JsonValue RETURNS STRING SONAME 'ha_connect'; -CREATE AGGREGATE FUNCTION Json_Array_Grp RETURNS STRING SONAME 'ha_connect'; -CREATE AGGREGATE FUNCTION Json_Object_Grp RETURNS STRING SONAME 'ha_connect'; +CREATE FUNCTION json_array RETURNS STRING SONAME 'ha_connect'; +CREATE FUNCTION json_array_add RETURNS STRING SONAME 'ha_connect'; +CREATE FUNCTION json_object RETURNS STRING SONAME 'ha_connect'; +CREATE FUNCTION json_object_nonull RETURNS STRING SONAME 'ha_connect'; +CREATE FUNCTION jsonvalue RETURNS STRING SONAME 'ha_connect'; +CREATE AGGREGATE FUNCTION json_array_grp RETURNS STRING SONAME 'ha_connect'; +CREATE AGGREGATE FUNCTION json_object_grp RETURNS STRING SONAME 'ha_connect'; --enable_query_log |