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

Introduce support for BIT fields in grids and export output. See issue #766 and http://www.heidisql.com/forum.php?t=8462

Browse Source
This commit is contained in:
Ansgar Becker
2011-05-10 05:15:59 +00:00
parent b49798fee4
commit 3b91279777
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/dbconnection.pas
View File

@ -3472,6 +3472,10 @@ end;
function TMySQLQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
var
AnsiStr: AnsiString;
BitString: String;
NumBit: Integer;
ByteVal: Byte;
c: Char;
begin
if (Column > -1) and (Column < ColumnCount) then begin
if FEditingPrepared and Assigned(FCurrentUpdateRow) then begin
@ -3484,6 +3488,25 @@ begin
Result := String(AnsiStr)
else
Result := Connection.DecodeAPIString(AnsiStr);
// Create string bitmask for BIT fields
if Datatype(Column).Index = dtBit then begin
for c in Result do begin
ByteVal := Byte(c);
BitString := '';
for NumBit:=0 to 7 do begin
if (ByteVal shr NumBit and $1) = $1 then
BitString := BitString + '1'
else
BitString := BitString + '0';
if Length(BitString) >= MaxLength(Column) then
break;
end;
if Length(BitString) >= MaxLength(Column) then
break;
end;
Result := BitString;
end;
end;
end else if not IgnoreErrors then
Raise EDatabaseError.CreateFmt(MsgInvalidColumn, [Column, ColumnCount, RecordCount]);
@ -3561,7 +3584,7 @@ begin
ColAttr := ColAttributes(Column);
if Assigned(ColAttr) then begin
case ColAttr.DataType.Index of
dtChar, dtVarchar, dtBinary, dtVarBinary: Result := MakeInt(ColAttr.LengthSet);
dtChar, dtVarchar, dtBinary, dtVarBinary, dtBit: Result := MakeInt(ColAttr.LengthSet);
dtTinyText, dtTinyBlob: Result := 255;
dtText, dtBlob: Result := 65535;
dtMediumText, dtMediumBlob: Result := 16777215;
@ -3908,8 +3931,13 @@ begin
if Cell.NewIsNull then
Val := 'NULL'
else case Datatype(i).Category of
dtcInteger, dtcReal: Val := Cell.NewText;
else Val := Connection.EscapeString(Cell.NewText);
dtcInteger, dtcReal: begin
Val := Cell.NewText;
if Datatype(i).Index = dtBit then
Val := 'b' + Connection.EscapeString(Val);
end
else
Val := Connection.EscapeString(Cell.NewText);
end;
sqlUpdate := sqlUpdate + Connection.QuoteIdent(FColumnOrgNames[i]) + '=' + Val;
sqlInsertColumns := sqlInsertColumns + Connection.QuoteIdent(FColumnOrgNames[i]);
@ -4166,8 +4194,14 @@ begin
Result := Result + ' IS NULL'
else begin
case DataType(j).Category of
dtcInteger, dtcReal: Result := Result + '=' + ColVal;
else Result := Result + '=' + Connection.EscapeString(ColVal);
dtcInteger, dtcReal: begin
if DataType(j).Index = dtBit then
Result := Result + '=b' + Connection.EscapeString(ColVal)
else
Result := Result + '=' + ColVal;
end
else
Result := Result + '=' + Connection.EscapeString(ColVal);
end;
end;
end;

2
source/exportgrid.pas
View File

@ -593,6 +593,8 @@ begin
efSQL: begin
if GridData.IsNull(Col) then
Data := 'NULL'
else if GridData.DataType(Col).Index = dtBit then
Data := 'b' + esc(Data)
else if not (GridData.DataType(Col).Category in [dtcInteger, dtcReal]) then
Data := esc(Data);
tmp := tmp + Data + ', ';

7
source/tabletools.pas
View File

@ -1313,7 +1313,12 @@ begin
if Data.IsNull(i) then
Row := Row + 'NULL'
else case Data.DataType(i).Category of
dtcInteger, dtcReal: Row := Row + Data.Col(i);
dtcInteger, dtcReal: begin
if Data.DataType(i).Index = dtBit then
Row := Row + 'b' + Quoter.EscapeString(Data.Col(i))
else
Row := Row + Data.Col(i);
end;
dtcBinary, dtcSpatial: begin
BinContent := Data.BinColAsHex(i);
if Length(BinContent) > 0 then