aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 16:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

plugins/sql: handle case of subobject with sub-arrays.

Browse Source 
i.e. recurse properly in SQL generation.  This is about to happen.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-03-20 10:49:42 +10:30
parent 4549002105
commit c9ddf9d1c3
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/sql.c
View File

@@ -1114,6 +1114,32 @@ static struct command_result *json_listsqlschemas(struct command *cmd,
return command_finished(cmd, ret);
}
/* Adds a sub_object to this sql statement (and sub-sub etc) */
static void add_sub_object(char **update_stmt, char **create_stmt,
const char **sep, struct table_desc *sub)
{
/* sub-arrays are a completely separate table. */
if (!sub->is_subobject)
return;
/* sub-objects are folded into this table. */
for (size_t j = 0; j < tal_count(sub->columns); j++) {
const struct column *subcol = &sub->columns[j];
if (subcol->sub) {
add_sub_object(update_stmt, create_stmt, sep,
subcol->sub);
continue;
}
tal_append_fmt(update_stmt, "%s?", *sep);
tal_append_fmt(create_stmt, "%s%s %s",
*sep,
subcol->dbname,
fieldtypemap[subcol->ftype].sqltype);
*sep = ",";
}
}
/* Creates sql statements, initializes table */
static void finish_td(struct plugin *plugin, struct table_desc *td)
{
@@ -1146,19 +1172,8 @@ static void finish_td(struct plugin *plugin, struct table_desc *td)
const struct column *col = &td->columns[i];
if (col->sub) {
/* sub-arrays are a completely separate table. */
if (!col->sub->is_subobject)
continue;
/* sub-objects are folded into this table. */
for (size_t j = 0; j < tal_count(col->sub->columns); j++) {
const struct column *subcol = &col->sub->columns[j];
tal_append_fmt(&td->update_stmt, "%s?", sep);
tal_append_fmt(&create_stmt, "%s%s %s",
sep,
subcol->dbname,
fieldtypemap[subcol->ftype].sqltype);
sep = ",";
}
add_sub_object(&td->update_stmt, &create_stmt,
&sep, col->sub);
continue;
}
tal_append_fmt(&td->update_stmt, "%s?", sep);