clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-04-26 11:44:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose tiddler_ids in bag and recipe listings

Browse Source
This commit is contained in:
Jeremy Ruston
2024-03-17 16:34:45 +00:00
parent 7eaa9b8aec
commit 3d485f0706
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/tiddlywiki/multiwikiserver/modules/store/sql-tiddler-database.js
View File

@@ -121,7 +121,7 @@ SqlTiddlerDatabase.prototype.createBag = function(bag_name,description,accesscon
};
/*
Returns array of {recipe_name:,description:,bag_names: []}
Returns array of {recipe_name:,recipe_id:,description:,bag_names: []}
*/
SqlTiddlerDatabase.prototype.listRecipes = function() {
const rows = this.engine.runStatementGetAll(`
@@ -375,7 +375,7 @@ Get the titles of the tiddlers in a bag. Returns an empty array for bags that do
*/
SqlTiddlerDatabase.prototype.getBagTiddlers = function(bag_name) {
const rows = this.engine.runStatementGetAll(`
SELECT DISTINCT title
SELECT DISTINCT title, tiddler_id
FROM tiddlers
WHERE bag_id IN (
SELECT bag_id
@@ -387,11 +387,11 @@ SqlTiddlerDatabase.prototype.getBagTiddlers = function(bag_name) {
`,{
$bag_name: bag_name
});
return rows.map(value => value.title);
return rows;
};
/*
Get the titles of the tiddlers in a recipe as {title:,bag_name:}. Returns null for recipes that do not exist
Get the titles of the tiddlers in a recipe as {title:,tiddler_id:,bag_name:}. Returns null for recipes that do not exist
*/
SqlTiddlerDatabase.prototype.getRecipeTiddlers = function(recipe_name) {
const rowsCheckRecipe = this.engine.runStatementGetAll(`
@@ -403,9 +403,9 @@ SqlTiddlerDatabase.prototype.getRecipeTiddlers = function(recipe_name) {
return null;
}
const rows = this.engine.runStatementGetAll(`
SELECT title, bag_name
SELECT title, tiddler_id, bag_name
FROM (
SELECT t.title, b.bag_name, MAX(rb.position) AS position
SELECT t.title, t.tiddler_id, b.bag_name, MAX(rb.position) AS position
FROM bags AS b
INNER JOIN recipe_bags AS rb ON b.bag_id = rb.bag_id
INNER JOIN recipes AS r ON rb.recipe_id = r.recipe_id