aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-07-30 14:01:42 +0200
committerChristian Grothoff <christian@grothoff.org>2023-07-30 14:01:42 +0200
commitb09c82418a16cfe226caacfd8f3adbb3756b2eed (patch)
treea35eb978a9cc77ce93ad6b1890ba433f1993149a
parente2e4585d9074fe0f62f20a63deac93a298e2d33d (diff)
downloadgnunet-b09c82418a16cfe226caacfd8f3adbb3756b2eed.tar.gz
gnunet-b09c82418a16cfe226caacfd8f3adbb3756b2eed.zip
use TEXT instead of VARCHAR
Diffstat
-rw-r--r--src/pq/pq_query_helper.c101
1 files changed, 76 insertions, 25 deletions
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index cbb9c5bc2..59aa875c4 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -939,22 +939,25 @@ query_param_array_generic (
939 Oid oid) 939 Oid oid)
940{ 940{
941 struct qconv_array_cls *meta = GNUNET_new (struct qconv_array_cls); 941 struct qconv_array_cls *meta = GNUNET_new (struct qconv_array_cls);
942
942 meta->typ = typ; 943 meta->typ = typ;
943 meta->oid = oid; 944 meta->oid = oid;
944 meta->sizes = sizes; 945 meta->sizes = sizes;
945 meta->same_size = same_size; 946 meta->same_size = same_size;
946 meta->continuous = continuous; 947 meta->continuous = continuous;
947 948
948 struct GNUNET_PQ_QueryParam res = { 949 {
949 .conv = qconv_array, 950 struct GNUNET_PQ_QueryParam res = {
950 .conv_cls = meta, 951 .conv = qconv_array,
951 .conv_cls_cleanup = qconv_array_cls_cleanup, 952 .conv_cls = meta,
952 .data = elements, 953 .conv_cls_cleanup = &qconv_array_cls_cleanup,
953 .size = num, 954 .data = elements,
954 .num_params = 1, 955 .size = num,
955 }; 956 .num_params = 1,
957 };
956 958
957 return res; 959 return res;
960 }
958} 961}
959 962
960 963
@@ -965,8 +968,11 @@ GNUNET_PQ_query_param_array_bool (
965 struct GNUNET_PQ_Context *db) 968 struct GNUNET_PQ_Context *db)
966{ 969{
967 Oid oid; 970 Oid oid;
971
968 GNUNET_assert (GNUNET_OK == 972 GNUNET_assert (GNUNET_OK ==
969 GNUNET_PQ_get_oid_by_name (db,"bool",&oid)); 973 GNUNET_PQ_get_oid_by_name (db,
974 "bool",
975 &oid));
970 return query_param_array_generic (num, 976 return query_param_array_generic (num,
971 true, 977 true,
972 elements, 978 elements,
@@ -984,8 +990,11 @@ GNUNET_PQ_query_param_array_uint16 (
984 struct GNUNET_PQ_Context *db) 990 struct GNUNET_PQ_Context *db)
985{ 991{
986 Oid oid; 992 Oid oid;
993
987 GNUNET_assert (GNUNET_OK == 994 GNUNET_assert (GNUNET_OK ==
988 GNUNET_PQ_get_oid_by_name (db,"int2",&oid)); 995 GNUNET_PQ_get_oid_by_name (db,
996 "int2",
997 &oid));
989 return query_param_array_generic (num, 998 return query_param_array_generic (num,
990 true, 999 true,
991 elements, 1000 elements,
@@ -1003,8 +1012,11 @@ GNUNET_PQ_query_param_array_uint32 (
1003 struct GNUNET_PQ_Context *db) 1012 struct GNUNET_PQ_Context *db)
1004{ 1013{
1005 Oid oid; 1014 Oid oid;
1015
1006 GNUNET_assert (GNUNET_OK == 1016 GNUNET_assert (GNUNET_OK ==
1007 GNUNET_PQ_get_oid_by_name (db,"int4",&oid)); 1017 GNUNET_PQ_get_oid_by_name (db,
1018 "int4",
1019 &oid));
1008 return query_param_array_generic (num, 1020 return query_param_array_generic (num,
1009 true, 1021 true,
1010 elements, 1022 elements,
@@ -1022,8 +1034,11 @@ GNUNET_PQ_query_param_array_uint64 (
1022 struct GNUNET_PQ_Context *db) 1034 struct GNUNET_PQ_Context *db)
1023{ 1035{
1024 Oid oid; 1036 Oid oid;
1037
1025 GNUNET_assert (GNUNET_OK == 1038 GNUNET_assert (GNUNET_OK ==
1026 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1039 GNUNET_PQ_get_oid_by_name (db,
1040 "int8",
1041 &oid));
1027 return query_param_array_generic (num, 1042 return query_param_array_generic (num,
1028 true, 1043 true,
1029 elements, 1044 elements,
@@ -1042,8 +1057,11 @@ GNUNET_PQ_query_param_array_bytes (
1042 struct GNUNET_PQ_Context *db) 1057 struct GNUNET_PQ_Context *db)
1043{ 1058{
1044 Oid oid; 1059 Oid oid;
1060
1045 GNUNET_assert (GNUNET_OK == 1061 GNUNET_assert (GNUNET_OK ==
1046 GNUNET_PQ_get_oid_by_name (db,"bytea",&oid)); 1062 GNUNET_PQ_get_oid_by_name (db,
1063 "bytea",
1064 &oid));
1047 return query_param_array_generic (num, 1065 return query_param_array_generic (num,
1048 true, 1066 true,
1049 elements, 1067 elements,
@@ -1062,8 +1080,11 @@ GNUNET_PQ_query_param_array_ptrs_bytes (
1062 struct GNUNET_PQ_Context *db) 1080 struct GNUNET_PQ_Context *db)
1063{ 1081{
1064 Oid oid; 1082 Oid oid;
1083
1065 GNUNET_assert (GNUNET_OK == 1084 GNUNET_assert (GNUNET_OK ==
1066 GNUNET_PQ_get_oid_by_name (db,"bytea",&oid)); 1085 GNUNET_PQ_get_oid_by_name (db,
1086 "bytea",
1087 &oid));
1067 return query_param_array_generic (num, 1088 return query_param_array_generic (num,
1068 false, 1089 false,
1069 elements, 1090 elements,
@@ -1082,8 +1103,11 @@ GNUNET_PQ_query_param_array_bytes_same_size (
1082 struct GNUNET_PQ_Context *db) 1103 struct GNUNET_PQ_Context *db)
1083{ 1104{
1084 Oid oid; 1105 Oid oid;
1106
1085 GNUNET_assert (GNUNET_OK == 1107 GNUNET_assert (GNUNET_OK ==
1086 GNUNET_PQ_get_oid_by_name (db,"bytea",&oid)); 1108 GNUNET_PQ_get_oid_by_name (db,
1109 "bytea",
1110 &oid));
1087 return query_param_array_generic (num, 1111 return query_param_array_generic (num,
1088 true, 1112 true,
1089 elements, 1113 elements,
@@ -1102,8 +1126,11 @@ GNUNET_PQ_query_param_array_ptrs_bytes_same_size (
1102 struct GNUNET_PQ_Context *db) 1126 struct GNUNET_PQ_Context *db)
1103{ 1127{
1104 Oid oid; 1128 Oid oid;
1129
1105 GNUNET_assert (GNUNET_OK == 1130 GNUNET_assert (GNUNET_OK ==
1106 GNUNET_PQ_get_oid_by_name (db,"bytea",&oid)); 1131 GNUNET_PQ_get_oid_by_name (db,
1132 "bytea",
1133 &oid));
1107 return query_param_array_generic (num, 1134 return query_param_array_generic (num,
1108 false, 1135 false,
1109 elements, 1136 elements,
@@ -1121,8 +1148,11 @@ GNUNET_PQ_query_param_array_string (
1121 struct GNUNET_PQ_Context *db) 1148 struct GNUNET_PQ_Context *db)
1122{ 1149{
1123 Oid oid; 1150 Oid oid;
1151
1124 GNUNET_assert (GNUNET_OK == 1152 GNUNET_assert (GNUNET_OK ==
1125 GNUNET_PQ_get_oid_by_name (db,"varchar",&oid)); 1153 GNUNET_PQ_get_oid_by_name (db,
1154 "text",
1155 &oid));
1126 return query_param_array_generic (num, 1156 return query_param_array_generic (num,
1127 true, 1157 true,
1128 elements, 1158 elements,
@@ -1140,8 +1170,11 @@ GNUNET_PQ_query_param_array_ptrs_string (
1140 const struct GNUNET_PQ_Context *db) 1170 const struct GNUNET_PQ_Context *db)
1141{ 1171{
1142 Oid oid; 1172 Oid oid;
1173
1143 GNUNET_assert (GNUNET_OK == 1174 GNUNET_assert (GNUNET_OK ==
1144 GNUNET_PQ_get_oid_by_name (db,"varchar",&oid)); 1175 GNUNET_PQ_get_oid_by_name (db,
1176 "text",
1177 &oid));
1145 return query_param_array_generic (num, 1178 return query_param_array_generic (num,
1146 false, 1179 false,
1147 elements, 1180 elements,
@@ -1159,8 +1192,11 @@ GNUNET_PQ_query_param_array_abs_time (
1159 struct GNUNET_PQ_Context *db) 1192 struct GNUNET_PQ_Context *db)
1160{ 1193{
1161 Oid oid; 1194 Oid oid;
1195
1162 GNUNET_assert (GNUNET_OK == 1196 GNUNET_assert (GNUNET_OK ==
1163 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1197 GNUNET_PQ_get_oid_by_name (db,
1198 "int8",
1199 &oid));
1164 return query_param_array_generic (num, 1200 return query_param_array_generic (num,
1165 true, 1201 true,
1166 elements, 1202 elements,
@@ -1178,8 +1214,11 @@ GNUNET_PQ_query_param_array_ptrs_abs_time (
1178 struct GNUNET_PQ_Context *db) 1214 struct GNUNET_PQ_Context *db)
1179{ 1215{
1180 Oid oid; 1216 Oid oid;
1217
1181 GNUNET_assert (GNUNET_OK == 1218 GNUNET_assert (GNUNET_OK ==
1182 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1219 GNUNET_PQ_get_oid_by_name (db,
1220 "int8",
1221 &oid));
1183 return query_param_array_generic (num, 1222 return query_param_array_generic (num,
1184 false, 1223 false,
1185 elements, 1224 elements,
@@ -1197,8 +1236,11 @@ GNUNET_PQ_query_param_array_rel_time (
1197 struct GNUNET_PQ_Context *db) 1236 struct GNUNET_PQ_Context *db)
1198{ 1237{
1199 Oid oid; 1238 Oid oid;
1239
1200 GNUNET_assert (GNUNET_OK == 1240 GNUNET_assert (GNUNET_OK ==
1201 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1241 GNUNET_PQ_get_oid_by_name (db,
1242 "int8",
1243 &oid));
1202 return query_param_array_generic (num, 1244 return query_param_array_generic (num,
1203 true, 1245 true,
1204 elements, 1246 elements,
@@ -1216,8 +1258,11 @@ GNUNET_PQ_query_param_array_ptrs_rel_time (
1216 struct GNUNET_PQ_Context *db) 1258 struct GNUNET_PQ_Context *db)
1217{ 1259{
1218 Oid oid; 1260 Oid oid;
1261
1219 GNUNET_assert (GNUNET_OK == 1262 GNUNET_assert (GNUNET_OK ==
1220 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1263 GNUNET_PQ_get_oid_by_name (db,
1264 "int8",
1265 &oid));
1221 return query_param_array_generic (num, 1266 return query_param_array_generic (num,
1222 false, 1267 false,
1223 elements, 1268 elements,
@@ -1235,8 +1280,11 @@ GNUNET_PQ_query_param_array_timestamp (
1235 struct GNUNET_PQ_Context *db) 1280 struct GNUNET_PQ_Context *db)
1236{ 1281{
1237 Oid oid; 1282 Oid oid;
1283
1238 GNUNET_assert (GNUNET_OK == 1284 GNUNET_assert (GNUNET_OK ==
1239 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1285 GNUNET_PQ_get_oid_by_name (db,
1286 "int8",
1287 &oid));
1240 return query_param_array_generic (num, 1288 return query_param_array_generic (num,
1241 true, 1289 true,
1242 elements, 1290 elements,
@@ -1254,8 +1302,11 @@ GNUNET_PQ_query_param_array_ptrs_timestamp (
1254 struct GNUNET_PQ_Context *db) 1302 struct GNUNET_PQ_Context *db)
1255{ 1303{
1256 Oid oid; 1304 Oid oid;
1305
1257 GNUNET_assert (GNUNET_OK == 1306 GNUNET_assert (GNUNET_OK ==
1258 GNUNET_PQ_get_oid_by_name (db,"int8",&oid)); 1307 GNUNET_PQ_get_oid_by_name (db,
1308 "int8",
1309 &oid));
1259 return query_param_array_generic (num, 1310 return query_param_array_generic (num,
1260 false, 1311 false,
1261 elements, 1312 elements,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 09:02:28 +0000