Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support for Erlang R19 #105

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

support for Erlang R19 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bc3c758
support for Erlang R19
eryx67 Mar 21, 2017
a56a0e8
support for Erlang R19
eryx67 Mar 21, 2017
26ba58e
Merge branch 'master' of https://github.com/eryx67/sqerl
eryx67 Mar 22, 2017
5688e0c
Merge branch 'master' of https://github.com/eryx67/sqerl
eryx67 Mar 22, 2017
ff5f384
Merge branch 'master' of https://github.com/eryx67/sqerl
eryx67 Mar 22, 2017
a68e9e1
Merge branch 'master' of https://github.com/eryx67/sqerl
eryx67 Mar 22, 2017
6e6122e
Merge branch 'master' of https://github.com/eryx67/sqerl
eryx67 Mar 22, 2017
fdd5f44
add explicit connection arg to functions to make transactions possible
eryx67 Apr 12, 2017
fae948c
change deps urls
eryx67 Jul 26, 2017
28414fa
Merge remote-tracking branch 'origin/master' into changes
eryx67 Jun 27, 2018
2a2adfe
upgrade to latest epgsql, pooler and rebar3, support OTP 21
eryx67 Jun 27, 2018
fb41a75
changes for latest epgsql
eryx67 Jun 28, 2018
b76448e
shutdown
eryx67 Jun 28, 2018
4c7cd2d
shutdown on operation timeout
eryx67 Jun 28, 2018
a98f916
fix for epgsql, allow multiple pools with with_db/3
eryx67 Jun 29, 2018
effcab1
merge origin
eryx67 Apr 25, 2019
7d507ce
sync with origin
eryx67 Apr 25, 2019
6278892
SQL name could have dots in it
eryx67 Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
language: erlang

otp_release:
- 17.0
- R16B03-1
- R16B03
- R16B02
- R16B01
- 21.0
- 19.3
- 18.3
- 17.0 # 17.5 concrete PLT has some issues; dig into them

addons:
postgresql: "9.3"
Expand Down
6 changes: 6 additions & 0 deletions include/sqerl.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@

-define(FIRST(Record), {first_as_record, [Record, record_info(fields, Record)]}).

-ifdef(fun_stacktrace).
-define(GET_STACKTRACE, erlang:get_stacktrace()).
-else.
-define(GET_STACKTRACE, try throw(fake_stacktrace) catch _:_:S -> S end).
-endif.

-type sqerl_error() :: {error, term()} |
{conflict, term()} |
{foreign_key, term()}.
Expand Down
22 changes: 8 additions & 14 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,19 @@
%% R16.
{erl_opts,
[{platform_define, "^[0-9]+", namespaced_types},
debug_info,
warnings_as_errors]}.
{platform_define, "^(19|[2-9])+", typed_records},
{platform_define, "^(R|1|20)", fun_stacktrace},
debug_info
%% warnings_as_errors
]}.

{erl_first_files, ["src/sqerl_client.erl"]}.

{deps, [
%% This is until a patch of ours gets merged into the main epgsql repo
{epgsql, ".*",
{git, "git://github.com/chef/epgsql-1.git", {branch, "master"}}},

{pooler, ".*",
{git, "git://github.com/seth/pooler.git", {tag, "1.5.0"}}},

{envy, ".*",
{git, "git://github.com/manderson26/envy.git", {branch, "master"}}}
{deps, [epgsql,
{pooler, "1.5.3"},
{envy, {git, "git://github.com/manderson26/envy.git", {branch, "master"}}}
]}.

{dev_only_deps, []}.

{cover_enabled, true}.

%% Common Test (ct) ============================================================
Expand Down
97 changes: 0 additions & 97 deletions rebar.config.script
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions rebar.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{"1.1.0",
[{<<"envy">>,
{git,"git://github.com/manderson26/envy.git",
{ref,"0148fb4b7ed0e188511578e98b42d6e7dde0ebd1"}},
0},
{<<"epgsql">>,{pkg,<<"epgsql">>,<<"4.2.1">>},0},
{<<"pooler">>,{pkg,<<"pooler">>,<<"1.5.3">>},0}]}.
[
{pkg_hash,[
{<<"epgsql">>, <<"5B8A6C4EA3AE981E946798BE388D29434B0AC857E8B4B1E4CCB9ED726345D54B">>},
{<<"pooler">>, <<"898CD1FA301FC42D4A8ED598CE139B71CA85B54C16AB161152B5CC5FBDCFA1A8">>}]}
].