github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Sql: SqlSelect::AsTable for ORACLE (thanks wqcmaster!)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8840 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-08-23 18:27:03 +00:00
parent 8ffd2d5796
commit 0004c73037
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlCore/CtrlCore.h
View file

@ -1319,7 +1319,6 @@ void GUI_AKD_Conservative_Write(int);
void GUI_DragDistance_Write(int);
void GUI_DblClickTime_Write(int);
void GUI_WheelScrollLines_Write(int);
void GUI_HiDPI_Write(int);
void EditFieldIsThin_Write(int);
void TopSeparator1_Write(Value);

4
uppsrc/CtrlLib/ChWin32.cpp
View file

@ -614,10 +614,6 @@ void ChSysInit()
if(height > 0 && height < 200) // sanity..
Font::SetDefaultFont(Font(q >= 0 ? q : Font::SANSSERIF, height));
bool uhd = GetStdFontCy() > 22;
GUI_HiDPI_Write(GetStdFontCy() > 22);
SetUHDMode(uhd);
GUI_GlobalStyle_Write(IsWinXP() && !ScreenInPaletteMode() && IsSysFlag(0x1022 /*SPI_GETFLATMENU*/)
? GUISTYLE_XP : GUISTYLE_CLASSIC);
#ifndef PLATFORM_WINCE

2
uppsrc/Sql/SqlStatement.cpp
View file

@ -268,7 +268,7 @@ SqlSet SqlSelect::AsTable(const SqlId& tab) const
{
StringBuffer t;
t << SqlCode(MSSQL|PGSQL, "")("(")
<< "(" << text << ") as \t" << tab.ToString() << '\t'
<< "(" << text << ") " << SqlCase(ORACLE,"")("as") << " \t" << tab.ToString() << '\t'
<< SqlCode(MSSQL|PGSQL, "")(")");
return SqlSet(String(t), SqlSet::HIGH);
}

4
uppsrc/plugin/ndisasm/lib/compiler.h
View file

@ -92,6 +92,10 @@
#include <stdarg.h>
#include <stdio.h>
#ifdef _MSC_VER
#define HAVE__SNPRINTF
#endif
#ifndef HAVE_SNPRINTF
# ifdef HAVE__SNPRINTF
# define snprintf _snprintf

2
uppsrc/plugin/ndisasm/lib/snprintf.c
View file

@ -13,6 +13,7 @@
#include "nasmlib.h"
#ifndef HAVE_SNPRINTF
#ifndef HAVE__SNPRINTF
int snprintf(char *str, size_t size, const char *format, ...)
{
@ -33,3 +34,4 @@ int snprintf(char *str, size_t size, const char *format, ...)
}
#endif
#endif