chore: fix error expression

ash-project · Dec 15, 2023 · ac980a2 · ac980a2
1 parent 407a716
commit ac980a2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/lib/expr.ex b/lib/expr.ex
@@ -12,12 +12,12 @@ defmodule AshPostgres.Expr do
     Contains,
     DateAdd,
     DateTimeAdd,
+    Error,
     FromNow,
     GetPath,
     If,
     Length,
     Now,
-    Error,
     StringJoin,
     StringSplit,
     Today,

diff --git a/lib/migration_generator/ash_functions.ex b/lib/migration_generator/ash_functions.ex
@@ -147,7 +147,7 @@ defmodule AshPostgres.MigrationGenerator.AshFunctions do
     \"\"\")
 
     execute(\"\"\"
-    CREATE OR REPLACE FUNCTION ash_raise_error(json_data json, type_signal ANYCOMPATIBLE)
+    CREATE OR REPLACE FUNCTION ash_raise_error(json_data jsonb, type_signal ANYCOMPATIBLE)
     RETURNS ANYCOMPATIBLE AS $$
     BEGIN
         -- Raise an error with the provided JSON data.

diff --git a/priv/test_repo/migrations/20231214220937_install_ash-functions_extension_2.exs b/priv/test_repo/migrations/20231214220937_install_ash-functions_extension_2.exs
@@ -21,7 +21,7 @@ defmodule AshPostgres.TestRepo.Migrations.InstallAshFunctionsExtension2 do
     """)
 
     execute("""
-    CREATE OR REPLACE FUNCTION ash_raise_error(json_data json, type_signal ANYCOMPATIBLE)
+    CREATE OR REPLACE FUNCTION ash_raise_error(json_data jsonb, type_signal ANYCOMPATIBLE)
     RETURNS ANYCOMPATIBLE AS $$
     BEGIN
         -- Raise an error with the provided JSON data.
@@ -40,4 +40,4 @@ defmodule AshPostgres.TestRepo.Migrations.InstallAshFunctionsExtension2 do
       "DROP FUNCTION IF EXISTS ash_raise_error(jsonb), ash_raise_error(jsonb, ANYCOMPATIBLE)"
     )
   end
-end
+end
diff --git a/test/error_expr_test.ex → test/error_expr_test.exs b/test/error_expr_test.ex → test/error_expr_test.exs
@@ -1,6 +1,6 @@
 defmodule AshPostgres.ErrorExprTest do
   use AshPostgres.RepoCase, async: false
-  alias AshPostgres.Test.{Api, Author, Comment, Post}
+  alias AshPostgres.Test.{Api, Post}
 
   require Ash.Query
   import Ash.Expr

diff --git a/test_snapshot_path/extensions.json b/test_snapshot_path/extensions.json
@@ -1,10 +1,10 @@
 {
-  "ash_functions_version": 1,
   "installed": [
     "ash-functions",
     "uuid-ossp",
     "pg_trgm",
     "citext",
     "demo-functions_v1"
-  ]
+  ],
+  "ash_functions_version": 2
 }