@@ -1691,7 +1691,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
1691
1691
check = Keyword . get ( opts , :check )
1692
1692
1693
1693
[
1694
- default_expr ( default , type ) ,
1694
+ default_expr ( default ) ,
1695
1695
null_expr ( null ) ,
1696
1696
collate_expr ( collate ) ,
1697
1697
check_expr ( check ) ,
@@ -1715,48 +1715,30 @@ defmodule Ecto.Adapters.SQLite3.Connection do
1715
1715
defp null_expr ( true ) , do: " NULL"
1716
1716
defp null_expr ( _ ) , do: [ ]
1717
1717
1718
- defp default_expr ( { :ok , nil } , _type ) do
1718
+ defp default_expr ( { :ok , nil } ) do
1719
1719
" DEFAULT NULL"
1720
1720
end
1721
1721
1722
- defp default_expr ( { :ok , literal } , _type ) when is_binary ( literal ) do
1723
- [
1724
- " DEFAULT '" ,
1725
- escape_string ( literal ) ,
1726
- ?'
1727
- ]
1722
+ defp default_expr ( { :ok , literal } ) when is_binary ( literal ) do
1723
+ [ " DEFAULT '" , escape_string ( literal ) , ?' ]
1728
1724
end
1729
1725
1730
- defp default_expr ( { :ok , literal } , _type )
1731
- when is_number ( literal ) or is_boolean ( literal ) do
1732
- [
1733
- " DEFAULT " ,
1734
- to_string ( literal )
1735
- ]
1726
+ defp default_expr ( { :ok , literal } ) when is_number ( literal ) or is_boolean ( literal ) do
1727
+ [ " DEFAULT " , to_string ( literal ) ]
1736
1728
end
1737
1729
1738
- defp default_expr ( { :ok , { :fragment , expression } } , _type ) do
1739
- [
1740
- " DEFAULT " ,
1741
- expression
1742
- ]
1730
+ defp default_expr ( { :ok , { :fragment , expression } } ) do
1731
+ [ " DEFAULT " , expression ]
1743
1732
end
1744
1733
1745
- defp default_expr ( { :ok , value } , _type ) when is_map ( value ) or is_list ( value ) do
1734
+ defp default_expr ( { :ok , value } ) when is_map ( value ) or is_list ( value ) do
1746
1735
library = Application . get_env ( :ecto_sqlite3 , :json_library , Jason )
1747
1736
expression = IO . iodata_to_binary ( library . encode_to_iodata! ( value ) )
1748
1737
1749
- [
1750
- " DEFAULT " ,
1751
- ?( ,
1752
- ?' ,
1753
- escape_string ( expression ) ,
1754
- ?' ,
1755
- ?)
1756
- ]
1738
+ [ " DEFAULT ('" , escape_string ( expression ) , "')" ]
1757
1739
end
1758
1740
1759
- defp default_expr ( :error , _type ) , do: [ ]
1741
+ defp default_expr ( :error ) , do: [ ]
1760
1742
1761
1743
defp index_expr ( literal ) when is_binary ( literal ) , do: literal
1762
1744
defp index_expr ( literal ) , do: quote_name ( literal )
0 commit comments