Skip to content

Commit 74439d5

Browse files
committed
chore: temporarily use main of ash_sql
1 parent 77a75fa commit 74439d5

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

mix.exs

+16-15
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ defmodule AshPostgres.MixProject do
167167
defp deps do
168168
[
169169
{:ash, ash_version("~> 3.4 and >= 3.4.69")},
170-
{:ash_sql, ash_sql_version("~> 0.2 and >= 0.2.68")},
170+
# {:ash_sql, ash_sql_version("~> 0.2 and >= 0.2.68")},
171+
{:ash_sql, github: "ash-project/ash_sql"},
171172
{:igniter, "~> 0.5 and >= 0.5.16", optional: true},
172173
{:ecto_sql, "~> 3.12"},
173174
{:ecto, "~> 3.12 and >= 3.12.1"},
@@ -208,24 +209,24 @@ defmodule AshPostgres.MixProject do
208209
end
209210
end
210211

211-
defp ash_sql_version(default_version) do
212-
case System.get_env("ASH_SQL_VERSION") do
213-
nil ->
214-
default_version
212+
# defp ash_sql_version(default_version) do
213+
# case System.get_env("ASH_SQL_VERSION") do
214+
# nil ->
215+
# default_version
215216

216-
"local" ->
217-
[path: "../ash_sql", override: true]
217+
# "local" ->
218+
# [path: "../ash_sql", override: true]
218219

219-
"main" ->
220-
[git: "https://github.com/ash-project/ash_sql.git"]
220+
# "main" ->
221+
# [git: "https://github.com/ash-project/ash_sql.git"]
221222

222-
version when is_binary(version) ->
223-
"~> #{version}"
223+
# version when is_binary(version) ->
224+
# "~> #{version}"
224225

225-
version ->
226-
version
227-
end
228-
end
226+
# version ->
227+
# version
228+
# end
229+
# end
229230

230231
defp aliases do
231232
[

mix.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{
22
"ash": {:hex, :ash, "3.5.6", "2f187150110b4c280c8551ad411f56d95862fcb37c067a0b8b94eb682bcc43e8", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.24 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:owl, "~> 0.11", [hex: :owl, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 0.11", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, ">= 0.2.6 and < 1.0.0-0", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d0d9aeb5aacfdc12253fae1e7e4720991868c5f69632c2766afb03b2b1830f55"},
3-
"ash_sql": {:hex, :ash_sql, "0.2.71", "40cabdd0c7af2eaa0096b2b0eae886085fed1e3b326e20434274120e11dec2c5", [:mix], [{:ash, "~> 3.5", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "6e22da3d020aecaca9858f430828c12988c3418d252fa39be3f43fde9fd4224d"},
43
"benchee": {:hex, :benchee, "1.4.0", "9f1f96a30ac80bab94faad644b39a9031d5632e517416a8ab0a6b0ac4df124ce", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "299cd10dd8ce51c9ea3ddb74bb150f93d25e968f93e4c1fa31698a8e4fa5d715"},
4+
"ash_sql": {:git, "https://github.com/ash-project/ash_sql.git", "91d990700d18055759004a60cc35f3074da3d1a9", []},
55
"bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
66
"credo": {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
77
"db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"},

test/support/resources/post.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ defmodule AshPostgres.Test.Post do
862862
calculate(
863863
:start_of_day,
864864
:datetime,
865-
expr(start_of_day(fragment("now() AT TIME ZONE 'UTC'"), "EST"))
865+
expr(start_of_day(fragment("now()"), "EST"))
866866
)
867867

868868
calculate(:author_count_of_posts, :integer, expr(author.count_of_posts_with_calc))

0 commit comments

Comments
 (0)