findmypast-oss · whossname · Aug 4, 2019 · Aug 4, 2019 · Aug 4, 2019 · Aug 4, 2019
diff --git a/.formatter.exs b/.formatter.exs
@@ -1,5 +1,4 @@
 # Used by "mix format"
 [
-  inputs: [".formatter.exs", "mix.exs", "{config,lib,test}/**/*.{ex,exs}"],
-  line_length: 80
+  inputs: [".formatter.exs", "mix.exs", "{config,lib,test}/**/*.{ex,exs}"]
 ]
diff --git a/.gitignore b/.gitignore
@@ -135,3 +135,4 @@ $RECYCLE.BIN/
 
 
 # End of https://www.gitignore.io/api/vim,linux,emacs,elixir,windows,visualstudiocode
+tmp
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,18 @@ sudo: required
 
 language: elixir
 elixir:
-  - 1.6.5
+  - 1.8
+otp_release: 
+  - 20.0
 
 services:
   - docker
 
 install:
-  - docker-compose build
+  - docker-compose build mssql_ecto
 
 script:
+  - docker-compose run mssql_ecto mix format --check-formatted
   - docker-compose run mssql_ecto mix compile --warnings-as-errors
   - docker-compose run mssql_ecto mix coveralls.travis
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM elixir:1.6.5-slim
+FROM elixir:1.8.2-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -19,7 +19,7 @@ ENV LC_ALL en_US.UTF-8
 # --- MSSQL ODBC INSTALL ---
 
 RUN apt-get update && \
-    apt-get -y install curl apt-transport-https gnupg2 && \
+    apt-get -y install git curl apt-transport-https gnupg2 && \
     curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
     curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
     apt-get update && \
@@ -36,4 +36,4 @@ RUN mix do deps.get, deps.compile
 
 # --- Be able to run wait for it script ---
 
-RUN chmod +x /usr/src/app/wait-for-it.sh
+RUN chmod +x /usr/src/app/bash_scripts/wait-for-it.sh
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Inline docs](http://inch-ci.org/github/findmypast-oss/mssql_ecto.svg?branch=master)](http://inch-ci.org/github/findmypast-oss/mssql_ecto)
 [![Ebert](https://ebertapp.io/github/findmypast-oss/mssql_ecto.svg)](https://ebertapp.io/github/findmypast-oss/mssql_ecto)
 [![Hex.pm](https://img.shields.io/hexpm/v/mssql_ecto.svg)](https://hex.pm/packages/mssql_ecto)
-[![LICENSE](https://img.shields.io/hexpm/l/mssql_ecto.svg)](https://github.com/findmypast-oss/mssql_ecto/blob/master/LICENSE)
+[![LICENSE](https://img.shields.io/hexpm/l/mssql_ecto.svg)](https://github.com/findmypast-oss/mssql_ecto/blob/master/docs/LICENSE)
 
 [Ecto](https://github.com/elixir-ecto/ecto) Adapter for
 [Mssqlex](https://github.com/findmypast-oss/mssqlex)
@@ -29,52 +29,13 @@ or
 [other platforms](https://docs.microsoft.com/en-us/sql/connect/odbc/microsoft-odbc-driver-for-sql-server)
 on the official site.
 
-### Hex
+### Mix
 
-#### With [Application Inference](https://elixir-lang.org/blog/2017/01/05/elixir-v1-4-0-released/#application-inference)
-
-If you are using
-[application inference](https://elixir-lang.org/blog/2017/01/05/elixir-v1-4-0-released/#application-inference),
-i.e. `application` in your `mix.exs` looks something like this:
-
-```elixir
-def application do
-  [extra_applications: [:logger]]
-end
-```
-
-Note, the lack of `:applications` key. Then, you just need to add the following
-dependencies:
+Add the following to your mix file:
 
 ```elixir
 def deps do
-  [{:mssql_ecto, "~> 1.2.0"},
-   {:mssqlex, "~> 1.1.0"}]
-end
-```
-
-#### Without [Application Inference](https://elixir-lang.org/blog/2017/01/05/elixir-v1-4-0-released/#application-inference)
-
-If you are explicitly calling out all running applications under `application`
-in your `mix.exs`, i.e. it looks something like this:
-
-```elixir
-def application do
-  [applications: [:logger, :plug, :postgrex]]
-end
-```
-
-Then, you need to add `mssql_ecto` and `mssqlex` to both your `deps` and list of
-running applications:
-
-```elixir
-def application do
-  [applications: [:logger, :plug, :mssqlex, :mssql_ecto]]
-end
-
-def deps do
-  [{:mssql_ecto, "~> 1.2.0"},
-   {:mssqlex, "~> 1.1.0"}]
+  [{:mssql_ecto, "~> 2.0.0-beta.0"}]
 end
 ```
 
@@ -97,30 +58,32 @@ config :my_app, MyApp.Repo,
 
 An example project using mssql_ecto with Docker has kindly been created by
 [Chase Pursłey](https://github.com/cpursley). It can be viewed
-[here](https://github.com/cpursley/mssql_ecto_friends).
+[here](https://github.com/whossname/mssql_ecto_friends).
 
 ## Type Mappings
 
-|    Ecto Type    |   SQL Server Type    |                                                                       Caveats                                                                        |
-| :-------------: | :------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------: |
-|       :id       |         int          |                                                                                                                                                      |
-|     :serial     |  int identity(1, 1)  |                                                                                                                                                      |
-|   :bigserial    | bigint identity(1,1) | When a query is returning this value with the `returning` syntax and no schema is used, it will be returned as a string rather than an integer value |
-|   :binary_id    |       char(36)       |                                                                                                                                                      |
-|      :uuid      |       char(36)       |                                                                                                                                                      |
-|     :string     |       nvarchar       |                                                                                                                                                      |
-|     :binary     |    nvarchar(4000)    |                                                         Limited size, not fully implemented                                                          |
-|    :integer     |         int          |                                                                                                                                                      |
-|    :boolean     |         bit          |                                                                                                                                                      |
-| {:array, type}  |     list of type     |                                                                    Not Supported                                                                     |
-|      :map       |    nvarchar(4000)    |                                                                    Not Supported                                                                     |
-|   {:map, \_}    |    nvarchar(4000)    |                                                                    Not Supported                                                                     |
-|      :date      |         date         |                                                                                                                                                      |
-|      :time      |         time         |                                                               Can write but can't read                                                               |
-|  :utc_datetime  |      datetime2       |                                                                                                                                                      |
-| :naive_datetime |      datetime2       |                                                                                                                                                      |
-|     :float      |        float         |                                                                                                                                                      |
-|    :decimal     |       decimal        |                                                                                                                                                      |
+### Needs testing/validation
+
+|    Ecto Type    |   SQL Server Type    |               Caveats               |
+| :-------------: | :------------------: | :---------------------------------: |
+|       :id       |         int          |                                     |
+|     :serial     |  int identity(1, 1)  |                                     |
+|   :bigserial    | bigint identity(1,1) |                                     |
+|   :binary_id    |       char(36)       |                                     |
+|      :uuid      |       char(36)       |                                     |
+|     :string     |       nvarchar       |                                     |
+|     :binary     |    nvarchar(4000)    | Limited size, not fully implemented |
+|    :integer     |         int          |                                     |
+|    :boolean     |         bit          |                                     |
+| {:array, type}  |     list of type     |            Not Supported            |
+|      :map       |    nvarchar(4000)    |            Not Supported            |
+|   {:map, \_}    |    nvarchar(4000)    |            Not Supported            |
+|      :date      |         date         |                                     |
+|      :time      |         time         |      Can write but can't read       |
+|  :utc_datetime  |      datetime2       |                                     |
+| :naive_datetime |      datetime2       |                                     |
+|     :float      |        float         |                                     |
+|    :decimal     |       decimal        |                                     |
 
 ## Features not yet implemented
 
@@ -129,11 +92,15 @@ An example project using mssql_ecto with Docker has kindly been created by
 - On conflict
 - Upserts
 
+## Known Issues
+
+See the the list of [known issues](https://github.com/findmypast-oss/mssqlex#known-issues).
+
 ## Contributing
 
-### Integration Test Setup
+### Test Setup
 
-Running the integration tests requires an instance of SQL Server running on
+Running the tests requires an instance of SQL Server running on
 `localhost` and certain configuration variables set as environment variables:
 
 - MSSQL_DVR should be set to the ODBC driver to be used. Usually
@@ -145,8 +112,11 @@ Running the integration tests requires an instance of SQL Server running on
 
 The tests will create a database named `mssql_ecto_integration_test`
 
+The script `/bash_scripts/setup_test_db.sh` starts a docker image that holds
+the test database.
+
 ### Code of Conduct
 
 This project had a
-[Code of Conduct](https://github.com/findmypast-oss/mssql_ecto/blob/master/CODE_OF_CONDUCT.md)
+[Code of Conduct](https://github.com/findmypast-oss/mssql_ecto/blob/master/docs/CODE_OF_CONDUCT.md)
 if you wish to contribute to this project, please abide by its rules.
diff --git a/bash_scripts/setup_test_db.sh b/bash_scripts/setup_test_db.sh
@@ -0,0 +1,6 @@
+export MSSQL_UID=sa
+export MSSQL_PWD='ThePa$$word'
+docker stop test_mssql_server
+docker rm test_mssql_server
+docker run --name test_mssql_server -e 'ACCEPT_EULA=Y' -e SA_PASSWORD=$MSSQL_PWD -p 1433:1433 -d microsoft/mssql-server-linux
+echo 'Created docker container test_mssql_server'
diff --git a/bash_scripts/test_db_cli.sh b/bash_scripts/test_db_cli.sh
@@ -0,0 +1 @@
+sudo docker exec -it test_mssql_server /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'ThePa$$word'
diff --git a/wait-for-it.sh → bash_scripts/wait-for-it.sh b/wait-for-it.sh → bash_scripts/wait-for-it.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,24 +4,25 @@ services:
     image: microsoft/mssql-server-linux
     environment:
       - ACCEPT_EULA=Y
-      - SA_PASSWORD=TestPa$$word123
-      - MSSQL_TCP_PORT=9204
+      - SA_PASSWORD=ThePa$$word
+      - MSSQL_TCP_PORT=1433
 
   mssql_ecto:
     build: .
     environment:
       - MIX_ENV=test
       - MSSQL_UID=sa
-      - MSSQL_PWD=TestPa$$word123
+      - MSSQL_PWD=ThePa$$word
       - MSSQL_HST=sql_server
       - MSSQL_IN=MSSQLSERVER
-      - MSSQL_PRT=9204
+      - MSSQL_PRT=1433
       - MSSQL_DVR={ODBC Driver 17 for SQL Server}
       - TRAVIS_JOB_ID=$TRAVIS_JOB_ID
+    depends_on:
+      - sql_server
     volumes:
       - .:/usr/src/app/
       - /usr/src/app/deps
       - /usr/src/app/_build
-    entrypoint: ./wait-for-it.sh sql_server:9204 --
+    entrypoint: ./bash_scripts/wait-for-it.sh sql_server:1433 --
     command: mix test
-
diff --git a/CHANGELOG.md → docs/CHANGELOG.md b/CHANGELOG.md → docs/CHANGELOG.md
diff --git a/CODE_OF_CONDUCT.md → docs/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → docs/CODE_OF_CONDUCT.md
diff --git a/ISSUE_TEMPLATE.md → docs/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md → docs/ISSUE_TEMPLATE.md