ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/nongui/IBExtract.pas
(Generate patch)

Comparing ibx/trunk/runtime/nongui/IBExtract.pas (file contents):
Revision 310 by tony, Fri Apr 17 10:26:08 2020 UTC vs.
Revision 311 by tony, Mon Aug 24 09:32:58 2020 UTC

# Line 2439 | Line 2439 | begin
2439          First := false;
2440        end;
2441  
2442 <      Line := Format('CREATE DOMAIN %s AS ', [FieldName]);
2442 >      Line := Format('CREATE DOMAIN %s AS ', [TrimRight(FieldName)]);
2443        Line := Line + FormatDomainStr + Term;
2444        FMetaData.Add(Line);
2445        AddComment(qryDomains,ctDomain,FMetaData);
# Line 3605 | Line 3605 | begin
3605          if qryOwnerPriv.FieldByName('GRANTEDBY').IsNull then
3606          FMetaData.Add(Format('GRANT %s ON %s %s TO %s %s %s %s', [
3607                            qryOwnerPriv.FieldByName('Privileges').AsString,
3608 <                          qryOwnerPriv.FieldByName('OBJECT_TYPE_NAME').AsString,
3608 >                          TrimRight(qryOwnerPriv.FieldByName('OBJECT_TYPE_NAME').AsString),
3609                            QuoteIdentifier(qryOwnerPriv.FieldByName('METAOBJECTNAME').AsString),
3610 <                          qryOwnerPriv.FieldByName('USER_TYPE_NAME').AsString,
3610 >                          TrimRight(qryOwnerPriv.FieldByName('USER_TYPE_NAME').AsString),
3611                            QuoteIdentifier(qryOwnerPriv.FieldByName('RDB$USER').AsString),
3612 <                          qryOwnerPriv.FieldByName('GRANTOPTION').AsString,
3612 >                          TrimRight(qryOwnerPriv.FieldByName('GRANTOPTION').AsString),
3613                            Terminator]))
3614          else
3615            FMetaData.Add(Format('GRANT %s ON %s %s TO %s %s %s GRANTED BY %s %s', [
# Line 3691 | Line 3691 | begin
3691      begin
3692        FMetaData.Add(Format('GRANT %s ON %s %s TO %s %s %s%s', [
3693                              qryOwnerPriv.FieldByName('Privileges').AsString,
3694 <                            qryOwnerPriv.FieldByName('OBJECT_TYPE_NAME').AsString,
3694 >                            TrimRight(qryOwnerPriv.FieldByName('OBJECT_TYPE_NAME').AsString),
3695                              QuoteIdentifier(qryOwnerPriv.FieldByName('METAOBJECTNAME').AsString),
3696 <                            qryOwnerPriv.FieldByName('USER_TYPE_NAME').AsString,
3696 >                            TrimRight(qryOwnerPriv.FieldByName('USER_TYPE_NAME').AsString),
3697                              QuoteIdentifier(qryOwnerPriv.FieldByName('RDB$USER').AsString),
3698 <                            qryOwnerPriv.FieldByName('GRANTOPTION').AsString,
3698 >                            TrimRight(qryOwnerPriv.FieldByName('GRANTOPTION').AsString),
3699                              Terminator]));
3700        qryOwnerPriv.Next;
3701      end;
# Line 3742 | Line 3742 | begin
3742        else
3743          WithOption := '';
3744        FMetaData.Add(Format('GRANT %s TO %s%s%s%s',
3745 <        [ QuoteIdentifier( qryRole.FieldByName('RDB$RELATION_NAME').AsString),
3745 >        [ QuoteIdentifier(qryRole.FieldByName('RDB$RELATION_NAME').AsString),
3746           UserString, WithOption, Terminator, LineEnding]));
3747  
3748        qryRole.Next;
# Line 3778 | Line 3778 | var
3778    var
3779      i, CollationID, CharSetID : Integer;
3780    begin
3781 <    Result := Format('  %s ', [qryHeader.FieldByName('RDB$PARAMETER_NAME').AsString]);
3781 >    Result := Format('  %s ', [QuoteIdentifier(qryHeader.FieldByName('RDB$PARAMETER_NAME').AsString)]) + TAB;
3782      for i := Low(ColumnTypes) to High(ColumnTypes) do
3783        if qryHeader.FieldByName('RDB$FIELD_TYPE').AsInteger = ColumnTypes[i].SQLType then
3784        begin

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines