add veb file version (#606)

Author: tomas-villagesql

mysql-test/include/villagesql/create_extension_sdk.inc

@@ -12,6 +12,10 @@
 #
 # Optional:
 #   --let $extension_manifest_extra = , "description": "My extension"
+#   --let $extension_versioned = 1
+#     When set, copies to {name}-{version}.veb instead of {name}.veb.
+#     Use this when the test needs versioned VEB files on disk (e.g. for
+#     INSTALL EXTENSION foo VERSION 'x.y.z').
 #
 # The VEB file will be created and moved to the VEB directory.
 #
@@ -76,9 +80,18 @@ if (!$extension_version)
 
 # Move VEB to server's VEB directory
 --exec mkdir -p $veb_dir
---exec cp $ext_build_dir/build/$extension_name.veb $veb_dir/
 
---echo Created $extension_name.veb
+if ($extension_versioned)
+{
+  --exec cp $ext_build_dir/build/$extension_name.veb $veb_dir/$extension_name-$extension_version.veb
+  --echo Created $extension_name-$extension_version.veb
+}
+
+if (!$extension_versioned)
+{
+  --exec cp $ext_build_dir/build/$extension_name.veb $veb_dir/
+  --echo Created $extension_name.veb
+}
 
 # Cleanup build directory
 --exec rm -rf $ext_build_dir
@@ -88,3 +101,4 @@ if (!$extension_version)
 --let $extension_version =
 --let $extension_source =
 --let $extension_manifest_extra =
+--let $extension_versioned =

mysql-test/suite/villagesql/extension/r/extension_install_versioned_veb.result

@@ -0,0 +1,20 @@
+Creating extension versioned_noop using SDK...
+Created versioned_noop-1.2.3.veb
+INSTALL EXTENSION versioned_noop;
+ERROR HY000: Multiple versions of extension 'versioned_noop' found in 'MYSQLTEST_VARDIR/mysqld.1/veb/'; specify a version with INSTALL EXTENSION versioned_noop VERSION 'x.y.z'
+INSTALL EXTENSION versioned_noop;
+SELECT extension_name, extension_version FROM INFORMATION_SCHEMA.EXTENSIONS
+WHERE extension_name = 'versioned_noop';
+EXTENSION_NAME	EXTENSION_VERSION
+versioned_noop	1.2.3
+UNINSTALL EXTENSION versioned_noop VERSION '1.2.3';
+INSTALL EXTENSION versioned_noop VERSION '1.2.3';
+SELECT extension_name, extension_version FROM INFORMATION_SCHEMA.EXTENSIONS
+WHERE extension_name = 'versioned_noop';
+EXTENSION_NAME	EXTENSION_VERSION
+versioned_noop	1.2.3
+UNINSTALL EXTENSION versioned_noop VERSION '1.2.3';
+INSTALL EXTENSION versioned_noop VERSION '9.9.9';
+ERROR HY000: Version mismatch in 'versioned_noop-9.9.9.veb': filename says '9.9.9' but manifest says '1.2.3'
+INSTALL EXTENSION versioned_noop;
+ERROR HY000: Version mismatch in 'versioned_noop-9.9.9.veb': filename says '9.9.9' but manifest says '1.2.3'

mysql-test/suite/villagesql/extension/t/extension_install_versioned_veb.test

@@ -0,0 +1,43 @@
+# Test INSTALL EXTENSION with versioned VEB filenames ({name}-{version}.veb).
+# The original extension_install_version.test covers unversioned {name}.veb
+# with manifest-version matching; this one covers the version-in-filename
+# resolution rules.
+
+--let $veb_dir = `SELECT @@veb_dir`
+
+--let $extension_name = versioned_noop
+--let $extension_version = 1.2.3
+--let $extension_source = $MYSQL_TEST_DIR/suite/villagesql/std_data/noop_extension.cc
+--let $extension_versioned = 1
+--source include/villagesql/create_extension_sdk.inc
+
+--copy_file $veb_dir/versioned_noop-1.2.3.veb $veb_dir/versioned_noop-2.0.0.veb
+--replace_result $MYSQLTEST_VARDIR/mysqld.1/veb/ MYSQLTEST_VEB_DIR
+--replace_result $veb_dir MYSQLTEST_VEB_DIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_VILLAGESQL_GENERIC_ERROR
+INSTALL EXTENSION versioned_noop;
+--remove_file $veb_dir/versioned_noop-2.0.0.veb
+
+INSTALL EXTENSION versioned_noop;
+SELECT extension_name, extension_version FROM INFORMATION_SCHEMA.EXTENSIONS
+  WHERE extension_name = 'versioned_noop';
+UNINSTALL EXTENSION versioned_noop VERSION '1.2.3';
+
+INSTALL EXTENSION versioned_noop VERSION '1.2.3';
+SELECT extension_name, extension_version FROM INFORMATION_SCHEMA.EXTENSIONS
+  WHERE extension_name = 'versioned_noop';
+UNINSTALL EXTENSION versioned_noop VERSION '1.2.3';
+
+--copy_file $veb_dir/versioned_noop-1.2.3.veb $veb_dir/versioned_noop-9.9.9.veb
+--error ER_VILLAGESQL_GENERIC_ERROR
+INSTALL EXTENSION versioned_noop VERSION '9.9.9';
+--remove_file $veb_dir/versioned_noop-9.9.9.veb
+
+# Filename version must match manifest version even when VERSION is omitted.
+# Move versioned_noop-1.2.3.veb to versioned_noop-9.9.9.veb: filename says
+# 9.9.9 but manifest still says 1.2.3.
+--move_file $veb_dir/versioned_noop-1.2.3.veb $veb_dir/versioned_noop-9.9.9.veb
+--error ER_VILLAGESQL_GENERIC_ERROR
+INSTALL EXTENSION versioned_noop;
+--remove_file $veb_dir/versioned_noop-9.9.9.veb