Feature/sqlsrv (#132)

* Add sqlsrv extension

* Add sqlsrv instructions and info to Readme

* Fix bug caused by incorrect spacing

* Add ext-sqlsrv.ini
- Update Readme

* Enable sqlsrv tests
- Add test for pdo_sqlsrv

Co-authored-by: Aaron Breuer <[email protected]>

Author: atbreuer11

Readme.md

@@ -73,8 +73,7 @@ memory_limit=128M
 | PostgreSQL     | `${bref:extra.pgsql-php-74}`          |                                            |
 | Redis          | `${bref:extra.redis-php-74}`          |                                            |
 | Scrypt         | `${bref:extra.scrypt-php-74}`         |                                            |
-| SQLSRV         | `${bref:extra.sqlsrv-php-74}`         | `extension=/opt/bref-extra/sqlsrv.so`      |
-| SQLSRV (PDO)   | `${bref:extra.sqlsrv-php-74}`         | `extension=/opt/bref-extra/pdo_sqlsrv.so`  |
+| SQLSRV         | `${bref:extra.sqlsrv-php-74}`         |                                            |
 | UUID           | `${bref:extra.uuid-php-74}`           |                                            |
 | Xdebug         | `${bref:extra.xdebug-php-74}`         |                                            |
 | Yaml           | `${bref:extra.yaml-php-74}`           |                                            |
@@ -122,7 +121,7 @@ The easiest way review those is to download the [`snowflake_odbc` directory](htt
 
 The SQL Server layer includes both the SQLSRV extension and the PDO_SQLSRV extension ([source](https://github.com/microsoft/msphpsql)).
 If you are unsure of which extension to use, this [stackoverflow post](https://stackoverflow.com/questions/11614536/sqlsrv-driver-vs-pdo-driver-for-php-with-ms-sql-server) may be helpful.
-In addition to enabling the chosen extension in your `php.ini`, you must set the environment variable `ODBCSYSINI: /opt/microsoft/conf/`
+You need to set the environment variable `ODBCSYSINI: /opt/microsoft/conf/`
 in your `serverless.yaml` in order to tell unixODBC to load the required ini files.
 
 ## Docker images

layers/sqlsrv/Dockerfile

@@ -17,14 +17,17 @@ RUN pecl install -f pdo_sqlsrv
 RUN cp /opt/bref/lib/php/extensions/no-debug-non-zts-*/sqlsrv.so /tmp/sqlsrv.so
 RUN cp /opt/bref/lib/php/extensions/no-debug-non-zts-*/pdo_sqlsrv.so /tmp/pdo_sqlsrv.so
 
+RUN echo $'extension=/opt/bref-extra/sqlsrv.so\n\
+extension=/opt/bref-extra/pdo_sqlsrv.so' > /tmp/ext.ini
+
+RUN echo $'[ODBC Driver 17 for SQL Server]\
+Driver      = ODBC Driver 17 for SQL Server\n\
+Description = My ODBC Driver 17 for SQL Server\n\
+Trace       = No'  > /tmp/odbc.ini
 RUN echo $'[ODBC Driver 17 for SQL Server]\n\
-  Driver      = ODBC Driver 17 for SQL Server\n\
-  Description = My ODBC Driver 17 for SQL Server\n\
-  Trace       = No'  > /tmp/odbc.ini
-RUN echo $'[ODBC Driver 17 for SQL Server]\n\
-  Description = Microsoft ODBC Driver 17 for SQL Server\n\
-  Driver      = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.6.so.1.1\n\
-  UsageCount  = 1'  > /tmp/odbcinst.ini
+Description = Microsoft ODBC Driver 17 for SQL Server\n\
+Driver      = /opt/microsoft/msodbcsql17/lib64/libmsodbcsql-17.6.so.1.1\n\
+UsageCount  = 1'  > /tmp/odbcinst.ini
 
 FROM scratch
 
@@ -46,6 +49,7 @@ COPY --from=ext /usr/lib64/libltdl* /opt/bref/lib64/
 
 COPY --from=ext /tmp/sqlsrv.so /opt/bref-extra/sqlsrv.so
 COPY --from=ext /tmp/pdo_sqlsrv.so /opt/bref-extra/pdo_sqlsrv.so
+COPY --from=ext /tmp/ext.ini /opt/bref/etc/php/conf.d/ext-sqlsrv.ini
 
 COPY --from=ext /tmp/odbc.ini /opt/microsoft/conf/odbc.ini
 COPY --from=ext /tmp/odbcinst.ini /opt/microsoft/conf/odbcinst.ini

layers/sqlsrv/test.php

@@ -1,12 +1,15 @@
 <?php
 
-exit(0);
-// TODO enable this test
-
 // This test is for sqlsrv.so
 if (!function_exists($func = 'sqlsrv_connect')) {
     echo sprintf('FAIL: Function "%s" does not exit.', $func).PHP_EOL;
     exit(1);
 }
 
+// This test is for pdo_sqlsrv.so
+if (!extension_loaded('pdo_sqlsrv')) {
+    echo sprintf('FAIL: PDO sqlsrv extension not loaded').PHP_EOL;
+    exit(1);
+}
+
 exit(0);