paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 10:49:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #18672, using improved patch of Laco

Browse Source 
git-svn-id: trunk@39470 -
This commit is contained in:
michael 2018-07-18 12:23:04 +00:00
parent 3acdf481c2
commit 270cf0ed06
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
packages/fcl-db/src/base/dataset.inc
View File

@ -1331,30 +1331,45 @@ end;
procedure TDataSet.SetName(const Value: TComponentName);
function CheckName(const FieldName: string): string;
var i,j: integer;
begin
Result := FieldName;
i := 0;
j := 0;
while (i < Fields.Count) do begin
if Result = Fields[i].FieldName then begin
inc(j);
Result := FieldName + IntToStr(j);
end else Inc(i);
function CheckName(const FieldName: string): string;
var i,j: integer;
begin
Result := FieldName;
i := 0;
j := 0;
// Check if fieldname exists.
while (i < Fields.Count) do
if Not SameText(Result,Fields[i].Name) then
inc(i)
else
begin
inc(j);
Result := FieldName + IntToStr(j);
i := 0;
end;
// Check if component with the same name exists.
if Assigned(Owner) then
While Owner.FindComponent(Result)<>Nil do
begin
Inc(J);
Result := FieldName + IntToStr(j);
end;
end;
end;
var i: integer;
nm: string;
old: string;
var
i: integer;
OldName, OldFieldName: string;
begin
if Self.Name = Value then Exit;
old := Self.Name;
OldName := Self.Name;
inherited SetName(Value);
if (csDesigning in ComponentState) then
for i := 0 to Fields.Count - 1 do begin
nm := old + Fields[i].FieldName;
if Copy(Fields[i].Name, 1, Length(nm)) = nm then
OldFieldName := OldName + Fields[i].FieldName;
if Copy(Fields[i].Name, 1, Length(OldFieldName)) = OldFieldName then
Fields[i].Name := CheckName(Value + Fields[i].FieldName);
end;
end;