duckdb 0.6.2-dev758.0 → 0.6.2-dev761.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev758.0",
+  "version": "0.6.2-dev761.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev758"
+#define DUCKDB_VERSION "0.6.2-dev761"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "cd29769dcd"
+#define DUCKDB_SOURCE_ID "a133a60550"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/storage/storage_info.hpp

@@ -28,6 +28,8 @@ struct FileHandle;
 //! The version number of the database storage format
 extern const uint64_t VERSION_NUMBER;
 
+const char *GetDuckDBVersion(idx_t version_number);
+
 using block_id_t = int64_t;
 
 #define INVALID_BLOCK (-1)

package/src/duckdb/src/storage/single_file_block_manager.cpp

@@ -46,6 +46,29 @@ MainHeader MainHeader::Deserialize(Deserializer &source) {
 		throw IOException("The file is not a valid DuckDB database file!");
 	}
 	header.version_number = source.Read<uint64_t>();
+	// check the version number
+	if (header.version_number != VERSION_NUMBER) {
+		auto version = GetDuckDBVersion(header.version_number);
+		string version_text;
+		if (version) {
+			// known version
+			version_text = "DuckDB version " + string(version);
+		} else {
+			version_text = string("an ") + (VERSION_NUMBER > header.version_number ? "older development" : "newer") +
+			               string(" version of DuckDB");
+		}
+		throw IOException(
+		    "Trying to read a database file with version number %lld, but we can only read version %lld.\n"
+		    "The database file was created with %s.\n\n"
+		    "The storage of DuckDB is not yet stable; newer versions of DuckDB cannot read old database files and "
+		    "vice versa.\n"
+		    "The storage will be stabilized when version 1.0 releases.\n\n"
+		    "For now, we recommend that you load the database file in a supported version of DuckDB, and use the "
+		    "EXPORT DATABASE command "
+		    "followed by IMPORT DATABASE on the current version of DuckDB.\n\n"
+		    "See the storage page for more information: https://duckdb.org/internals/storage",
+		    header.version_number, VERSION_NUMBER, version_text);
+	}
 	// read the flags
 	FieldReader reader(source);
 	for (idx_t i = 0; i < FLAG_COUNT; i++) {
@@ -150,20 +173,7 @@ SingleFileBlockManager::SingleFileBlockManager(DatabaseInstance &db, string path
 		MainHeader::CheckMagicBytes(*handle);
 		// otherwise, we check the metadata of the file
 		header_buffer.ReadAndChecksum(*handle, 0);
-		MainHeader header = DeserializeHeaderStructure<MainHeader>(header_buffer.buffer);
-		// check the version number
-		if (header.version_number != VERSION_NUMBER) {
-			throw IOException(
-			    "Trying to read a database file with version number %lld, but we can only read version %lld.\n"
-			    "The database file was created with an %s version of DuckDB.\n\n"
-			    "The storage of DuckDB is not yet stable; newer versions of DuckDB cannot read old database files and "
-			    "vice versa.\n"
-			    "The storage will be stabilized when version 1.0 releases.\n\n"
-			    "For now, we recommend that you load the database file in a supported version of DuckDB, and use the "
-			    "EXPORT DATABASE command "
-			    "followed by IMPORT DATABASE on the current version of DuckDB.",
-			    header.version_number, VERSION_NUMBER, VERSION_NUMBER > header.version_number ? "older" : "newer");
-		}
+		DeserializeHeaderStructure<MainHeader>(header_buffer.buffer);
 
 		// read the database headers from disk
 		DatabaseHeader h1, h2;

package/src/duckdb/src/storage/storage_info.cpp

@@ -4,4 +4,35 @@ namespace duckdb {
 
 const uint64_t VERSION_NUMBER = 40;
 
+struct StorageVersionInfo {
+	const char *version_name;
+	idx_t storage_version;
+};
+
+static StorageVersionInfo storage_version_info[] = {{"v0.6.0 or v0.6.1", 39},
+                                                    {"v0.5.0 or v0.5.1", 38},
+                                                    {"v0.3.3, v0.3.4 or v0.4.0", 33},
+                                                    {"v0.3.2", 31},
+                                                    {"v0.3.1", 27},
+                                                    {"v0.3.0", 25},
+                                                    {"v0.2.9", 21},
+                                                    {"v0.2.8", 18},
+                                                    {"v0.2.7", 17},
+                                                    {"v0.2.6", 15},
+                                                    {"v0.2.5", 13},
+                                                    {"v0.2.4", 11},
+                                                    {"v0.2.3", 6},
+                                                    {"v0.2.2", 4},
+                                                    {"v0.2.1 and prior", 1},
+                                                    {nullptr, 0}};
+
+const char *GetDuckDBVersion(idx_t version_number) {
+	for (idx_t i = 0; storage_version_info[i].version_name; i++) {
+		if (version_number == storage_version_info[i].storage_version) {
+			return storage_version_info[i].version_name;
+		}
+	}
+	return nullptr;
+}
+
 } // namespace duckdb