From 8961f81de7c15de45c5c97edc39d3bc84faf324a Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Thu, 22 Jan 2026 11:23:57 -0600
Subject: [PATCH] sqlite: Add gen-sqlite3-namespace.sh script for upgrades

---
 lib/sqlite/gen-sqlite3-namespace.sh | 110 ++++++++++++++++++++++++++++
 lib/sqlite/sqlite3_namespace.h      |   8 +-
 2 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100755 lib/sqlite/gen-sqlite3-namespace.sh

diff --git a/lib/sqlite/gen-sqlite3-namespace.sh b/lib/sqlite/gen-sqlite3-namespace.sh
new file mode 100755
index 000000000..d6fac932a
--- /dev/null
+++ b/lib/sqlite/gen-sqlite3-namespace.sh
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# Generate sqlite3_namespace.h from sqlite3.c and sqlite3.h
+#
+# This script extracts all public SQLite3 symbols and generates a header
+# that renames them with a heim_ prefix to avoid symbol conflicts.
+#
+# Usage: ./gen-sqlite3-namespace.sh [sqlite3.c] [sqlite3.h]
+#
+# Run this script after importing a new version of SQLite3.
+
+set -e
+
+SQLITE3_C="${1:-sqlite3.c}"
+SQLITE3_H="${2:-sqlite3.h}"
+OUTPUT="sqlite3_namespace.h"
+
+if [ ! -f "$SQLITE3_C" ]; then
+    echo "Error: $SQLITE3_C not found" >&2
+    exit 1
+fi
+
+if [ ! -f "$SQLITE3_H" ]; then
+    echo "Error: $SQLITE3_H not found" >&2
+    exit 1
+fi
+
+# Extract symbols from SQLITE_API declarations in sqlite3.c
+# This catches functions and variables like sqlite3_open, sqlite3_version, etc.
+# Also catches sqlite3session_*, sqlite3changegroup_*, sqlite3rbu_*, etc.
+grep '^SQLITE_API' "$SQLITE3_C" | grep -oE 'sqlite3[a-zA-Z0-9_]*' | sort -u > /tmp/sqlite_funcs.$$
+
+# Extract type names from typedef declarations in sqlite3.h
+grep -E '^typedef' "$SQLITE3_H" | grep -oE 'sqlite3[a-zA-Z0-9_]*' | sort -u > /tmp/sqlite_types.$$
+
+# Also get sqlite_int64 and sqlite_uint64
+grep -E '^typedef' "$SQLITE3_H" | grep -oE 'sqlite_[a-zA-Z0-9_]*' | sort -u >> /tmp/sqlite_types.$$
+
+# Combine and deduplicate
+cat /tmp/sqlite_funcs.$$ /tmp/sqlite_types.$$ | sort -u > /tmp/all_symbols.$$
+
+# Clean up temp files on exit
+trap "rm -f /tmp/sqlite_funcs.$$ /tmp/sqlite_types.$$ /tmp/all_symbols.$$" EXIT
+
+# Count symbols
+NUM_SYMBOLS=$(wc -l < /tmp/all_symbols.$$)
+echo "Found $NUM_SYMBOLS symbols to rename"
+
+# Generate the header
+cat > "$OUTPUT" << 'HEADER_EOF'
+/*
+ * Copyright (c) 2025 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This header renames all public SQLite3 symbols to use a heim_ prefix
+ * to avoid symbol conflicts when both libheimsqlite and libsqlite3 are
+ * loaded in the same process.
+ *
+ * This file is auto-generated by gen-sqlite3-namespace.sh
+ * Regenerate after importing a new SQLite version:
+ *
+ *   cd lib/sqlite && ./gen-sqlite3-namespace.sh
+ */
+
+#ifndef SQLITE3_NAMESPACE_H
+#define SQLITE3_NAMESPACE_H
+
+HEADER_EOF
+
+# Generate the #define lines
+while read sym; do
+    echo "#define $sym heim_$sym"
+done < /tmp/all_symbols.$$ >> "$OUTPUT"
+
+cat >> "$OUTPUT" << 'FOOTER_EOF'
+
+#endif /* SQLITE3_NAMESPACE_H */
+FOOTER_EOF
+
+echo "Generated $OUTPUT with $NUM_SYMBOLS symbol renames"
diff --git a/lib/sqlite/sqlite3_namespace.h b/lib/sqlite/sqlite3_namespace.h
index 7380a4b34..260adab71 100644
--- a/lib/sqlite/sqlite3_namespace.h
+++ b/lib/sqlite/sqlite3_namespace.h
@@ -36,10 +36,10 @@
  * to avoid symbol conflicts when both libheimsqlite and libsqlite3 are
  * loaded in the same process.
  *
- * This file is auto-generated. To regenerate:
- *   grep '^SQLITE_API' lib/sqlite/sqlite3.c | grep -oE 'sqlite3[a-zA-Z0-9_]*' | sort -u > /tmp/funcs.txt
- *   grep -E '^typedef' lib/sqlite/sqlite3.h | grep -oE 'sqlite3[a-zA-Z0-9_]*' | sort -u > /tmp/types.txt
- *   cat /tmp/funcs.txt /tmp/types.txt | sort -u | while read sym; do echo "#define $sym heim_$sym"; done
+ * This file is auto-generated by gen-sqlite3-namespace.sh
+ * Regenerate after importing a new SQLite version:
+ *
+ *   cd lib/sqlite && ./gen-sqlite3-namespace.sh
  */
 
 #ifndef SQLITE3_NAMESPACE_H