duckdb 0.3.2-dev1141.0 → 0.3.2-dev1175.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.2-dev1141.0",
+  "version": "0.3.2-dev1175.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -110209,6 +110209,79 @@ string CreateViewRelation::ToString(idx_t depth) {
 	return str + child->ToString(depth + 1);
 }
 
+} // namespace duckdb
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/main/relation/cross_product_relation.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+
+namespace duckdb {
+
+class CrossProductRelation : public Relation {
+public:
+	CrossProductRelation(shared_ptr<Relation> left, shared_ptr<Relation> right);
+
+	shared_ptr<Relation> left;
+	shared_ptr<Relation> right;
+	vector<ColumnDefinition> columns;
+
+public:
+	unique_ptr<QueryNode> GetQueryNode() override;
+
+	const vector<ColumnDefinition> &Columns() override;
+	string ToString(idx_t depth) override;
+
+	unique_ptr<TableRef> GetTableRef() override;
+};
+
+} // namespace duckdb
+
+
+
+
+
+
+namespace duckdb {
+
+CrossProductRelation::CrossProductRelation(shared_ptr<Relation> left_p, shared_ptr<Relation> right_p)
+    : Relation(left_p->context, RelationType::CROSS_PRODUCT_RELATION), left(move(left_p)), right(move(right_p)) {
+	if (&left->context != &right->context) {
+		throw Exception("Cannot combine LEFT and RIGHT relations of different connections!");
+	}
+	context.TryBindRelation(*this, this->columns);
+}
+
+unique_ptr<QueryNode> CrossProductRelation::GetQueryNode() {
+	auto result = make_unique<SelectNode>();
+	result->select_list.push_back(make_unique<StarExpression>());
+	result->from_table = GetTableRef();
+	return move(result);
+}
+
+unique_ptr<TableRef> CrossProductRelation::GetTableRef() {
+	auto cross_product_ref = make_unique<CrossProductRef>();
+	cross_product_ref->left = left->GetTableRef();
+	cross_product_ref->right = right->GetTableRef();
+	return move(cross_product_ref);
+}
+
+const vector<ColumnDefinition> &CrossProductRelation::Columns() {
+	return this->columns;
+}
+
+string CrossProductRelation::ToString(idx_t depth) {
+	string str = RenderWhitespace(depth);
+	str = "Cross Product";
+	return str + "\n" + left->ToString(depth + 1) + right->ToString(depth + 1);
+}
+
 } // namespace duckdb
 //===----------------------------------------------------------------------===//
 //                         DuckDB
@@ -110793,8 +110866,8 @@ const vector<ColumnDefinition> &JoinRelation::Columns() {
 
 string JoinRelation::ToString(idx_t depth) {
 	string str = RenderWhitespace(depth);
-	str = "Join";
-	return str + "\n" + left->ToString(depth + 1) + right->ToString(depth + 1);
+	str = "Join " + JoinTypeToString(join_type);
+	return str + "\n" + left->ToString(depth + 1) + "\n" + right->ToString(depth + 1);
 }
 
 } // namespace duckdb
@@ -111855,6 +111928,7 @@ string WriteCSVRelation::ToString(idx_t depth) {
 
 
 
+
 
 
 namespace duckdb {
@@ -111967,6 +112041,10 @@ shared_ptr<Relation> Relation::Join(const shared_ptr<Relation> &other, const str
 	}
 }
 
+shared_ptr<Relation> Relation::CrossProduct(const shared_ptr<Relation> &other) {
+	return make_shared<CrossProductRelation>(shared_from_this(), other);
+}
+
 shared_ptr<Relation> Relation::Union(const shared_ptr<Relation> &other) {
 	return make_shared<SetOpRelation>(shared_from_this(), other, SetOperationType::UNION);
 }

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "37e046ec0"
-#define DUCKDB_VERSION "v0.3.2-dev1141"
+#define DUCKDB_SOURCE_ID "c49927a99"
+#define DUCKDB_VERSION "v0.3.2-dev1175"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -10680,6 +10680,9 @@ public:
 	DUCKDB_API shared_ptr<Relation> Join(const shared_ptr<Relation> &other, const string &condition,
 	                                     JoinType type = JoinType::INNER);
 
+	// CROSS PRODUCT operation
+	DUCKDB_API shared_ptr<Relation> CrossProduct(const shared_ptr<Relation> &other);
+
 	// SET operations
 	DUCKDB_API shared_ptr<Relation> Union(const shared_ptr<Relation> &other);
 	DUCKDB_API shared_ptr<Relation> Except(const shared_ptr<Relation> &other);