some fixes

caretdev · Jul 6, 2024 · a6eb2d2 · a6eb2d2
1 parent 116201d
commit a6eb2d2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -99,7 +99,7 @@ jobs:
           -a 'iris session iris -U %SYS "##class(Security.Users).UnExpireUserPasswords(\"*\")"'
       - name: Run Tests
         run: |
-          tox -e py38-iris,py39-iris,py310-iris,py311-iris
+          tox -e py38-iris,py39-iris,py310-iris,py311-iris -- --container containers.intersystems.com/intersystems/iris-community:latest
 
   build:
     needs:

diff --git a/dbt/include/iris/macros/apply_grants.sql b/dbt/include/iris/macros/apply_grants.sql
@@ -15,20 +15,20 @@
 {% macro iris__get_show_grant_sql(relation) %}
   select grantee,privilege_type
   from (
-    select 
-      r.ROLE_NAME grantee, 
+    select
+      r.ROLE_NAME grantee,
       pr.granted_by grantor,
       pr.PRIVILEGE privilege_type,
-      $Piece(pr.NAME, '.', 1) table_schema, 
-      $Piece(pr.NAME, '.', 2) table_name 
+      $Piece(pr.NAME, '.', 1) table_schema,
+      $Piece(pr.NAME, '.', 2) table_name
     from %SQL_Manager.Roles() r, %SQL_Manager.RolePrivileges(r.ROLE_NAME) pr
     union all
-    select 
-      u.USERNAME grantee, 
+    select
+      u.USERNAME grantee,
       pu.granted_by grantor,
       pu.PRIVILEGE privilege_type,
-      $Piece(pu.NAME, '.', 1) table_schema, 
-      $Piece(pu.NAME, '.', 2) table_name 
+      $Piece(pu.NAME, '.', 1) table_schema,
+      $Piece(pu.NAME, '.', 2) table_name
     from %SQL_Manager.Users() r, %SQL_Manager.UserPrivs(u.USERNAME) pu
   ) where grantor = $username
       and grantee != $username

diff --git a/dbt/include/iris/macros/materializations/view.sql b/dbt/include/iris/macros/materializations/view.sql
@@ -1,4 +1,4 @@
-{# 
+{#
 
 {% materialization view, adapter='iris' -%}
     -- grab current tables grants config for comparision later on

diff --git a/dbt/include/iris/macros/relations/view/replace.sql b/dbt/include/iris/macros/relations/view/replace.sql
@@ -36,4 +36,4 @@
 
   {{ return({'relations': [target_relation]}) }}
 
-{% endmacro %}
+{% endmacro %}
diff --git a/tests/functional/test_analyses.py b/tests/functional/test_analyses.py
@@ -67,8 +67,6 @@ def test_iris_analyses(self, project):
         assert os.path.exists(path_1)
         assert os.path.exists(path_2)
 
-        expected_sql = 'select * from "{}"."my_model"'.format(
-            project.test_schema
-        )
+        expected_sql = 'select * from "{}"."my_model"'.format(project.test_schema)
         self.assert_contents_equal(path_1, expected_sql)
         self.assert_contents_equal(path_2, "{% invalid jinja stuff %}")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,4 @@

		{{ return({'relations': [target_relation]}) }}

		{% endmacro %}
		{% endmacro %}