Merge branch 'main' into table-providers

Author: oktal

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - 'lens-v*'
+      - 'v*'
 jobs:
   publish:
     permissions:

CHANGELOG.md

@@ -2,6 +2,41 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## [v0.2.2](https://github.com/oktal/lens/compare/664ebef7b2e0489c327b74f5fa427941771f3808..v0.2.2) - 2024-09-25
+#### Bug Fixes
+- properly display datasources in table creation dialog - ([979d529](https://github.com/oktal/lens/commit/979d5294826b98cef8ef4c611a67be1fa93a725b)) - [@octal](https://github.com/octal)
+#### Miscellaneous Chores
+- **(version)** version 0.2.2 - ([c631ae3](https://github.com/oktal/lens/commit/c631ae37eb34a671fa6dc475e18c53e35fec8056)) - [@octal](https://github.com/octal)
+- **(version)** v0.2.1 - ([664ebef](https://github.com/oktal/lens/commit/664ebef7b2e0489c327b74f5fa427941771f3808)) - [@octal](https://github.com/octal)
+
+- - -
+
+## [v0.2.1](https://github.com/oktal/lens/compare/26f342bc4eea9de2a382d2fa0efe93e4543b90bc..v0.2.1) - 2024-09-25
+#### Miscellaneous Chores
+- **(CHANGELOG)** remove duplicate entry from CHANGELOG - ([232990c](https://github.com/oktal/lens/commit/232990c5518f856c46116f94d4b38db7a5f8f661)) - [@octal](https://github.com/octal)
+#### Refactoring
+- **(ui)** minor update of how datasources are displayed - ([26f342b](https://github.com/oktal/lens/commit/26f342bc4eea9de2a382d2fa0efe93e4543b90bc)) - [@octal](https://github.com/octal)
+
+- - -
+
+- - -
+## [v0.2.0](https://github.com/oktal/lens/compare/0fdcff7d5a13800a33ca17a777a5b1a2482e63a4..v0.2.0) - 2024-09-23
+#### Bug Fixes
+- **(ui.sidebar)** open project GitHub when clicking github icon button - ([dd8b3ad](https://github.com/oktal/lens/commit/dd8b3ad372e966ad1d2c6d60cd1e7fb6b92d8372)) - [@octal](https://github.com/octal)
+- add google gcs datasource configuration options - ([ea782aa](https://github.com/oktal/lens/commit/ea782aa3ac74d43acabb709a76422ad5738acfd6)) - [@octal](https://github.com/octal)
+#### Features
+- **(ui)** query title can now be updated from history - ([8053c4b](https://github.com/oktal/lens/commit/8053c4bd3775b1d9e349d77dd7699615248f9519)) - [@octal](https://github.com/octal)
+#### Miscellaneous Chores
+- **(ci)** update release gh workflow tag prefix - ([fdf6b1e](https://github.com/oktal/lens/commit/fdf6b1ed6cb53f8800104e9c7620454e40036171)) - [@octal](https://github.com/octal)
+- **(version)** update version in tauri.conf.json - ([66364f0](https://github.com/oktal/lens/commit/66364f09298b5fdc00ddbb7723b33c2a13d31ea8)) - [@octal](https://github.com/octal)
+- **(version)** bump version in Cargo.toml - ([a992442](https://github.com/oktal/lens/commit/a9924427e02e65867835c26948884760e0eac3ed)) - [@octal](https://github.com/octal)
+- **(version)** v0.2.0 - ([1f7ba32](https://github.com/oktal/lens/commit/1f7ba32ee1bb9d702011c8f5253ea08f87ea473a)) - [@octal](https://github.com/octal)
+- configure tag prefix for cog - ([00f1a89](https://github.com/oktal/lens/commit/00f1a8944a0bbe216fff05014ef088854ff1a72d)) - [@octal](https://github.com/octal)
+- make window maximized by default - ([2a9e8a2](https://github.com/oktal/lens/commit/2a9e8a2ef0ee8c6da9341f16a9ded6ef031f5ad3)) - [@octal](https://github.com/octal)
+- bump CHANGELOG - ([0fdcff7](https://github.com/oktal/lens/commit/0fdcff7d5a13800a33ca17a777a5b1a2482e63a4)) - [@octal](https://github.com/octal)
+
+- - -
+
 ## [0.1.0](https://github.com/oktal/lens/compare/881a737c1ae48e89d758d3f8cc43cbe24c3ac41f..0.1.0) - 2024-09-16
 #### Bug Fixes
 - **(backend)** properly unespace characters before executing sql query - ([4e52725](https://github.com/oktal/lens/commit/4e52725e5ad08ae795c90c0ec4df3f7c54f9d316)) - [@octal](https://github.com/octal)

cog.toml

@@ -10,6 +10,7 @@ pre_bump_hooks = []
 post_bump_hooks = []
 pre_package_bump_hooks = []
 post_package_bump_hooks = []
+tag_prefix = "v"
 
 [git_hooks]
 

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lens"
-version = "0.1.0"
+version = "0.2.2"
 description = "An application to run SQL queries on structured files like csv, parquet, json"
 authors = ["Mathieu Stefani"]
 license = "MIT"
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.3", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.7.0", features = [ "dialog-save", "system-tray", "dialog-open", "icon-png"] }
+tauri = { version = "1.7.0", features = [ "shell-open", "dialog-save", "system-tray", "dialog-open", "icon-png"] }
 datafusion = { version = "41.0.0", features = ["serde"] }
 anyhow = "1.0.86"
 uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }

src-tauri/Cargo.toml

@@ -62,6 +62,7 @@ pub struct Row {
 
 /// Configuration for an object storage
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "kind", content = "config")]
 pub enum ObjectStoreConfig {
     #[serde(rename = "s3", rename_all = "camelCase")]
     AmazonS3 {
@@ -72,11 +73,12 @@ pub enum ObjectStoreConfig {
         region: String,
     },
 
-    #[serde(rename = "gcp", rename_all = "camelCase")]
+    #[serde(rename = "gcs", rename_all = "camelCase")]
     GoogleCloudStorage {
         service_account_path: Option<String>,
         service_acccount_key: Option<String>,
         application_credentials_path: Option<String>,
+        bucket: String,
     },
 }
 

src-tauri/src/common.rs

@@ -2,12 +2,12 @@ use std::sync::{Arc, Mutex};
 
 use anyhow::Context;
 use datafusion::{
-    common::{DataFusionError, sql_datafusion_err},
+    common::{sql_datafusion_err, DataFusionError},
     logical_expr::{DdlStatement, LogicalPlan},
     prelude::*,
     sql::{parser::Statement, sqlparser::parser::ParserError, TableReference},
 };
-use object_store::{aws::AmazonS3Builder, ObjectStore};
+use object_store::{aws::AmazonS3Builder, gcp::GoogleCloudStorageBuilder, ObjectStore};
 use tokio::sync::mpsc;
 use url::Url;
 
@@ -59,9 +59,10 @@ fn unescape(input: &str) -> datafusion::error::Result<String> {
                     't' => '\t',
                     '\\' => '\\',
                     _ => {
-                        return Err(sql_datafusion_err!(ParserError::TokenizerError(
-                            format!("unsupported escape char: '\\{}'", next_char)
-                        )))
+                        return Err(sql_datafusion_err!(ParserError::TokenizerError(format!(
+                            "unsupported escape char: '\\{}'",
+                            next_char
+                        ))))
                     }
                 });
             }
@@ -214,7 +215,7 @@ impl Lens {
     }
 
     fn create_object_store(config: &ObjectStoreConfig) -> LensResult<Arc<dyn ObjectStore>> {
-        Ok(Arc::new(match config {
+        Ok(match &config {
             ObjectStoreConfig::AmazonS3 {
                 access_key_id,
                 secret_access_key,
@@ -235,13 +236,30 @@ impl Lens {
                     builder = builder.with_bucket_name(bucket);
                 }
 
-                builder.build()?
+                Arc::new(builder.build()?)
             }
             ObjectStoreConfig::GoogleCloudStorage {
                 service_account_path,
                 service_acccount_key,
                 application_credentials_path,
-            } => todo!(),
-        }))
+                bucket,
+            } => {
+                let mut builder = GoogleCloudStorageBuilder::from_env().with_bucket_name(bucket);
+
+                if let Some(service_account_path) = service_account_path {
+                    builder = builder.with_service_account_path(service_account_path);
+                }
+
+                if let Some(service_acccount_key) = service_acccount_key {
+                    builder = builder.with_service_account_key(service_acccount_key);
+                }
+
+                if let Some(application_credentials_path) = application_credentials_path {
+                    builder = builder.with_application_credentials(application_credentials_path);
+                }
+
+                Arc::new(builder.build()?)
+            }
+        })
     }
 }

src-tauri/src/lens.rs

@@ -12,7 +12,7 @@ use datafusion::{
     common::{project_schema, Constraints},
     datasource::{TableProvider, TableType},
     error::{DataFusionError, Result},
-    execution::{context::SessionState, SendableRecordBatchStream, TaskContext},
+    execution::{SendableRecordBatchStream, TaskContext},
     physical_expr::EquivalenceProperties,
     physical_plan::{
         memory::MemoryStream, DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan,

src-tauri/src/query/memtable.rs

@@ -7,14 +7,17 @@
   },
   "package": {
     "productName": "lens",
-    "version": "0.1.0"
+    "version": "0.2.2"
   },
   "tauri": {
     "allowlist": {
       "all": false,
       "dialog": {
         "open": true,
         "save": true
+      },
+      "shell": {
+        "open": true
       }
     },
     "bundle": {
@@ -66,7 +69,8 @@
         "height": 600,
         "resizable": true,
         "title": "lens",
-        "width": 800
+        "width": 800,
+        "maximized": true
       }
     ]
   }