Added overrides for connection drivers. Got rid of enum for driver names so that users can use any of the supported drivers if they want to install all the pre-requisite packages needed. updated the readme to explain exactly what is included and pointed to the documentation on how to use things that aren't included.

Author: bishopbm2

README.md

@@ -1,19 +1,16 @@
 # SQL Integration Pack
-Query, Insert, Update, and Delete information from PostgreSQL, SQLite, MsSQL, MySQL, Oracle, Firebird, and Sybase Databases
+Query, Insert, Update, and Delete information from PostgreSQL, MsSQL, MySQL, Oracle, Firebird Databases. Additional databases can be added by installing the pre-requisite packes and passing the driver name as documented at [SQLAlchemy Dialects Doc](https://docs.sqlalchemy.org/en/latest/dialects/index.html).
 
-## Pre-Requisites
-This pack is set up to provide funcationality for the above databases. For MySQL and MsSQL we need to install 2 system packages.
+## Included Drivers
+This pack is already set up to connect to the databases listed above. Additional databases can be connected to but pre-requisite packages will need to be installed before the drivers will work. [SQLAlchemy Dialects Doc](https://docs.sqlalchemy.org/en/latest/dialects/index.html).
 
-#### [MySQL](https://pypi.org/project/mysqlclient/)
-``` shell
-yum install mysql-devel
+You can pass any of the following driver names without any additional packages needing installed.
 ```
-
-#### [MsSQL](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017)
-``` shell
-curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/mssql-release.repo
-yum install msodbcsql17
-yum install unixODBC-devel
+postgresql
+mssql
+mysql
+oracle
+firebird
 ```
 
 ## Quick Start

actions/delete.yaml

@@ -34,14 +34,6 @@
     drivername:
       type: string
       description: "Optional override of the database_type in <connection> (required if <connection> is not specified). The type of database that is being connected to."
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: false
     table:
       type: string

actions/insert.yaml

@@ -34,14 +34,6 @@
     drivername:
       type: string
       description: "Optional override of the database_type in <connection> (required if <connection> is not specified). The type of database that is being connected to."
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: false
     table:
       type: string

actions/insert_bulk.yaml

@@ -34,14 +34,6 @@
     drivername:
       type: string
       description: "Optional override of the database_type in <connection> (required if <connection> is not specified). The type of database that is being connected to."
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: false
     table:
       type: string

actions/lib/base_action.py

@@ -13,6 +13,13 @@
                           ('port', False, None),
                           ('drivername', True, "")]
 
+DEFAULT_KNOWN_DRIVER_CONNECTORS = {
+    'postgresql': 'postgresql+psycopg2',
+    'mysql': 'mysql+pymysql',
+    'oracle': 'oracle+cx_oracle',
+    'mssql': 'mssql+pymssql',
+    'firebird': 'firebird+fdb'
+}
 
 class BaseAction(Action):
     def __init__(self, config):
@@ -106,6 +113,11 @@ def db_connection(self, kwargs_dict):
         # Get the connection details from either config or from action params
         connection = self.resolve_connection(kwargs_dict)
 
+        # Update Driver with a connector
+        default_driver = DEFAULT_KNOWN_DRIVER_CONNECTORS.get(connection['drivername'], None)
+        if default_driver:
+            connection['drivername'] = default_driver
+
         # Format the connection string
         database_connection_string = URL(**connection)
 

actions/query.yaml

@@ -34,14 +34,6 @@
     drivername:
       type: string
       description: "Optional override of the database_type in <connection> (required if <connection> is not specified). The type of database that is being connected to."
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: false
     query:
       type: string

actions/update.yaml

@@ -34,14 +34,6 @@
     drivername:
       type: string
       description: "Optional override of the database_type in <connection> (required if <connection> is not specified). The type of database that is being connected to."
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: false
     table:
       type: string

config.schema.yaml

@@ -35,13 +35,5 @@ connection:
     drivername:
       description: "The type of database that is being connected to."
       type: string
-      enum:
-        - postgresql
-        - sqlite
-        - mssql
-        - mysql
-        - oracle
-        - firebird
-        - sybase
       required: true
   additionalProperties: false

requirements.txt

@@ -1,6 +1,6 @@
 sqlalchemy
-psycopg2
-mysqlclient
-pyodbc
+psycopg2 <=2.7.5
+pymysql
+pymssql
 cx_Oracle
 fdb