diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 0867800..6288c27 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -60,7 +60,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: "16" + node-version: "18" cache: "yarn" - name: Get M2 cache @@ -71,16 +71,6 @@ jobs: ~/.gitlibs key: ${{ runner.os }}-databend-${{ hashFiles('**/deps.edn') }} - - name: Prepare stuff for pulses - run: yarn build-static-viz - - # Use custom deps.edn containing "user/databend" alias to include driver sources - - name: Run tests - run: | - mkdir -p /home/runner/.config/clojure - cat modules/drivers/databend/.github/deps.edn | sed -e "s|PWD|$PWD|g" > /home/runner/.config/clojure/deps.edn - DRIVERS=databend clojure -X:dev:drivers:drivers-dev:test:user/databend - - name: Build databend driver run: | echo "{:deps {metabase/databend {:local/root \"databend\" }}}" > modules/drivers/deps.edn diff --git a/.gitignore b/.gitignore index 113fffd..f4fa461 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ \#*\# -.\#* -.idea plugins -metabase.db.* +repo +metabase.db* +.idea +.\#* /target *.jar *.class diff --git a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.md5 b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.md5 index 6da2d5a..b9d9a81 100644 --- a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.md5 +++ b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.md5 @@ -1 +1 @@ -7cf1e2260ce733914fbda4eb03de5aaf \ No newline at end of file +facc82a7ece33f0903c83309027ff14c \ No newline at end of file diff --git a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.sha1 b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.sha1 index 86b3438..5be66c1 100644 --- a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.sha1 +++ b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.jar.sha1 @@ -1 +1 @@ -fb5bbe297ad514f9e4e872fa38f90841c233a0da \ No newline at end of file +61e87dcad4d9b35cdfb8081ed236b6928bfda75b \ No newline at end of file diff --git a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom index 203dce8..96c7045 100644 --- a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom +++ b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom @@ -1,8 +1,75 @@ - - + 4.0.0 - com.databend - metabase-core - 1.40 + amalloy + ring-buffer + jar + 1.3.1 + ring-buffer + Persistent bounded-size queue implementation in Clojure + https://github.com/clj-commons/ring-buffer + + + Eclipse Public License + http://www.eclipse.org/legal/epl-v10.html + + + + ef3635c71182eac1b6ecfa216c14adf90fabd28e + + + src + test + + + resources + + + + + resources + + + target + target/classes + + + + + central + https://repo1.maven.org/maven2/ + + false + + + true + + + + clojars + https://repo.clojars.org/ + + true + + + true + + + + + + + + + org.clojure + clojure + 1.10.1 + provided + + + org.clojure + clojurescript + 1.10.520 + provided + + diff --git a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.md5 b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.md5 index 27a5d4a..72e3845 100644 --- a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.md5 +++ b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.md5 @@ -1 +1 @@ -fd42f6157d0eef990d739f21e25520a8 \ No newline at end of file +419561bf2a35cfa4ece195698b6a6640 \ No newline at end of file diff --git a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.sha1 b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.sha1 index b1e06ae..bd7ef01 100644 --- a/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.sha1 +++ b/repo/com/databend/metabase-core/1.40/metabase-core-1.40.pom.sha1 @@ -1 +1 @@ -e75e0dc9140e2eb7c1af88ece3a7fecd714767a2 \ No newline at end of file +8a10de8a144faafe7dd71decc36e0a2d9dc7af2e \ No newline at end of file diff --git a/repo/com/databend/metabase-core/maven-metadata.xml b/repo/com/databend/metabase-core/maven-metadata.xml index cd4a78f..e73d0cf 100644 --- a/repo/com/databend/metabase-core/maven-metadata.xml +++ b/repo/com/databend/metabase-core/maven-metadata.xml @@ -7,6 +7,6 @@ 1.40 - 20230317023827 + 20231014034123 diff --git a/repo/com/databend/metabase-core/maven-metadata.xml.md5 b/repo/com/databend/metabase-core/maven-metadata.xml.md5 index 00323bc..86a88da 100644 --- a/repo/com/databend/metabase-core/maven-metadata.xml.md5 +++ b/repo/com/databend/metabase-core/maven-metadata.xml.md5 @@ -1 +1 @@ -371ea870234aedbcf314c6e94e149d12 \ No newline at end of file +9ca143d9e2fde3541005a0b7674e2a6d \ No newline at end of file diff --git a/repo/com/databend/metabase-core/maven-metadata.xml.sha1 b/repo/com/databend/metabase-core/maven-metadata.xml.sha1 index e1b8bfc..3d84bd0 100644 --- a/repo/com/databend/metabase-core/maven-metadata.xml.sha1 +++ b/repo/com/databend/metabase-core/maven-metadata.xml.sha1 @@ -1 +1 @@ -d46595bf4e0f766300336b800696734d2957d77c \ No newline at end of file +6e8ca1750860443ccaac7b8a0006d79615f889ce \ No newline at end of file diff --git a/src/metabase/driver/databend.clj b/src/metabase/driver/databend.clj index 53a7c0d..dd7ccdc 100644 --- a/src/metabase/driver/databend.clj +++ b/src/metabase/driver/databend.clj @@ -10,8 +10,6 @@ [metabase [config :as config] [driver :as driver] [util :as u]] [metabase.driver.ddl.interface :as ddl.i] [metabase.driver.sql.util :as sql.u] - [metabase.driver - [common :as driver.common]] [metabase.driver.sql-jdbc [common :as sql-jdbc.common] [connection :as sql-jdbc.conn] [execute :as sql-jdbc.execute] [sync :as sql-jdbc.sync]] @@ -184,10 +182,6 @@ updated-field)] (merge table-metadata {:fields (set filtered-fields)}))) -; Return a native query that will fetch the current time -(defmethod driver.common/current-db-time-native-query :databend [_] - "SELECT CAST(CAST(NOW() AS TIMESTAMP) AS VARCHAR(24))") - (defn- to-start-of-year [expr] (hsql/call :to_start_of_year (hsql/call :TO_DATETIME expr))) @@ -425,4 +419,4 @@ (defmethod driver/db-start-of-week :databend [_] :monday) (defmethod ddl.i/format-name :databend [_ table-or-field-name] - (u/->snake_case_en table-or-field-name)) + (str/replace table-or-field-name #"-" "_"))