add version core function (#326)

* add version core function
CartoDB · Sep 22, 2022 · eff897d · eff897d
1 parent 8c96677
commit eff897d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/clouds/databricks/CHANGELOG.md b/clouds/databricks/CHANGELOG.md
@@ -6,16 +6,26 @@ All notable changes to this project will be documented in this file.
 
 The format is inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [2022.09.20] - 2022-09-21
+## [2022.09.21] - 2022-09-21
+
+### All modules
+
+#### Added
+
+- Add VERSION_CORE function
 
 ### Accessors
+
 #### Changed
+
 - Change type returned by ST_X and ST_Y to Double
 
 ## [2022.09.20] - 2022-09-20
 
 ### All modules
+
 #### Changed
+
 - Set default compression codec to snappy
 
 ## [2022.09.16] - 2022-09-16

diff --git a/clouds/databricks/common/python_utils/create_drop_functions.py b/clouds/databricks/common/python_utils/create_drop_functions.py
@@ -24,6 +24,8 @@ def write_queries(final_query):
 if __name__ == '__main__':
     sql_path = os.path.join(python_util_path, '..', '..', 'modules', 'sql')
     modules = os.listdir(sql_path)
+    # We filter paths that aren't a directory
+    modules = list(filter(lambda x: os.path.isdir(os.path.join(sql_path, x)), modules))
     queries_list = []
     for module in modules:
         module_path = os.path.join(sql_path, module)

diff --git a/clouds/databricks/libraries/scala/build.sbt b/clouds/databricks/libraries/scala/build.sbt
@@ -113,6 +113,10 @@ lazy val core = project
   .dependsOn(jts)
   .settings(commonSettings)
   .settings(name := "core")
+  .enablePlugins(BuildInfoPlugin)
+  .settings(
+    buildInfoKeys    := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion)
+  )
   .settings(
     libraryDependencies ++= Seq(
       "com.azavea"               %% "hiveless-core"     % hivelessVersion,

diff --git a/clouds/databricks/libraries/scala/core/src/main/resources/sql/createUDFs.sql b/clouds/databricks/libraries/scala/core/src/main/resources/sql/createUDFs.sql
@@ -91,4 +91,8 @@ CREATE OR REPLACE FUNCTION ST_EXTENTTOGEOM as 'com.carto.analyticstoolbox.module
 CREATE OR REPLACE FUNCTION ST_GEOMREPROJECT as 'com.carto.analyticstoolbox.modules.index.ST_GeomReproject';
 CREATE OR REPLACE FUNCTION ST_MAKEEXTENT as 'com.carto.analyticstoolbox.modules.index.ST_MakeExtent';
 CREATE OR REPLACE FUNCTION ST_PARTITIONCENTROID as 'com.carto.analyticstoolbox.modules.index.ST_PartitionCentroid';
-CREATE OR REPLACE FUNCTION ST_Z2LATLON as 'com.carto.analyticstoolbox.modules.index.ST_Z2LatLon';
+CREATE OR REPLACE FUNCTION ST_Z2LATLON as 'com.carto.analyticstoolbox.modules.index.ST_Z2LatLon';
+-- Product
+CREATE OR REPLACE FUNCTION VERSION_CORE()
+    RETURNS STRING
+    RETURN '2022.09.21';
diff --git a/clouds/databricks/libraries/scala/project/plugins.sbt b/clouds/databricks/libraries/scala/project/plugins.sbt
@@ -4,4 +4,4 @@ addSbtPlugin("org.scalameta"     % "sbt-scalafmt"   % "2.4.3")
 addSbtPlugin("com.github.sbt"    % "sbt-ci-release" % "1.5.10")
 addSbtPlugin("com.eed3si9n"      % "sbt-assembly"   % "1.2.0")
 addSbtPlugin("ch.epfl.scala"     % "sbt-scalafix"   % "0.10.1")
-
+addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"  % "0.11.0")
diff --git a/clouds/databricks/modules/sql/.sqlfluffignore b/clouds/databricks/modules/sql/.sqlfluffignore
@@ -0,0 +1 @@
+VERSION_CORE.sql
diff --git a/clouds/databricks/modules/sql/product/VERSION_CORE.sql b/clouds/databricks/modules/sql/product/VERSION_CORE.sql
@@ -0,0 +1,3 @@
+CREATE OR REPLACE FUNCTION VERSION_CORE()
+    RETURNS STRING
+    RETURN '2022.09.21';