Skip to content

Commit 309204b

Browse files
committed
Merge branch 'master' of github.com:rp-/sqlitebrowser
2 parents a1f506b + 26a2359 commit 309204b

File tree

9 files changed

+950
-866
lines changed

9 files changed

+950
-866
lines changed

currentrelease

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.2
1+
3.0.3

src/MainWindow.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,10 +1275,23 @@ void MainWindow::httpresponse(QNetworkReply *reply)
12751275

12761276
if(reply->error() == QNetworkReply::NoError)
12771277
{
1278+
// Check for redirect
1279+
QVariant possibleRedirectUrl =
1280+
reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
1281+
1282+
if(!possibleRedirectUrl.toUrl().isEmpty())
1283+
{
1284+
m_NetworkManager->get(QNetworkRequest(possibleRedirectUrl.toUrl()));
1285+
return;
1286+
}
1287+
12781288
// first line of the currentrelease file contains a major.minor.patch version string
12791289
QString sversion(reply->readLine());
12801290

12811291
QStringList versiontokens = sversion.split(".");
1292+
if(versiontokens.size() < 3)
1293+
return;
1294+
12821295
int major = versiontokens[0].toInt();
12831296
int minor = versiontokens[1].toInt();
12841297
int patch = versiontokens[2].toInt();

src/grammar/Sqlite3Lexer.cpp

Lines changed: 62 additions & 48 deletions
Large diffs are not rendered by default.

src/grammar/Sqlite3Lexer.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define INC_Sqlite3Lexer_hpp_
33

44
#include <antlr/config.hpp>
5-
/* $ANTLR 2.7.7 (20121001): "sqlite3.g" -> "Sqlite3Lexer.hpp"$ */
5+
/* $ANTLR 2.7.7 (20140222): "sqlite3.g" -> "Sqlite3Lexer.hpp"$ */
66
#include <antlr/CommonToken.hpp>
77
#include <antlr/InputBuffer.hpp>
88
#include <antlr/BitSet.hpp>
@@ -26,6 +26,7 @@ class CUSTOM_API Sqlite3Lexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, pu
2626
protected: void mDOT(bool _createToken);
2727
public: void mID(bool _createToken);
2828
public: void mQUOTEDID(bool _createToken);
29+
public: void mQUOTEDLITERAL(bool _createToken);
2930
public: void mNUMERIC(bool _createToken);
3031
public: void mPLUS(bool _createToken);
3132
public: void mMINUS(bool _createToken);

0 commit comments

Comments
 (0)