opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 18:12:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Azure support:

Browse Source 
* Add text from @@VERSION value into FServerVersionUntouched so TConnectionParameters.IsAzure can see "Azure" in it.
* Do not bypass required (!) USE query when IsAzure was detected
* Display a special MS Azure icon in the tree and in the status bar
This commit is contained in:
Ansgar Becker
2015-04-07 16:37:31 +00:00
parent f8e75b5d2e
commit 34f70eaf08
3 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/icons/server-azure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

12
source/dbconnection.pas
View File

@ -1321,7 +1321,10 @@ begin
else if IsInfiniDB then Result := 172
else if IsInfobright then Result := 173;
end;
ngMSSQL: Result := 123;
ngMSSQL: begin
Result := 123;
if IsAzure then Result := 188;
end;
ngPgSQL: Result := 187;
else Result := ICONINDEX_SERVER;
end;
@ -1822,7 +1825,7 @@ begin
// Try to get more exact server version to avoid displaying "20.14" in some cases
ServerVersion := GetVar('SELECT SERVERPROPERTY('+EscapeString('ProductVersion')+')');
if ExecRegExpr('(\d+)\.(\d+)\.(\d+)\.(\d+)', ServerVersion) then
FServerVersionUntouched := ServerVersion;
FServerVersionUntouched := Copy(FServerVersionUntouched, 1, Pos(' - ', FServerVersionUntouched)+2) + ServerVersion;
except
// Above query only works on SQL Server 2008 and newer
// Keep value from SELECT @@VERSION on older servers
@ -2153,8 +2156,6 @@ begin
FSQLSpecifities[spDbObjectsTypeCol] := 'type';
end;
end;
if Parameters.IsAzure and (not Parameters.AllDatabasesStr.IsEmpty) then
SetDatabase(Parameters.AllDatabasesStr);
end;
@ -2859,8 +2860,7 @@ begin
Value := EscapeString(Value)
else
Value := QuoteIdent(Value);
if not Parameters.IsAzure then
Query(Format(GetSQLSpecifity(spUSEQuery), [Value]), False);
Query(Format(GetSQLSpecifity(spUSEQuery), [Value]), False);
end;
SetObjectNamesInSelectedDB;
end;

88
source/main.dfm
View File

@ -2796,9 +2796,10 @@ object MainForm: TMainForm
Left = 504
Top = 104
Bitmap = {
494C0101BC005001840310001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
494C0101BD005001F80310001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000400000000003000001002000000000000000
0300000000000000000000000000000000000000000000000000000000000000
00000000000000000004000000080000000C0000000C00000008000000030000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@ -2806,120 +2807,119 @@ object MainForm: TMainForm
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0004000000110202001D04040128211C0C69614F25B27D602BCF66451AC0311E
0A8904030129000000040000000B000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000200000000000000060101
00190504012B120F04503E361591C7A12DFFC69E28FFC29722FFBB881AFFAF6D
13FF6E481BCA0000003100000057000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000291C077F51310FB3302411843329
1287624F1CB8BFA03BF9554C23A6D6BA52FFD4B849FFD0B03DFFCAA52FFFC093
20FFAF7C28FA0504012D00000010000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000D0A0346A96211FFBC891BFFC9A3
2DFFD3B443FFDCC566FF7C723BC4C8B775F3E4D38CFFDFCA73FFD6BA4DFFCBA8
33FFC19423FF26200D720000000F000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000FA6771FF3C49A24FFD0B0
3CFFDDC669FFE7D89AFFBFB381EC9B905AD9F0E6BEFFEBDEAAFFE2CF80FFD4B8
49FFC8A12BFF61501EB40202001B000000030000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000A69531BBCC9A32DFFD6BB
4EFFE4D38CFFEEE4B9FFEDE4C2FE887A3AD2EFE8C7FFB6A970EA827439CD705D
25C27C6322CD91772FDD04030027000000070000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000E322C1281CBA732FFD9C0
5BFFE8D99CFFF1E9C6FFF5EFD6FF968944DC8A782CD8A18F57E1CDBD88F5CDB6
72F8A6873AE8665221B90C0A03400000000B0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000E0908023A524015AA9680
39DBC5B36CF3BEB478ED948C4CD87D6E23D1BDB07CEEF4EED2FFEEE4B9FFE3D1
86FFD4B747FFC7A02AFF3A2B13900000000B0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000A040401298F7530DA8B76
34D675652BC6867439D3BFA97DF2E1D8B7FA938A4DD7F2EAC9FFEBDFAAFFDFCB
75FFD1B23FFFC49B25FF785820CE000000080000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000050202001F544417A6CFAF
3BFFDFC971FFEBDEAAFFF2E9C7FFF3ECCEFF796F35C5EADEADFFE4D38AFFD8BE
55FFCCA934FFBF901EFFAC7224FB0101001A0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000001010000131E190964C9A3
2EFFD4B849FFE0CC79FFE8D99DFFEBDEA9FF857C48C9C0AD66F0D9C059FFCFAF
3AFFC59C26FFB67C17FFA55911FF1913085E0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000503030024B38C
2BF4C9A42EFFD2B342FFD9BF58FFDBC463FFAF9B4DE674652BC1A98F33E8493E
159C241D09702219077142270BA23B2B13920000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000085F46
1AB7BB871AFFC49A25FFC9A42EFFCBA732FFC1A03AFA1E1B09660C0B03410504
012B010100180000000600000000000000020000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000202
01202B1E0C7F5F4315BA705217C8503D14A814110554040301270202001E0000
0011000000040000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000050000000A0000000D0000000D00000009000000040000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000