Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/duckdb/src/common/virtual_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ unique_ptr<FileHandle> VirtualFileSystem::OpenFileExtended(const OpenFileInfo &f
} else if (compression != FileCompressionType::UNCOMPRESSED) {
auto entry = compressed_fs.find(compression);
if (entry == compressed_fs.end()) {
if (compression == FileCompressionType::ZSTD) {
throw NotImplementedException(
"Attempting to open a compressed file, but the compression type is not supported.\nConsider "
"explicitly \"INSTALL parquet; LOAD parquet;\" to support this compression scheme");
}
throw NotImplementedException(
"Attempting to open a compressed file, but the compression type is not supported");
}
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "1-dev259"
#define DUCKDB_PATCH_VERSION "1"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 3
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.3.1-dev259"
#define DUCKDB_VERSION "v1.3.1"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "db3f895ce8"
#define DUCKDB_SOURCE_ID "2063dda3e6"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
8 changes: 4 additions & 4 deletions src/duckdb/src/include/duckdb/main/extension_entries.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1051,8 +1051,8 @@ static constexpr ExtensionEntry EXTENSION_SECRET_TYPES[] = {

// Note: these are currently hardcoded in scripts/generate_extensions_function.py
// TODO: automate by passing though to script via duckdb
static constexpr ExtensionEntry EXTENSION_COPY_FUNCTIONS[] = {{"parquet", "parquet"},
{"json", "json"}}; // END_OF_EXTENSION_COPY_FUNCTIONS
static constexpr ExtensionEntry EXTENSION_COPY_FUNCTIONS[] = {
{"parquet", "parquet"}, {"json", "json"}, {"avro", "avro"}}; // END_OF_EXTENSION_COPY_FUNCTIONS

// Note: these are currently hardcoded in scripts/generate_extensions_function.py
// TODO: automate by passing though to script via duckdb
Expand Down Expand Up @@ -1095,8 +1095,8 @@ static constexpr ExtensionEntry EXTENSION_FILE_PREFIXES[] = {
// Note: these are currently hardcoded in scripts/generate_extensions_function.py
// TODO: automate by passing though to script via duckdb
static constexpr ExtensionEntry EXTENSION_FILE_POSTFIXES[] = {
{".parquet", "parquet"}, {".json", "json"}, {".jsonl", "json"}, {".ndjson", "json"},
{".shp", "spatial"}, {".gpkg", "spatial"}, {".fgb", "spatial"}, {".xlsx", "excel"},
{".parquet", "parquet"}, {".json", "json"}, {".jsonl", "json"}, {".ndjson", "json"}, {".shp", "spatial"},
{".gpkg", "spatial"}, {".fgb", "spatial"}, {".xlsx", "excel"}, {".avro", "avro"},
}; // END_OF_EXTENSION_FILE_POSTFIXES

// Note: these are currently hardcoded in scripts/generate_extensions_function.py
Expand Down