Skip to content
This repository has been archived by the owner on Jul 29, 2020. It is now read-only.

Joel conflicts and merge manualy #26

Merged
merged 13 commits into from
Oct 28, 2017
Merged

Joel conflicts and merge manualy #26

merged 13 commits into from
Oct 28, 2017

Conversation

felipeweb
Copy link
Member

No description provided.

@felipeweb felipeweb merged commit 87f2a43 into master Oct 28, 2017
@felipeweb felipeweb deleted the joel_teste branch October 28, 2017 17:09
felipeweb pushed a commit that referenced this pull request Oct 29, 2017
* Support access to all databases in PostgreSQL cluster

* Fix broken SetNativeDB used for test purposes

* Joel conflicts and merge manualy (#26)

* restructuring for use of more than one database adapter

* created Adapter interface
* moved scanner to adapter
* created Postgres type as Adapter
* used config.Adapter to call the functions

Signed-off-by: Joel M. de Souza <contato@joelmdesouza.com>

* travis ci test

* revised tests

* revert test travis

* revert test travis

* changed onfig.Adapter to onfig.PrestConf.Adapter

* pass Postgres{} as a reference

* chanded adapter Postgres > adapter *Postgres

* changed tests Postgres{} > config.PrestConf.Adapter

* resolve conflicts adapter/scanner.go

* fix some merge conflicts

* Support access to all databases in PostgreSQL cluster

* Fix broken SetNativeDB used for test purposes

* add ssl configurations (#24)

* Adjust to new Adapter interface

* Support access to all databases in PostgreSQL cluster

* Adjust to new Adapter interface
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants