1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff --git a/cppconn/datatype.h b/cppconn/datatype.h
index 593ec02..63de3ec 100644
--- a/cppconn/datatype.h
+++ b/cppconn/datatype.h
@@ -59,8 +59,7 @@ public:
GEOMETRY,
ENUM,
SET,
- SQLNULL,
- JSON
+ SQLNULL
};
};
diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
index 572beda..6f4cbca 100644
--- a/driver/mysql_ps_resultset.cpp
+++ b/driver/mysql_ps_resultset.cpp
@@ -446,7 +446,6 @@ MySQL_Prepared_ResultSet::getDouble(const uint32_t columnIndex) const
case sql::DataType::LONGVARBINARY:
case sql::DataType::SET:
case sql::DataType::ENUM:
- case sql::DataType::JSON:
{
CPP_INFO("It's a string");
long double ret = sql::mysql::util::strtold(getString(columnIndex).c_str(), NULL);
@@ -615,7 +614,6 @@ MySQL_Prepared_ResultSet::getInt64_intern(const uint32_t columnIndex, bool /* cu
case sql::DataType::LONGVARBINARY:
case sql::DataType::SET:
case sql::DataType::ENUM:
- case sql::DataType::JSON:
CPP_INFO("It's a string");
return strtoll(getString(columnIndex).c_str(), NULL, 10);
case sql::DataType::BIT:
@@ -763,7 +761,6 @@ MySQL_Prepared_ResultSet::getUInt64_intern(const uint32_t columnIndex, bool /* c
case sql::DataType::LONGVARBINARY:
case sql::DataType::SET:
case sql::DataType::ENUM:
- case sql::DataType::JSON:
CPP_INFO("It's a string");
return strtoull(getString(columnIndex).c_str(), NULL, 10);
case sql::DataType::BIT:
@@ -1038,7 +1035,6 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
case sql::DataType::LONGVARBINARY:
case sql::DataType::SET:
case sql::DataType::ENUM:
- case sql::DataType::JSON:
CPP_INFO("It's a string");
return sql::SQLString(static_cast<char *>(result_bind->rbind[columnIndex - 1].buffer), *result_bind->rbind[columnIndex - 1].length);
default:
diff --git a/driver/mysql_resultbind.cpp b/driver/mysql_resultbind.cpp
index 003b44b..e597ac6 100644
--- a/driver/mysql_resultbind.cpp
+++ b/driver/mysql_resultbind.cpp
@@ -86,7 +86,6 @@ static struct st_buffer_size_type
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_JSON:
return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
case MYSQL_TYPE_DECIMAL:
diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
index e4aaa6c..81af5c4 100644
--- a/driver/mysql_util.cpp
+++ b/driver/mysql_util.cpp
@@ -431,8 +431,6 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
return sql::DataType::SET;
case MYSQL_TYPE_GEOMETRY:
return sql::DataType::GEOMETRY;
- case MYSQL_TYPE_JSON:
- return sql::DataType::JSON;
default:
return sql::DataType::UNKNOWN;
}
@@ -498,8 +496,6 @@ mysql_string_type_to_datatype(const sql::SQLString & name)
return sql::DataType::SET;
} else if (!name.compare("geometry")) {
return sql::DataType::GEOMETRY;
- } else if (!name.compare("json")) {
- return sql::DataType::JSON;
} else {
return sql::DataType::UNKNOWN;
}
@@ -645,8 +641,6 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my
return "SET";
case MYSQL_TYPE_GEOMETRY:
return "GEOMETRY";
- case MYSQL_TYPE_JSON:
- return "JSON";
default:
return "UNKNOWN";
}
|
