opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

There is no 64 bit unsigned integer type in Delphi, but MySQL has it: bigint unsigned. Handle these as strings in the table editor. Fixes issue #1489.

Browse Source
This commit is contained in:
Ansgar Becker
2009-11-29 00:18:20 +00:00
parent 59da2e193a
commit 8ac6fbd15c
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/helpers.pas
View File

@ -133,6 +133,7 @@ type
function Mince(PathToMince: String; InSpace: Integer): String;
function MakeInt( Str: String ) : Int64;
function MakeFloat( Str: String ): Extended;
function CleanupNumber(Str: String): String;
function esc(Text: WideString; ProcessJokerChars: Boolean = false; sql_version: integer = 50000): WideString;
function ScanNulChar(Text: WideString): Boolean;
function ScanLineBreaks(Text: WideString): TLineBreaks;
@ -1449,24 +1450,18 @@ begin
end;
{***
Convert a string-number to an floatingpoint-number
@param String text representation of a number
@return Extended
}
function MakeFloat( Str: String ): Extended;
function CleanupNumber(Str: String): String;
var
i : Integer;
StrNumber : String;
p_kb, p_mb, p_gb, p_tb, p_pb : Integer;
i: Integer;
HasDecimalSep: Boolean;
begin
StrNumber := '';
// Ensure the passed string contains a valid number, which is convertable by StrToFloat afterwards
// Return it as string again, as there are callers which need to handle unsigned bigint's somehow -
// there is no unsigned 64 bit integer type in Delphi.
Result := '';
HasDecimalSep := False;
for i:=1 to Length(Str) do
begin
if (Str[i] in ['0'..'9', DecimalSeparator]) or ((Str[i] = '-') and (StrNumber='')) then
for i:=1 to Length(Str) do begin
if (Str[i] in ['0'..'9', DecimalSeparator]) or ((Str[i] = '-') and (Result='')) then
begin
// Avoid confusion and AV in StrToFloat()
if (ThousandSeparator = DecimalSeparator) and (Str[i] = DecimalSeparator) then
@ -1476,14 +1471,27 @@ begin
continue;
if Str[i] = DecimalSeparator then
HasDecimalSep := True;
StrNumber := StrNumber + Str[i];
Result := Result + Str[i];
end;
end;
if (Result = '') or (Result = '-') then
Result := '0';
end;
{***
Convert a string-number to an floatingpoint-number
@param String text representation of a number
@return Extended
}
function MakeFloat( Str: String ): Extended;
var
p_kb, p_mb, p_gb, p_tb, p_pb : Integer;
begin
// Convert result to a floating point value to ensure
// we don't discard decimal digits for the next step
if (StrNumber = '') or (StrNumber = '-') then Result := 0
else Result := StrToFloat( StrNumber );
Result := StrToFloat(CleanupNumber(Str));
// Detect if the string was previously formatted by FormatByteNumber
// and convert it back by multiplying it with its byte unit

2
source/table_editor.pas
View File

@ -1446,7 +1446,7 @@ begin
// Only numbers allowed in this TEdit
Modification(Sender);
ed := Sender as TEdit;
ShouldBe := IntToStr(Makeint(ed.Text));
ShouldBe := CleanupNumber(ed.Text);
if (ed.Text = ShouldBe) or (ed.Text = '') then Exit;
MessageBeep(MB_ICONEXCLAMATION);
CursorPos := ed.SelStart;