テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

3 transform - edit mode, temp=0.2; prompt "Format the code nicely, remove obsolete and out-of-place comments."

作成日 4 年前差分は期限切れになりません

20 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

53 行

9 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

39 行

function fnGetSqlConditions(const ASqlColumnName: String;

const ADatePicker: TDatePickerFrame;

const ATimePickerFrom, ATimePickerTo: TTimePickerFrame): String;

begin

Result := '';

// filtering DATA_INS by creation date range

if (ADatePicker.DateFrom <> 0) then begin

if (not ATimePickerFrom.fnIsEmpty()) then

Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom + ATimePickerFrom.Value))])

else

Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom))]);

end;

if (ADatePicker.DateTo <> 0) then begin

if (not ATimePickerTo.fnIsEmpty()) then

Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo + ATimePickerTo.Value))])

else

Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo))]);

end;

procedure TfmWebLogForm.prOpenSQL;

const

C_SQL = 'select hdl_d11, hdl_d02_d11, hdl_007_d11, hdl_d11_d11, event_d11, '

+ ' time_d11, '

+ ' remote_ip_d11, user_d11, session_id_d11, url_d11, content_type_d11, content_d11'

+ ' from tweb_srv_log_d11 d11 where'

+ ' d11.hdl_d11_d11 is null';

begin

frmSQLGridFrame1.SQLText := C_SQL;

// add query filters for:

// - filtering HDL_D02

// - filtering DATA_INS by creation date range (incl time)

// - filtering TIME by execution date range (incl time)

// immediately after that, open query

// use QuotedStr and fnDateToSqlStr(TDateTime) to format TDateTime parameters for the query

// if time is not empty, use property Value to extract it from time picker

// time must be added to date before casting to string

//filtering HDL_D02

if (HdlD02 <> 0) then

frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + Format(' and HDL_D02_D11 = %d', [HdlD02]);

frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText

// filtering DATA_INS by creation date range, filtering TIME by execution date range

+ fnGetSqlConditions('DATA_INS_D11', dpCreated, edtTimeCreatedFrom, edtTimeCreatedTo)

frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + fnGetSqlConditions('DATA_INS_D11', dpCreated, edtTimeCreatedFrom, edtTimeCreatedTo) + fnGetSqlConditions('TIME_D11', dpExecuted, edtTimeExecutedFrom, edtTimeExecutedTo);

+ fnGetSqlConditions('TIME_D11', dpExecuted, edtTimeExecutedFrom, edtTimeExecutedTo)

+ ' order by DATA_INS_D11 desc';

frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + ' order by DATA_INS_D11 desc';

frmSQLGridFrame1.prOpenQuery;

frmSQLGridFrame1.OnRowRefresh := prRowInfo;

frmSQLGridFrame1.VisibleColumnsList.Values['DATA_INS_D11'] := 'Created';

end;

保存された差分

原文

ファイルを開く

function fnGetSqlConditions(const ASqlColumnName: String;
  const ADatePicker: TDatePickerFrame;
  const ATimePickerFrom, ATimePickerTo: TTimePickerFrame): String;
begin
  Result := '';
  // filtering DATA_INS by creation date range
  if (ADatePicker.DateFrom <> 0) then begin
    if (not ATimePickerFrom.fnIsEmpty()) then
      Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom + ATimePickerFrom.Value))])
    else
      Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom))]);
  end;
 
  if (ADatePicker.DateTo <> 0) then begin
    if (not ATimePickerTo.fnIsEmpty()) then
      Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo + ATimePickerTo.Value))])
    else
      Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo))]);
  end;
end;

procedure TfmWebLogForm.prOpenSQL;
const
  C_SQL = 'select hdl_d11, hdl_d02_d11, hdl_007_d11, hdl_d11_d11, event_d11, '
  + ' time_d11, '
  + ' remote_ip_d11, user_d11, session_id_d11, url_d11, content_type_d11, content_d11'
  + ' from tweb_srv_log_d11 d11 where'
  + ' d11.hdl_d11_d11 is null';
begin
  frmSQLGridFrame1.SQLText := C_SQL;
 
  // add query filters for:
  // - filtering HDL_D02
  // - filtering DATA_INS by creation date range (incl time)
  // - filtering TIME by execution date range (incl time)
  // immediately after that, open query
  // use QuotedStr and fnDateToSqlStr(TDateTime) to format TDateTime parameters for the query
  // if time is not empty, use property Value to extract it from time picker
  // time must be added to date before casting to string
 
  //filtering HDL_D02
  if (HdlD02 <> 0) then
    frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + Format(' and HDL_D02_D11 = %d', [HdlD02]);
 
  // filtering DATA_INS by creation date range, filtering TIME by execution date range
  frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + fnGetSqlConditions('DATA_INS_D11', dpCreated, edtTimeCreatedFrom, edtTimeCreatedTo) + fnGetSqlConditions('TIME_D11', dpExecuted, edtTimeExecutedFrom, edtTimeExecutedTo);
 
  frmSQLGridFrame1.SQLText := frmSQLGridFrame1.SQLText + ' order by DATA_INS_D11 desc';
 
  frmSQLGridFrame1.prOpenQuery;
  frmSQLGridFrame1.OnRowRefresh := prRowInfo;
  frmSQLGridFrame1.VisibleColumnsList.Values['DATA_INS_D11'] := 'Created';
end;

変更されたテキスト

ファイルを開く

function fnGetSqlConditions(const ASqlColumnName: String;
  const ADatePicker: TDatePickerFrame;
  const ATimePickerFrom, ATimePickerTo: TTimePickerFrame): String;
begin
  Result := '';
  if (ADatePicker.DateFrom <> 0) then begin
    if (not ATimePickerFrom.fnIsEmpty()) then
      Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom + ATimePickerFrom.Value))])
    else
      Result := Result + Format(' and %s >= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateFrom))]);
  end;
 
  if (ADatePicker.DateTo <> 0) then begin
    if (not ATimePickerTo.fnIsEmpty()) then
      Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo + ATimePickerTo.Value))])
    else
      Result := Result + Format(' and %s <= %s', [ASqlColumnName, QuotedStr(fnDateToSqlStr(ADatePicker.DateTo))]);
  end;
end;