allow multiple control files (#4765)

test_runner/regress/data/extension_test/111/v14/ext_index.json

@@ -1,10 +1,15 @@
 {
   "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "111/v14/extensions/embedding.tar.zst"
+    "control_data": {
+      "embedding.control": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true"
+    },
+    "archive_path": "111/v14/extensions/embedding.tar.zst"
   },
   "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "111/v14/extensions/anon.tar.zst"
+    "control_data": {
+      "anon.control": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n"
+    },
+    "archive_path": "111/v14/extensions/anon.tar.zst"
   }
 }
+

test_runner/regress/data/extension_test/111/v15/ext_index.json

@@ -1,11 +1,14 @@
 {
   "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "111/v15/extensions/embedding.tar.zst"
+    "control_data": {
+      "embedding.control": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true"
+    },
+    "archive_path": "111/v15/extensions/embedding.tar.zst"
   },
   "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "111/v15/extensions/anon.tar.zst"
+    "control_data": {
+      "anon.control": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n"
+    },
+    "archive_path": "111/v15/extensions/anon.tar.zst"
   }
 }
-

test_runner/regress/data/extension_test/112/v14/ext_index.json

@@ -1,10 +0,0 @@
-{
-  "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "111/v14/extensions/embedding.tar.zst"
-  },
-  "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "112/v14/extensions/anon.tar.zst"
-  }
-}

test_runner/regress/data/extension_test/112/v15/ext_index.json

@@ -1,11 +0,0 @@
-{
-  "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "111/v15/extensions/embedding.tar.zst"
-  },
-  "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "112/v15/extensions/anon.tar.zst"
-  }
-}
-

test_runner/regress/data/extension_test/113/v14/ext_index.json

@@ -1,10 +0,0 @@
-{
-  "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "113/v14/extensions/embedding.tar.zst"
-  },
-  "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "111/v14/extensions/anon.tar.zst"
-  }
-}

test_runner/regress/data/extension_test/113/v15/ext_index.json

@@ -1,11 +0,0 @@
-{
-  "embedding": {
-    "control_file_content": "comment = 'hnsw index' \ndefault_version = '0.1.0' \nmodule_pathname = '$libdir/embedding' \nrelocatable = true \ntrusted = true",
-    "extension_archive": "113/v15/extensions/embedding.tar.zst"
-  },
-  "anon": {
-    "control_file_content": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n",
-    "extension_archive": "111/v15/extensions/anon.tar.zst"
-  }
-}
-