diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient index a2258a4a3..383323c90 160000 --- a/3rdparty/qredisclient +++ b/3rdparty/qredisclient @@ -1 +1 @@ -Subproject commit a2258a4a37e9896ff5f86b19b821cdd548d3efbb +Subproject commit 383323c901b24252e74b78c4a891587cd5e21741 diff --git a/appveyor.yml b/appveyor.yml index 8a90e6c56..b5df8497c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,11 +3,10 @@ version: 0.9.0.{build} clone_depth: 5 install: - git submodule update --init --recursive -- set QTDIR=C:\Qt\5.8\msvc2015 +- set QTDIR=C:\Qt\5.9\msvc2015 - set PATH=%QTDIR%\bin;%PATH% - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" -- nuget install -Version 1.6.0.2 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2 -- nuget install -Version 1.2.8.6 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_zlib +- nuget install -Version 1.8.0 -OutputDirectory ./3rdparty/qredisclient/3rdparty/windows rmt_libssh2 - qmake -v build_script: @@ -23,8 +22,10 @@ build_script: - cd %SRCDIR% - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb -- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.0.2.5\build\native\bin\v140\Win32\Release\dynamic\libeay32.dll .\build\windows\installer\resources\libeay32.dll -- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.0.2.5\build\native\bin\v140\Win32\Release\dynamic\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll +- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll +- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libssl-1_1.dll .\build\windows\installer\resources\libssl-1_1.dll +- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\capi.dll .\build\windows\installer\resources\capi.dll +- copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\padlock.dll .\build\windows\installer\resources\padlock.dll - cd build/windows/installer/resources/ - windeployqt --no-translations --compiler-runtime --angle --release --force --qmldir %SRCDIR%/src/qml rdm.exe - cd %SRCDIR% diff --git a/src/app/models/treeoperations.cpp b/src/app/models/treeoperations.cpp index ec2239f4b..1f8a8a25d 100644 --- a/src/app/models/treeoperations.cpp +++ b/src/app/models/treeoperations.cpp @@ -33,11 +33,7 @@ void TreeOperations::getDatabases(std::functiongetConfig().name())); - } - - if (m_connection->getServerVersion() < 2.8) - throw ConnectionsTree::Operations::Exception(QObject::tr("RedisDesktopManager >= 0.9.0 doesn't support old versions of " - "redis-server (< 2.8). Please use RedisDesktopManager 0.8.8 or upgrade your redis-server.")); + } RedisClient::DatabaseList availableDatabeses = m_connection->getKeyspaceInfo(); diff --git a/tests/unit_tests/testcases/app/test_treeoperations.cpp b/tests/unit_tests/testcases/app/test_treeoperations.cpp index 172d2a7ea..7c3b5fb78 100644 --- a/tests/unit_tests/testcases/app/test_treeoperations.cpp +++ b/tests/unit_tests/testcases/app/test_treeoperations.cpp @@ -55,26 +55,6 @@ void TestTreeOperations::testGetDatabases() QCOMPARE(result.size(), 1003); } -void TestTreeOperations::testGetDatabasesOnOldRedis() -{ - //given - ConnectionsManager manager{QString()}; - auto connection = getFakeConnection(QList(), QStringList(), 2.6); - bool exceptionCatched = false; - - //when - TreeOperations operations(connection, manager); - - try { - operations.getDatabases([](const RedisClient::DatabaseList&){}); - } catch (const TreeOperations::Exception& e) { - exceptionCatched = true; - } - - //then - QCOMPARE(exceptionCatched, true); -} - void TestTreeOperations::testGetDatabaseKeys() { //given @@ -101,7 +81,6 @@ void TestTreeOperations::testGetDatabaseKeys() wait(5); QCOMPARE(callbackCalled, true); QCOMPARE(connection->runCommandCalled, runCommandCalled); - QCOMPARE(connection->getServerVersionCalled, 1u); QCOMPARE(connection->retrieveCollectionCalled, retrieveCollectionCalled); } diff --git a/tests/unit_tests/testcases/app/test_treeoperations.h b/tests/unit_tests/testcases/app/test_treeoperations.h index 588af2c0d..9f34dccd2 100644 --- a/tests/unit_tests/testcases/app/test_treeoperations.h +++ b/tests/unit_tests/testcases/app/test_treeoperations.h @@ -10,7 +10,6 @@ private slots: void testCreation(); void testGetDatabases(); - void testGetDatabasesOnOldRedis(); void testGetDatabaseKeys(); void testGetDatabaseKeys_data();