Adapt to merging of package external tests, examples, and benchmarks into typed tests

1 files changed, 13 insertions, 51 deletions

diff --git a/libbrep/build-extra.sql b/libbrep/build-extra.sql
index b466382..a61f415 100644
--- a/libbrep/build-extra.sql
+++ b/libbrep/build-extra.sql
@@ -10,10 +10,6 @@ DROP FOREIGN TABLE IF EXISTS build_package_constraints;
 
 DROP FOREIGN TABLE IF EXISTS build_package_builds;
 
-DROP FOREIGN TABLE IF EXISTS build_package_benchmarks;
-
-DROP FOREIGN TABLE IF EXISTS build_package_examples;
-
 DROP FOREIGN TABLE IF EXISTS build_package_tests;
 
 DROP FOREIGN TABLE IF EXISTS build_package;
@@ -22,6 +18,12 @@ DROP FOREIGN TABLE IF EXISTS build_repository;
 
 DROP FOREIGN TABLE IF EXISTS build_tenant;
 
+-- @@ TMP Also drop tables that are removed in 12 schema version. Drop these
+--    statements after 0.13.0 is released.
+--
+DROP FOREIGN TABLE IF EXISTS build_package_benchmarks;
+DROP FOREIGN TABLE IF EXISTS build_package_examples;
+
 -- The foreign table for build_tenant object.
 --
 CREATE FOREIGN TABLE build_tenant (
@@ -66,55 +68,15 @@ CREATE FOREIGN TABLE build_package_tests (
   version_canonical_release TEXT NOT NULL COLLATE "C",
   version_revision INTEGER NOT NULL,
   index BIGINT NOT NULL,
-  dep_name CITEXT NOT NULL,
-  dep_package_tenant TEXT NULL,
-  dep_package_name CITEXT NULL,
-  dep_package_version_epoch INTEGER NULL,
-  dep_package_version_canonical_upstream TEXT NULL,
-  dep_package_version_canonical_release TEXT NULL COLLATE "C",
-  dep_package_version_revision INTEGER NULL)
+  test_name CITEXT NOT NULL,
+  test_package_tenant TEXT NULL,
+  test_package_name CITEXT NULL,
+  test_package_version_epoch INTEGER NULL,
+  test_package_version_canonical_upstream TEXT NULL,
+  test_package_version_canonical_release TEXT NULL COLLATE "C",
+  test_package_version_revision INTEGER NULL)
 SERVER package_server OPTIONS (table_name 'package_tests');
 
--- The foreign table for the build_package object examples member (that is of a
--- container type).
---
-CREATE FOREIGN TABLE build_package_examples (
-  tenant TEXT NOT NULL,
-  name CITEXT NOT NULL,
-  version_epoch INTEGER NOT NULL,
-  version_canonical_upstream TEXT NOT NULL,
-  version_canonical_release TEXT NOT NULL COLLATE "C",
-  version_revision INTEGER NOT NULL,
-  index BIGINT NOT NULL,
-  dep_name CITEXT NOT NULL,
-  dep_package_tenant TEXT NULL,
-  dep_package_name CITEXT NULL,
-  dep_package_version_epoch INTEGER NULL,
-  dep_package_version_canonical_upstream TEXT NULL,
-  dep_package_version_canonical_release TEXT NULL COLLATE "C",
-  dep_package_version_revision INTEGER NULL)
-SERVER package_server OPTIONS (table_name 'package_examples');
-
--- The foreign table for the build_package object benchmarks member (that is
--- of a container type).
---
-CREATE FOREIGN TABLE build_package_benchmarks (
-  tenant TEXT NOT NULL,
-  name CITEXT NOT NULL,
-  version_epoch INTEGER NOT NULL,
-  version_canonical_upstream TEXT NOT NULL,
-  version_canonical_release TEXT NOT NULL COLLATE "C",
-  version_revision INTEGER NOT NULL,
-  index BIGINT NOT NULL,
-  dep_name CITEXT NOT NULL,
-  dep_package_tenant TEXT NULL,
-  dep_package_name CITEXT NULL,
-  dep_package_version_epoch INTEGER NULL,
-  dep_package_version_canonical_upstream TEXT NULL,
-  dep_package_version_canonical_release TEXT NULL COLLATE "C",
-  dep_package_version_revision INTEGER NULL)
-SERVER package_server OPTIONS (table_name 'package_benchmarks');
-
 -- The foreign table for the build_package object builds member (that is of a
 -- container type).
 --