duckdb 0.2.10-dev506.0 → 0.3.1-dev5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.2.10-dev506.0",
+  "version": "0.3.1-dev5.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -4648,7 +4648,7 @@ namespace duckdb {
 string SimilarCatalogEntry::GetQualifiedName() const {
 	D_ASSERT(Found());
 
-	return name + "." + schema->name;
+	return schema->name + "." + name;
 }
 
 Catalog::Catalog(DatabaseInstance &db)
@@ -89795,6 +89795,7 @@ void StructPackFun::RegisterFunction(BuiltinFunctions &set) {
 
 
 
+
 namespace duckdb {
 
 // current_query
@@ -89807,6 +89808,11 @@ struct SystemBindData : public FunctionData {
 	unique_ptr<FunctionData> Copy() override {
 		return make_unique<SystemBindData>(context);
 	}
+
+	static SystemBindData &GetFrom(ExpressionState &state) {
+		auto &func_expr = (BoundFunctionExpression &)state.expr;
+		return (SystemBindData &)*func_expr.bind_info;
+	}
 };
 
 unique_ptr<FunctionData> BindSystemFunction(ClientContext &context, ScalarFunction &bound_function,
@@ -89815,8 +89821,7 @@ unique_ptr<FunctionData> BindSystemFunction(ClientContext &context, ScalarFuncti
 }
 
 static void CurrentQueryFunction(DataChunk &input, ExpressionState &state, Vector &result) {
-	auto &func_expr = (BoundFunctionExpression &)state.expr;
-	auto &info = (SystemBindData &)*func_expr.bind_info;
+	auto &info = SystemBindData::GetFrom(state);
 
 	Value val(info.context.query);
 	result.Reference(val);
@@ -89824,13 +89829,16 @@ static void CurrentQueryFunction(DataChunk &input, ExpressionState &state, Vecto
 
 // current_schema
 static void CurrentSchemaFunction(DataChunk &input, ExpressionState &state, Vector &result) {
-	Value val(DEFAULT_SCHEMA);
+	Value val(SystemBindData::GetFrom(state).context.catalog_search_path->GetDefault());
 	result.Reference(val);
 }
 
 // current_schemas
 static void CurrentSchemasFunction(DataChunk &input, ExpressionState &state, Vector &result) {
-	vector<Value> schema_list = {Value(DEFAULT_SCHEMA)};
+	vector<Value> schema_list;
+	vector<string> search_path = SystemBindData::GetFrom(state).context.catalog_search_path->Get();
+	std::transform(search_path.begin(), search_path.end(), std::back_inserter(schema_list),
+	               [](const string &s) -> Value { return Value(s); });
 	auto val = Value::LIST(schema_list);
 	result.Reference(val);
 }
@@ -89856,9 +89864,10 @@ void SystemFun::RegisterFunction(BuiltinFunctions &set) {
 
 	set.AddFunction(
 	    ScalarFunction("current_query", {}, LogicalType::VARCHAR, CurrentQueryFunction, false, BindSystemFunction));
-	set.AddFunction(ScalarFunction("current_schema", {}, LogicalType::VARCHAR, CurrentSchemaFunction));
 	set.AddFunction(
-	    ScalarFunction("current_schemas", {LogicalType::BOOLEAN}, varchar_list_type, CurrentSchemasFunction));
+	    ScalarFunction("current_schema", {}, LogicalType::VARCHAR, CurrentSchemaFunction, false, BindSystemFunction));
+	set.AddFunction(ScalarFunction("current_schemas", {LogicalType::BOOLEAN}, varchar_list_type, CurrentSchemasFunction,
+	                               false, BindSystemFunction));
 	set.AddFunction(
 	    ScalarFunction("txid_current", {}, LogicalType::BIGINT, TransactionIdCurrent, false, BindSystemFunction));
 	set.AddFunction(ScalarFunction("version", {}, LogicalType::VARCHAR, VersionFunction));

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "38b90beee"
-#define DUCKDB_VERSION "0.2.10-dev506"
+#define DUCKDB_SOURCE_ID "e4f32c8fc"
+#define DUCKDB_VERSION "0.3.1-dev5"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //