Include snapshot.tcl in MakeFile

Also, change database index names to better avoid conflict with table names
macports · Jun 21, 2017 · 9d67b3c7857ebe775b16fdb30d5619a40364dde3 · 9d67b3c
1 parent 49360e6
commit 9d67b3c7857ebe775b16fdb30d5619a40364dde3
Unified Split

Showing with 5 additions and 5 deletions.

BIN src/cregistry/.entry.c.swp

+4 −4 src/cregistry/sql.c

+1 −1 src/macports1.0/Makefile.in
diff --git a/src/cregistry/.entry.c.swp b/src/cregistry/.entry.c.swp
diff --git a/src/cregistry/sql.c b/src/cregistry/sql.c
@@ -211,7 +211,7 @@ int create_tables(sqlite3* db, reg_error* errPtr) {
             ", port_name TEXT COLLATE NOCASE"
             ", requested INTEGER"
             ", FOREIGN KEY(id) REFERENCES snapshots(id))",
-        "CREATE INDEX registry.snapshot_ports ON snapshot_ports"
+        "CREATE INDEX registry.snapshot_port ON snapshot_ports"
             "(id, port_name)",
 
         /* snapshot port variants table */
@@ -221,7 +221,7 @@ int create_tables(sqlite3* db, reg_error* errPtr) {
             ", variant_name TEXT COLLATE NOCASE"
             ", variant_sign TEXT"
             ", FOREIGN KEY(id) REFERENCES snapshot_ports(id))",
-        "CREATE INDEX registry.snapshot_port_variants ON snapshot_port_variants(id)",
+        "CREATE INDEX registry.snapshot_port_variant ON snapshot_port_variants(id)",
 
         "COMMIT",
         NULL
@@ -756,7 +756,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
                     ", requested INTEGER"
                     ", FOREIGN KEY(id) REFERENCES snapshots(id))",
 
-                "CREATE INDEX registry.snapshot_ports ON snapshot_ports"
+                "CREATE INDEX registry.snapshot_port ON snapshot_ports"
                     "(id, port_name)",
 
                 /* snapshot port variants table */
@@ -766,7 +766,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
                     ", variant_sign TEXT"
                     ", FOREIGN KEY(id) REFERENCES snapshot_ports(id))",
 
-                "CREATE INDEX registry.snapshot_port_variants ON snapshot_port_variants(id)",
+                "CREATE INDEX registry.snapshot_port_variant ON snapshot_port_variants(id)",
 
                 /* Update version and commit */
                 "UPDATE registry.metadata SET value = '1.205' WHERE key = 'version'",

diff --git a/src/macports1.0/Makefile.in b/src/macports1.0/Makefile.in
@@ -4,7 +4,7 @@ VPATH  = @srcdir@
 include ../../Mk/macports.autoconf.mk
 
 SRCS=		macports.tcl macports_dlist.tcl macports_util.tcl \
-		macports_autoconf.tcl diagnose.tcl reclaim.tcl selfupdate.tcl
+		macports_autoconf.tcl diagnose.tcl reclaim.tcl snapshot.tcl selfupdate.tcl
 OBJS=		macports.o get_systemconfiguration_proxies.o sysctl.o
 SHLIB_NAME=	MacPorts${SHLIB_SUFFIX}