github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-29 06:12:59 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Sql: SqlScrip: Support for PGSQL $$

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5620 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-12-03 09:35:45 +00:00
parent ebdf617d98
commit 2c82b3659c
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
uppsrc/Sql/Script.cpp
View file

@ -24,6 +24,7 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
String stmt;
int level = 0;
bool ok = true;
bool esc = false;
while(!script.IsEof()) {
int c = script.Term();
if(IsAlpha(c)) {
@ -33,10 +34,12 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
stmt.Cat(c);
id.Cat(ToUpper(c));
}
if(id == "BEGIN")
level++;
if(id == "END")
level--;
if(!esc) {
if(id == "BEGIN")
level++;
if(id == "END")
level--;
}
}
else
if(c == '\'') {
@ -56,7 +59,17 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
}
}
else
if(c == ';' && level == 0) {
if(session.GetDialect() == PGSQL && c == '$') {
stmt.Cat('$');
script.Get();
if(script.Term() == '$') {
script.Get();
stmt.Cat('$');
esc = !esc;
}
}
else
if(c == ';' && level == 0 && !esc) {
Sql sql(session);
session.ClearError();
int q = 0;
@ -72,10 +85,12 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
script.Get();
}
else {
if(c == '(')
level++;
if(c == ')')
level--;
if(!esc) {
if(c == '(')
level++;
if(c == ')')
level--;
}
if(c != '\r') {
if(session.GetDialect() == ORACLE && c == '\n')
stmt.Cat('\r');