From f95fa0cf5d7607a7230665c8e0fdb96275985fc7 Mon Sep 17 00:00:00 2001
From: Vincent Guilpain <vincent.guilpain@scalar-labs.com>
Date: Fri, 5 Dec 2025 09:49:43 +0900
Subject: [PATCH 1/2] Add TiDB and AlloyDB to ScalarDB core and ScalarDB
 Cluster sample

---
 scalardb-cluster-standalone-mode/docker-compose.yaml | 10 ++++++++++
 .../scalardb-cluster-node.properties                 | 12 ++++++++++++
 scalardb-sample/database.properties                  | 12 ++++++++++++
 scalardb-sample/docker-compose.yml                   |  9 +++++++++
 4 files changed, 43 insertions(+)

diff --git a/scalardb-cluster-standalone-mode/docker-compose.yaml b/scalardb-cluster-standalone-mode/docker-compose.yaml
index a7adde7..0fdb994 100644
--- a/scalardb-cluster-standalone-mode/docker-compose.yaml
+++ b/scalardb-cluster-standalone-mode/docker-compose.yaml
@@ -67,6 +67,16 @@ services:
     command: >
       /bin/sh -c "az storage container create --name 'test-container' --connection-string 'DefaultEndpointsProtocol=http;AccountName=test;AccountKey=test;BlobEndpoint=http://blobstorage-1:10000/test;'"
 
+  alloydb:
+    image: google/alloydbomni:16
+    container_name: "alloydb-1"
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--icu-locale=en-US-u-va-posix"
+
   scalardb-cluster-node:
     image: ghcr.io/scalar-labs/scalardb-cluster-node-byol-premium:3.17.0
     container_name: "scalardb-cluster-node"
diff --git a/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties b/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
index 1f0f8c5..a62ef9d 100644
--- a/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
+++ b/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
@@ -52,6 +52,18 @@
 # scalar.db.username=test
 # scalar.db.password=test
 
+# For TiDB
+#scalar.db.storage=jdbc
+#scalar.db.contact_points=jdbc:mysql://host.docker.internal:4000/
+#scalar.db.username=root
+#scalar.db.password=
+
+# For AlloyDB
+#scalar.db.storage=jdbc
+#scalar.db.contact_points=jdbc:postgresql://alloydb-1:5432/postgres
+#scalar.db.username=postgres
+#scalar.db.password=postgres
+
 # Standalone mode
 scalar.db.cluster.node.standalone_mode.enabled=true
 
diff --git a/scalardb-sample/database.properties b/scalardb-sample/database.properties
index a860de5..bb4f6ee 100644
--- a/scalardb-sample/database.properties
+++ b/scalardb-sample/database.properties
@@ -45,3 +45,15 @@
 # scalar.db.contact_points=jdbc:db2://localhost:50000/sample
 # scalar.db.username=db2inst1
 # scalar.db.password=db2inst1
+
+# For TiDB
+# scalar.db.storage=jdbc
+# scalar.db.contact_points=jdbc:mysql://localhost:4000/
+# scalar.db.username=root
+# scalar.db.password=
+
+# For AlloyDB
+# scalar.db.storage=jdbc
+# scalar.db.contact_points=jdbc:postgresql://localhost:5432/
+# scalar.db.username=postgres
+# scalar.db.password=postgres
diff --git a/scalardb-sample/docker-compose.yml b/scalardb-sample/docker-compose.yml
index cb9f99c..8d45375 100644
--- a/scalardb-sample/docker-compose.yml
+++ b/scalardb-sample/docker-compose.yml
@@ -51,3 +51,12 @@ services:
     ports:
       - "50000:50000"
     privileged: true
+  alloydb:
+    image: google/alloydbomni:16
+    container_name: "alloydb-1"
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--icu-locale=en-US-u-va-posix"

From e7c7560a932e8bbd9c53da9891d9af3624e60bda Mon Sep 17 00:00:00 2001
From: Vincent Guilpain <vincent.guilpain@scalar-labs.com>
Date: Tue, 9 Dec 2025 11:06:10 +0900
Subject: [PATCH 2/2] Apply AI agent comments

---
 .../docker-compose.yaml                          |  2 +-
 .../scalardb-cluster-node.properties             | 16 ++++++++--------
 scalardb-sample/docker-compose.yml               |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scalardb-cluster-standalone-mode/docker-compose.yaml b/scalardb-cluster-standalone-mode/docker-compose.yaml
index 0fdb994..b000f4b 100644
--- a/scalardb-cluster-standalone-mode/docker-compose.yaml
+++ b/scalardb-cluster-standalone-mode/docker-compose.yaml
@@ -71,7 +71,7 @@ services:
     image: google/alloydbomni:16
     container_name: "alloydb-1"
     ports:
-      - "5432:5432"
+      - "5433:5432"
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
diff --git a/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties b/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
index a62ef9d..190140d 100644
--- a/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
+++ b/scalardb-cluster-standalone-mode/scalardb-cluster-node.properties
@@ -53,16 +53,16 @@
 # scalar.db.password=test
 
 # For TiDB
-#scalar.db.storage=jdbc
-#scalar.db.contact_points=jdbc:mysql://host.docker.internal:4000/
-#scalar.db.username=root
-#scalar.db.password=
+# scalar.db.storage=jdbc
+# scalar.db.contact_points=jdbc:mysql://host.docker.internal:4000/
+# scalar.db.username=root
+# scalar.db.password=
 
 # For AlloyDB
-#scalar.db.storage=jdbc
-#scalar.db.contact_points=jdbc:postgresql://alloydb-1:5432/postgres
-#scalar.db.username=postgres
-#scalar.db.password=postgres
+# scalar.db.storage=jdbc
+# scalar.db.contact_points=jdbc:postgresql://alloydb-1:5432/
+# scalar.db.username=postgres
+# scalar.db.password=postgres
 
 # Standalone mode
 scalar.db.cluster.node.standalone_mode.enabled=true
diff --git a/scalardb-sample/docker-compose.yml b/scalardb-sample/docker-compose.yml
index 8d45375..dd45fa5 100644
--- a/scalardb-sample/docker-compose.yml
+++ b/scalardb-sample/docker-compose.yml
@@ -55,7 +55,7 @@ services:
     image: google/alloydbomni:16
     container_name: "alloydb-1"
     ports:
-      - "5432:5432"
+      - "5433:5432"
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres