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

plugins/sql: pay attention to deprecated in schema.

Browse Source 
For now, we ignore every deprecated field, but put in the logic so
that future deprecations will work as expected.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-01-30 16:54:18 +10:30
committed by Alex Myers
parent 40fe893172
commit 20654ebd49
2 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/sql.c
View File

@@ -1138,6 +1138,27 @@ static void add_table_singleton(struct table_desc *td,
tal_arr_expand(&td->columns, col);
}
static bool is_deprecated(const jsmntok_t *deprecated_tok)
{
const char *deprstr;
if (!deprecated_tok)
return false;
/* If deprecated APIs are globally disabled, we don't want them! */
if (!deprecated_apis)
return true;
/* If it was deprecated before our release, we don't want it; older ones
* were simply 'deprecated: true' */
deprstr = json_strdup(tmpctx, schemas, deprecated_tok);
assert(strstarts(deprstr, "v"));
if (streq(deprstr, "v0.12.0") || streq(deprstr, "v23.02"))
return true;
return false;
}
static void add_table_properties(struct table_desc *td,
const jsmntok_t *properties)
{
@@ -1145,7 +1166,7 @@ static void add_table_properties(struct table_desc *td,
size_t i;
json_for_each_obj(i, t, properties) {
const jsmntok_t *type;
const jsmntok_t *type, *deprecated_tok;
struct column col;
if (ignore_column(td, t))
@@ -1155,6 +1176,13 @@ static void add_table_properties(struct table_desc *td,
* another branch with actual types, so ignore this */
if (!type)
continue;
/* Depends on when it was deprecated, and whether deprecations
* are enabled! */
deprecated_tok = json_get_member(schemas, t+1, "deprecated");
if (is_deprecated(deprecated_tok))
continue;
if (json_tok_streq(schemas, type, "array")) {
const jsmntok_t *items;