Index | Thread | Search

From:
Marc Espie <marc.espie.openbsd@gmail.com>
Subject:
fix old compat strings in sqlports
To:
ports@openbsd.org, sthen@openbsd.org
Date:
Mon, 3 Nov 2025 14:50:00 +0100

Download raw body.

Thread
  • Marc Espie:

    fix old compat strings in sqlports

The recent update to sqlite3 broke because it accidentally removed strings
compatibility.

(see areDoubleQuotedStringsEnabled in resolve.c)

This does fix sqlports so it no longer depends on that quirky syntax.

I would tend to assume we want to keep that compat anyway for various reasons,
but it won't hurt to have correct sql syntax.

(I've checked, ports-readmes-dancer appears immune, lol)

Index: Makefile
===================================================================
RCS file: /build/data/openbsd/cvs/ports/databases/sqlports/Makefile,v
diff -u -p -r1.151 Makefile
--- Makefile	26 Nov 2023 18:05:09 -0000	1.151
+++ Makefile	3 Nov 2025 12:23:51 -0000
@@ -1,5 +1,5 @@
 CATEGORIES =		databases
-V =			7.52
+V =			7.53
 DISTNAME =		sqlports-$V
 DISTFILES =
 COMMENT-main =		sqlite database of ports
Index: files/Var.pm
===================================================================
RCS file: /build/data/openbsd/cvs/ports/databases/sqlports/files/Var.pm,v
diff -u -p -r1.75 Var.pm
--- files/Var.pm	11 Nov 2023 11:53:07 -0000	1.75
+++ files/Var.pm	3 Nov 2025 12:23:44 -0000
@@ -689,7 +689,7 @@ sub expr($self)
 qq{CASE $q
   WHEN 0 THEN $v
   WHEN 1 THEN '"'||$v||'"'
-  WHEN 2 THEN "'"||$v||"'"
+  WHEN 2 THEN ''''||$v||''''
 END};
 }
 
Index: files/scripts/print-ports-index
===================================================================
RCS file: /build/data/openbsd/cvs/ports/databases/sqlports/files/scripts/print-ports-index,v
diff -u -p -r1.12 print-ports-index
--- files/scripts/print-ports-index	14 Jul 2019 11:27:19 -0000	1.12
+++ files/scripts/print-ports-index	3 Nov 2025 13:19:51 -0000
@@ -29,7 +29,7 @@ cat <<'EOSQL' |sqlite3 $file
 with 
     d1 (d, p, t) as 
 	(select 
-	    distinct((case pkgspec when '' then '' else pkgspec||":" end)||_paths.fullpkgpath) as fd,
+	    distinct((case pkgspec when '' then '' else pkgspec||':' end)||_paths.fullpkgpath) as fd,
 	    _depends.fullpkgpath, type
 	from _depends join _paths on _Paths.Id=_depends.dependspath order by fd),
 -- and now the part that's going to be used 3 times in the main request
@@ -37,7 +37,7 @@ with 
 	(select group_concat(d, ' ') as dlist, p, t
 	from d1 group by p, t)
 select fullpkgname, ports.fullpkgpath,
-    (case prefix when '/usr/local' THEN "" else prefix end),
+    (case prefix when '/usr/local' THEN '' else prefix end),
       comment,descr, maintainer,categories,
     libd.dlist, buildd.dlist, rund.dlist,
 
@@ -52,8 +52,8 @@ select fullpkgname, ports.fullpkgpath,
 	else only_for_archs
 	end,
     '?',
-    (case lower(PERMIT_PACKAGE) when "yes" then "y" else "n" end),
-    (case lower(PERMIT_DISTFILES) when "yes" then "y" else "n" end)
+    (case lower(PERMIT_PACKAGE) when 'yes' then 'y' else 'n' end),
+    (case lower(PERMIT_DISTFILES) when 'yes' then 'y' else 'n' end)
     from ports
     	left join d2 as libd on libd.p=ports.pathid and libd.t=0
     	left join d2 as buildd on buildd.p=ports.pathid and buildd.t=2
Index: files/scripts/show-reverse-deps
===================================================================
RCS file: /build/data/openbsd/cvs/ports/databases/sqlports/files/scripts/show-reverse-deps,v
diff -u -p -r1.10 show-reverse-deps
--- files/scripts/show-reverse-deps	11 Jun 2020 19:55:15 -0000	1.10
+++ files/scripts/show-reverse-deps	3 Nov 2025 13:24:40 -0000
@@ -72,9 +72,9 @@ fi
 
 if $fuzzy
 then
-	query="p2.fullpkgpath like \"%$1%\""
+	query="p2.fullpkgpath like '%$1%'"
 else
-	query="p2.fullpkgpath=\"$1\""
+	query="p2.fullpkgpath='$1'"
 fi
 if $verbose
 then