From 70cf03660f82a438c6eb7fa8d9d5f47ca93155e5 Mon Sep 17 00:00:00 2001 From: Bruce Colby Date: Mon, 19 Aug 2024 15:34:42 -0400 Subject: [PATCH] Revert "Merge pull request #81 from pepsico-ecommerce/bc/dependency-fixes" This reverts commit 77a50be2795961b22524aa4735e872a62a8fad45, reversing changes made to b6eb28cc3578c5f9b2875e91315d9064d0f88e19. --- lib/snowflex/ecto/connection.ex | 4 ++-- lib/snowflex/migration_generator.ex | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/snowflex/ecto/connection.ex b/lib/snowflex/ecto/connection.ex index 965898b..c30742f 100644 --- a/lib/snowflex/ecto/connection.ex +++ b/lib/snowflex/ecto/connection.ex @@ -253,7 +253,7 @@ defmodule Snowflex.EctoAdapter.Connection do defp insert_all_value(nil), do: "DEFAULT" defp insert_all_value({%Ecto.Query{} = query, _params_counter}), do: [?(, all(query), ?)] - defp insert_all_value(_), do: "?" + defp insert_all_value(_), do: '?' @impl true def update(prefix, table, fields, filters, _returning) do @@ -598,7 +598,7 @@ defmodule Snowflex.EctoAdapter.Connection do end defp expr({:^, [], [_ix]}, _sources, _query) do - "?" + '?' end defp expr({{:., _, [{:parent_as, _, [as]}, field]}, _, []}, _sources, query) diff --git a/lib/snowflex/migration_generator.ex b/lib/snowflex/migration_generator.ex index 0076aec..af1523f 100644 --- a/lib/snowflex/migration_generator.ex +++ b/lib/snowflex/migration_generator.ex @@ -22,12 +22,15 @@ defmodule Snowflex.MigrationGenerator do create table(@source, primary_key: false) do for {name, type} <- @fields do - field_type = Ecto.Type.type(type) + field_type = ecto_type_to_db_type(type) field_source = name add(field_source, type, primary_key: name in primary_keys) end end end + + defp ecto_type_to_db_type({:parameterized, Ecto.Enum, _}), do: :string + defp ecto_type_to_db_type(any), do: any end Ecto.Migrator.up( @@ -52,13 +55,16 @@ defmodule Snowflex.MigrationGenerator do type = :type |> @module.__schema__(field) - |> Ecto.Type.type() + |> ecto_type_to_db_type() field_source = @module.__schema__(:field_source, field) add(field_source, type, primary_key: field in primary_keys) end end end + + defp ecto_type_to_db_type({:parameterized, Ecto.Enum, _}), do: :string + defp ecto_type_to_db_type(any), do: any end Ecto.Migrator.up(