Merge pull request #7 from hmoffatt/sqldrivers

darkmattercoder · web-flow · commit d6e777793c59 · 2019-10-08T15:16:13.000+02:00
add SQL drivers
diff --git a/Dockerfile b/Dockerfile
@@ -30,6 +30,9 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recomme
 	pkg-config \
 	libgl1-mesa-dev \
 	libicu-dev \
+	firebird-dev \
+	libmysqlclient-dev \
+	libpq-dev \
 	# bc suggested for openssl tests
 	bc \
 	libssl-dev \
diff --git a/buildconfig/configure-5.10.0.sh b/buildconfig/configure-5.10.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.10.1.sh b/buildconfig/configure-5.10.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.0.sh b/buildconfig/configure-5.11.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.1.sh b/buildconfig/configure-5.11.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.2.sh b/buildconfig/configure-5.11.2.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.11.3.sh b/buildconfig/configure-5.11.3.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.12.0.sh b/buildconfig/configure-5.12.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb
diff --git a/buildconfig/configure-5.12.1.sh b/buildconfig/configure-5.12.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.2.sh b/buildconfig/configure-5.12.2.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.3.sh b/buildconfig/configure-5.12.3.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.4.sh b/buildconfig/configure-5.12.4.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.12.5.sh b/buildconfig/configure-5.12.5.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.13.0.sh b/buildconfig/configure-5.13.0.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.13.1.sh b/buildconfig/configure-5.13.1.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests
diff --git a/buildconfig/configure-5.9.1.sh b/buildconfig/configure-5.9.1.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.2.sh b/buildconfig/configure-5.9.2.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.3.sh b/buildconfig/configure-5.9.3.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.4.sh b/buildconfig/configure-5.9.4.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.5.sh b/buildconfig/configure-5.9.5.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.6.sh b/buildconfig/configure-5.9.6.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.7.sh b/buildconfig/configure-5.9.7.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/buildconfig/configure-5.9.8.sh b/buildconfig/configure-5.9.8.sh
@@ -13,6 +13,7 @@ make -j$CORE_COUNT > /dev/null 2>&1 || make -j$CORE_COUNT
 make test > /dev/null 2>&1 || make test
 make install > /dev/null 2>&1 || make install
 cd ..
+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json
 OPENSSL_LIBS='-L/opt/openssl_build_stable/lib -lssl -lcrypto' ../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb -openssl-linked -I /opt/openssl_build_stable/include -L /opt/openssl_build_stable/lib
 mkdir -p /opt/extra-dependencies/lib
 cp -r /opt/openssl_build_stable /opt/extra-dependencies
diff --git a/tests/sqldrivers/main.cpp b/tests/sqldrivers/main.cpp
@@ -0,0 +1,13 @@
+#include <QDebug>
+#include <QSqlDatabase>
+
+int main()
+{
+  auto drivers = QSqlDatabase::drivers();
+  qDebug() << "Available drivers:" << drivers;
+
+  if (!drivers.contains("QMYSQL") || !drivers.contains("QPSQL"))
+    return 1;
+
+  return 0;
+}
diff --git a/tests/sqldrivers/sqldrivers.pro b/tests/sqldrivers/sqldrivers.pro
@@ -0,0 +1,8 @@
+QT += core
+QT -= gui
+QT += sql
+TARGET = sqldrivers
+CONFIG   += console
+CONFIG   -= app_bundle
+TEMPLATE = app
+SOURCES += main.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#!/bin/sh`
	`2`	`+sed -i -e 's/"-lgds"/"-lfbclient"/' ../qtbase/src/plugins/sqldrivers/configure.json`
`2`	`3`	`../configure -prefix $QT_PREFIX -opensource -confirm-license -nomake examples -nomake tests -qt-xcb`