mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-19 18:40:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:rp-/sqlitebrowser

Browse Source
This commit is contained in:
Martin Kleusberg
2014-04-29 20:28:20 +02:00
parent a1f506bb14 26a23595b4
commit 309204b01a
9 changed files with 1019 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
currentrelease
View File

@@ -1 +1 @@
3.0.2
3.0.3

13
src/MainWindow.cpp
View File

@@ -1275,10 +1275,23 @@ void MainWindow::httpresponse(QNetworkReply *reply)
if(reply->error() == QNetworkReply::NoError)
{
// Check for redirect
QVariant possibleRedirectUrl =
reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
if(!possibleRedirectUrl.toUrl().isEmpty())
{
m_NetworkManager->get(QNetworkRequest(possibleRedirectUrl.toUrl()));
return;
}
// first line of the currentrelease file contains a major.minor.patch version string
QString sversion(reply->readLine());
QStringList versiontokens = sversion.split(".");
if(versiontokens.size() < 3)
return;
int major = versiontokens[0].toInt();
int minor = versiontokens[1].toInt();
int patch = versiontokens[2].toInt();

110
src/grammar/Sqlite3Lexer.cpp
View File

File diff suppressed because one or more lines are too long

3
src/grammar/Sqlite3Lexer.hpp
View File

@@ -2,7 +2,7 @@
#define INC_Sqlite3Lexer_hpp_
#include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20121001): "sqlite3.g" -> "Sqlite3Lexer.hpp"$ */
/* $ANTLR 2.7.7 (20140222): "sqlite3.g" -> "Sqlite3Lexer.hpp"$ */
#include <antlr/CommonToken.hpp>
#include <antlr/InputBuffer.hpp>
#include <antlr/BitSet.hpp>
@@ -26,6 +26,7 @@ public:
protected: void mDOT(bool _createToken);
public: void mID(bool _createToken);
public: void mQUOTEDID(bool _createToken);
public: void mQUOTEDLITERAL(bool _createToken);
public: void mNUMERIC(bool _createToken);
public: void mPLUS(bool _createToken);
public: void mMINUS(bool _createToken);

1740
src/grammar/Sqlite3Parser.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/grammar/Sqlite3Parser.hpp
View File

@@ -2,7 +2,7 @@
#define INC_Sqlite3Parser_hpp_
#include <antlr/config.hpp>
/* $ANTLR 2.7.7 (20130818): "sqlite3.g" -> "Sqlite3Parser.hpp"$ */
/* $ANTLR 2.7.7 (20140222): "sqlite3.g" -> "Sqlite3Parser.hpp"$ */
#include <antlr/TokenStream.hpp>
#include <antlr/TokenBuffer.hpp>
#include "sqlite3TokenTypes.hpp"
@@ -76,10 +76,10 @@ protected:
private:
static const char* tokenNames[];
#ifndef NO_STATIC_CONSTS
static const int NUM_TOKENS = 102;
static const int NUM_TOKENS = 103;
#else
enum {
NUM_TOKENS = 102
NUM_TOKENS = 103
};
#endif
@@ -135,6 +135,8 @@ private:
static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_24;
static const unsigned long _tokenSet_25_data_[];
static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_25;
static const unsigned long _tokenSet_26_data_[];
static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_26;
};
#endif /*INC_Sqlite3Parser_hpp_*/

11
src/grammar/sqlite3.g
View File

@@ -96,9 +96,12 @@ ID
QUOTEDID
: '`' ( ~('`') )* '`'
| '[' ( ~(']') )* ']'
| '"' ( ~('"') )* '"'
;
QUOTEDLITERAL
: '"' ( ~('"') )* '"'
;
NUMERIC
: ( (DIGIT)+ ( '.' (DIGIT)* )?
| '.' { _ttype=DOT; } (DIGIT)+)
@@ -164,7 +167,7 @@ options {
buildAST = true;
}
id : ID | QUOTEDID | STRINGLITERAL ;
id : ID | QUOTEDID | QUOTEDLITERAL | STRINGLITERAL ;
databasename
:
@@ -318,7 +321,7 @@ columndef
{#columndef = #([COLUMNDEF, "COLUMNDEF"], #columndef);}
;
name : ID | QUOTEDID | STRINGLITERAL;
name : ID | QUOTEDID | QUOTEDLITERAL | STRINGLITERAL;
type_name
:
@@ -334,7 +337,7 @@ columnconstraint
| NOT NULL_T (conflictclause)?
| UNIQUE (conflictclause)?
| CHECK LPAREN expr RPAREN
| DEFAULT (signednumber | STRINGLITERAL | LPAREN expr RPAREN)
| DEFAULT (signednumber | QUOTEDLITERAL | STRINGLITERAL | LPAREN expr RPAREN)
| COLLATE collationname
| foreignkeyclause)
{#columnconstraint = #([COLUMNCONSTRAINT, "COLUMNCONSTRAINT"], #columnconstraint);}

65
src/grammar/sqlite3TokenTypes.hpp
View File

@@ -1,7 +1,7 @@
#ifndef INC_sqlite3TokenTypes_hpp_
#define INC_sqlite3TokenTypes_hpp_
/* $ANTLR 2.7.7 (20130818): "sqlite3.g" -> "sqlite3TokenTypes.hpp"$ */
/* $ANTLR 2.7.7 (20140222): "sqlite3.g" -> "sqlite3TokenTypes.hpp"$ */
#ifndef CUSTOM_API
# define CUSTOM_API
@@ -79,37 +79,38 @@ struct CUSTOM_API sqlite3TokenTypes {
DOT = 68,
ID = 69,
QUOTEDID = 70,
NUMERIC = 71,
NL = 72,
COMMENT = 73,
WS = 74,
STRINGLITERAL = 75,
LPAREN = 76,
RPAREN = 77,
COMMA = 78,
SEMI = 79,
PLUS = 80,
MINUS = 81,
STAR = 82,
TILDE = 83,
AMPERSAND = 84,
BITOR = 85,
OROP = 86,
EQUAL = 87,
EQUAL2 = 88,
GREATER = 89,
GREATEREQUAL = 90,
LOWER = 91,
LOWEREQUAL = 92,
UNEQUAL = 93,
UNEQUAL2 = 94,
BITWISELEFT = 95,
BITWISERIGHT = 96,
NO = 97,
SELECT = 98,
SLASH = 99,
PERCENT = 100,
IN = 101,
QUOTEDLITERAL = 71,
NUMERIC = 72,
NL = 73,
COMMENT = 74,
WS = 75,
STRINGLITERAL = 76,
LPAREN = 77,
RPAREN = 78,
COMMA = 79,
SEMI = 80,
PLUS = 81,
MINUS = 82,
STAR = 83,
TILDE = 84,
AMPERSAND = 85,
BITOR = 86,
OROP = 87,
EQUAL = 88,
EQUAL2 = 89,
GREATER = 90,
GREATEREQUAL = 91,
LOWER = 92,
LOWEREQUAL = 93,
UNEQUAL = 94,
UNEQUAL2 = 95,
BITWISELEFT = 96,
BITWISERIGHT = 97,
NO = 98,
SELECT = 99,
SLASH = 100,
PERCENT = 101,
IN = 102,
NULL_TREE_LOOKAHEAD = 3
};
#ifdef __cplusplus

2
src/sqlitetypes.cpp
View File

@@ -218,6 +218,7 @@ QString identifier(antlr::RefAST ident)
{
QString sident = ident->getText().c_str();
if(ident->getType() == sqlite3TokenTypes::QUOTEDID ||
ident->getType() == Sqlite3Lexer::QUOTEDLITERAL ||
ident->getType() == sqlite3TokenTypes::STRINGLITERAL)
{
sident.remove(0, 1);
@@ -248,6 +249,7 @@ Table CreateTableWalker::table()
//skip to tablename
while(s->getType() != Sqlite3Lexer::ID &&
s->getType() != Sqlite3Lexer::QUOTEDID &&
s->getType() != Sqlite3Lexer::QUOTEDLITERAL &&
s->getType() != Sqlite3Lexer::STRINGLITERAL &&
s->getType() != sqlite3TokenTypes::KEYWORDASTABLENAME)
{