Create custom DC mysql tables for new database (#1312)

cmd/main.go

@@ -31,6 +31,7 @@ import (
 	"github.com/datacommonsorg/mixer/internal/server"
 	"github.com/datacommonsorg/mixer/internal/server/cache"
 	"github.com/datacommonsorg/mixer/internal/server/healthcheck"
+	"github.com/datacommonsorg/mixer/internal/sqldb"
 	"github.com/datacommonsorg/mixer/internal/sqldb/cloudsql"
 	"github.com/datacommonsorg/mixer/internal/sqldb/sqlite"
 	"github.com/datacommonsorg/mixer/internal/store"
@@ -203,6 +204,13 @@ func main() {
 		}
 	}
 
+	// Create tables for new database.
+	if *useSQLite || *useCloudSQL {
+		if err := sqldb.CreateTables(sqlClient); err != nil {
+			log.Fatalf("Can not create tables in database: %v", err)
+		}
+	}
+
 	// Store
 	if len(tables) == 0 && *remoteMixerDomain == "" && sqlClient == nil {
 		log.Fatal("No bigtables or remote mixer domain or sql database are provided")

internal/sqldb/createtables.go

@@ -0,0 +1,50 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package sqldb
+
+import (
+	"database/sql"
+)
+
+// CreateTables creates tables in MySQL database if they are not present.
+func CreateTables(sqlClient *sql.DB) error {
+	tripleStatement := `
+	CREATE TABLE IF NOT EXISTS triples (
+		subject_id TEXT,
+		predicate TEXT,
+		object_id TEXT,
+		object_value TEXT
+	);
+	`
+	_, err := sqlClient.Exec(tripleStatement)
+	if err != nil {
+		return err
+	}
+
+	observationStatement := `
+	CREATE TABLE IF NOT EXISTS observations (
+		entity TEXT,
+		variable TEXT,
+		date TEXT,
+		value TEXT,
+		provenance TEXT
+	);
+	`
+	_, err = sqlClient.Exec(observationStatement)
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/sqldb/sqlite/sqlite.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,36 +20,6 @@ import (
 	"path/filepath"
 )
 
-func createTables(sqlClient *sql.DB) error {
-	tripleStatement := `
-	CREATE TABLE IF NOT EXISTS triples (
-		subject_id TEXT,
-		predicate TEXT,
-		object_id TEXT,
-		object_value TEXT
-	);
-	`
-	_, err := sqlClient.Exec(tripleStatement)
-	if err != nil {
-		return err
-	}
-
-	observationStatement := `
-	CREATE TABLE IF NOT EXISTS observations (
-		entity TEXT,
-		variable TEXT,
-		date TEXT,
-		value TEXT,
-		provenance TEXT
-	);
-	`
-	_, err = sqlClient.Exec(observationStatement)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func ConnectDB(dbPath string) (*sql.DB, error) {
 	// Create all intermediate directories.
 	if err := os.MkdirAll(filepath.Dir(dbPath), 0755); err != nil {
@@ -74,9 +44,5 @@ func ConnectDB(dbPath string) (*sql.DB, error) {
 	if err != nil {
 		return nil, err
 	}
-	err = createTables(sqlClient)
-	if err != nil {
-		return nil, err
-	}
 	return sqlClient, err
 }