Merge pull request #31 from Paulanerus/dev

Dev

Author: Paulanerus

.readthedocs.yaml

@@ -0,0 +1,13 @@
+version: 2
+
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.13"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - requirements: docs/requirements.txt

core/src/main/kotlin/dev/paulee/core/data/DataServiceImpl.kt

@@ -479,7 +479,7 @@ class DataServiceImpl : IDataService {
                         linkEntries.values.flatMap { (source, field) ->
                             val ids = dataPool.storageProvider.get(
                                 source, whereClause = listOf("${preFilter.linkKey}:$linkValue")
-                            ).mapNotNull { it[field]?.let { id -> "$field:$id" } }
+                            ).mapNotNull { it[field]?.let { id -> "$field:$id" } }.distinct()
 
                             val transformKey = preFilter.key
 

core/src/main/kotlin/dev/paulee/core/data/sql/Database.kt

@@ -12,15 +12,14 @@ import java.sql.DriverManager
 import kotlin.io.path.createDirectories
 
 private enum class ColumnType {
-    TEXT, INTEGER, REAL, NUMERIC, UNKNOWN
+    TEXT, INTEGER, REAL
 }
 
 private fun typeToColumnType(type: FieldType): ColumnType = when (type) {
     FieldType.TEXT -> ColumnType.TEXT
     FieldType.INT -> ColumnType.INTEGER
     FieldType.FLOAT -> ColumnType.REAL
-    FieldType.BOOLEAN -> ColumnType.NUMERIC
-    else -> ColumnType.UNKNOWN
+    FieldType.BOOLEAN -> ColumnType.TEXT
 }
 
 private data class Column(val name: String, val type: ColumnType, val primary: Boolean, val nullable: Boolean) {

docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/make.bat

@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.https://www.sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd

docs/requirements.txt

@@ -0,0 +1,2 @@
+sphinx-rtd-theme
+myst-parser