テキスト比較

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

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Comparing sensitive data, confidential files or internal emails?

Most legal and privacy policies prohibit uploading sensitive data online. Diffchecker Desktop ensures your confidential information never leaves your computer. Work offline and compare documents securely.

Download Diffchecker Desktop Learn more

pipeline 14.4 - > 14.5

Created 2 years agoDiff never expires

42 removals

118 lines

7 additions

85 lines

version: 140004

version: 140005

PGconn.connect_start(b'')

<- <psycopg.pq.pq_ctypes.PGconn [MADE] at 0x7f2144761cc0>

<- <psycopg.pq.pq_ctypes.PGconn [MADE] at 0x7f708903dc20>

PGconn.connect_poll()

<- 1

PGconn.connect_poll()

<- 3

PGconn.trace(2)

PGconn.set_trace_flags(<Trace.REGRESS_MODE|SUPPRESS_TIMESTAMPS: 3>)

enter: entering

PGconn.enter_pipeline_mode()

enter: entered, level=1

PGconn.parameter_status(b'client_encoding')

<- b'UTF8'

PGconn.parameter_status(b'client_encoding')

<- b'UTF8'

waiting for Wait.RW

ready for Ready.W

PGconn.flush()

<- 0

PGconn.send_query(b'BEGIN')

F 13 Parse "" "BEGIN" 0

F 12 Bind "" "" 0 0 0

F 6 Describe P ""

F 9 Execute "" 0

F 6 Close P ""

waiting for Wait.RW

ready for Ready.W

PGconn.flush()

<- 0

PGconn.send_query_params(b'select 1', None, param_formats=None, param_types=(), result_format=<Format.TEXT: 0>)

F 16 Parse "" "select 1" 0

F 14 Bind "" "" 0 0 1 0

F 6 Describe P ""

F 9 Execute "" 0

waiting for Wait.RW

ready for Ready.W

PGconn.flush()

<- 0

exit: enqueue

exit: communicate

waiting for Wait.RW

ready for Ready.W

PGconn.flush()

<- 0

PGconn.pipeline_sync()

F 4 Sync

waiting for Wait.RW

ready for Ready.RW

PGconn.consume_input()

PGconn.notifies()

B 4 ParseComplete

B 4 BindComplete

B 4 NoData

B 10 CommandComplete "BEGIN"

<- None

PGconn.is_busy()

<- 0

PGconn.get_result()

<- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f2144760f70>

PGconn.is_busy()

<- 0

PGconn.get_result()

<- None

PGconn.is_busy()

B 4 CloseComplete

B 4 ParseComplete

B 4 BindComplete

B 33 RowDescription 1 "?column?" NNNN 0 NNNN 4 -1 0

B 11 DataRow 1 1 '1'

B 13 CommandComplete "SELECT 1"

<- 0

<- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f708903cf70>

PGconn.get_result()

<- <psycopg.pq.pq_ctypes.PGresult [TUPLES_OK] at 0x7f2144760a60>

PGconn.is_busy()

<- 0

PGconn.get_result()

<- None

PGconn.is_busy()

B 5 ReadyForQuery T

<- 0

PGconn.get_result()

<- <psycopg.pq.pq_ctypes.PGresult [PIPELINE_SYNC] at 0x7f2144760a30>

<- <psycopg.pq.pq_ctypes.PGresult [PIPELINE_SYNC] at 0x7f708903ca60>

PGconn.is_busy()

<- 0

<- 1

PGconn.get_result()

<- None

PGconn.flush()

<- 0

exit: finally

exit: exited

PGconn.exit_pipeline_mode()

PGconn.send_query(b'COMMIT')

F 11 Query "COMMIT"

PGconn.flush()

<- 0

PGconn.is_busy()

<- 1

waiting for Wait.R

ready for Ready.R

PGconn.consume_input()

PGconn.is_busy()

B 11 CommandComplete "COMMIT"

<- 0

PGconn.notifies()

<- None

PGconn.get_result()

<- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f2144760e20>

PGconn.is_busy()

B 5 ReadyForQuery I

<- 0

PGconn.notifies()

<- None

PGconn.get_result()

<- None

PGconn.finish()

F 4 Terminate

保存された差分

原文

Open file

version: 140004
PGconn.connect_start(b'')
    <- <psycopg.pq.pq_ctypes.PGconn [MADE] at 0x7f2144761cc0>
PGconn.connect_poll()
    <- 1
PGconn.connect_poll()
    <- 3
PGconn.trace(2)
PGconn.set_trace_flags(<Trace.REGRESS_MODE|SUPPRESS_TIMESTAMPS: 3>)
enter: entering
PGconn.enter_pipeline_mode()
enter: entered, level=1
PGconn.parameter_status(b'client_encoding')
    <- b'UTF8'
PGconn.parameter_status(b'client_encoding')
    <- b'UTF8'
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.send_query(b'BEGIN')
F	13	Parse	 "" "BEGIN" 0
F	12	Bind	 "" "" 0 0 0
F	6	Describe	 P ""
F	9	Execute	 "" 0
F	6	Close	 P ""
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.send_query_params(b'select 1', None, param_formats=None, param_types=(), result_format=<Format.TEXT: 0>)
F	16	Parse	 "" "select 1" 0
F	14	Bind	 "" "" 0 0 1 0
F	6	Describe	 P ""
F	9	Execute	 "" 0
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
exit: enqueue
exit: communicate
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.pipeline_sync()
F	4	Sync
waiting for Wait.RW
ready for Ready.RW
PGconn.consume_input()
PGconn.notifies()
B	4	ParseComplete
B	4	BindComplete
B	4	NoData
B	10	CommandComplete	 "BEGIN"
    <- None
PGconn.is_busy()
    <- 0
PGconn.get_result()
    <- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f2144760f70>
PGconn.is_busy()
    <- 0
PGconn.get_result()
    <- None
PGconn.is_busy()
B	4	CloseComplete
B	4	ParseComplete
B	4	BindComplete
B	33	RowDescription	 1 "?column?" NNNN 0 NNNN 4 -1 0
B	11	DataRow	 1 1 '1'
B	13	CommandComplete	 "SELECT 1"
    <- 0
PGconn.get_result()
    <- <psycopg.pq.pq_ctypes.PGresult [TUPLES_OK] at 0x7f2144760a60>
PGconn.is_busy()
    <- 0
PGconn.get_result()
    <- None
PGconn.is_busy()
B	5	ReadyForQuery	 T
    <- 0
PGconn.get_result()
    <- <psycopg.pq.pq_ctypes.PGresult [PIPELINE_SYNC] at 0x7f2144760a30>
PGconn.is_busy()
    <- 0
PGconn.get_result()
    <- None
PGconn.flush()
    <- 0
exit: finally
exit: exited
PGconn.exit_pipeline_mode()
PGconn.send_query(b'COMMIT')
F	11	Query	 "COMMIT"
PGconn.flush()
    <- 0
PGconn.is_busy()
    <- 1
waiting for Wait.R
ready for Ready.R
PGconn.consume_input()
PGconn.is_busy()
B	11	CommandComplete	 "COMMIT"
    <- 0
PGconn.notifies()
    <- None
PGconn.get_result()
    <- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f2144760e20>
PGconn.is_busy()
B	5	ReadyForQuery	 I
    <- 0
PGconn.notifies()
    <- None
PGconn.get_result()
    <- None
PGconn.finish()
F	4	Terminate

変更されたテキスト

Open file

version: 140005
PGconn.connect_start(b'')
    <- <psycopg.pq.pq_ctypes.PGconn [MADE] at 0x7f708903dc20>
PGconn.connect_poll()
    <- 1
PGconn.connect_poll()
    <- 3
PGconn.trace(2)
PGconn.set_trace_flags(<Trace.REGRESS_MODE|SUPPRESS_TIMESTAMPS: 3>)
enter: entering
PGconn.enter_pipeline_mode()
enter: entered, level=1
PGconn.parameter_status(b'client_encoding')
    <- b'UTF8'
PGconn.parameter_status(b'client_encoding')
    <- b'UTF8'
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.send_query(b'BEGIN')
F	13	Parse	 "" "BEGIN" 0
F	12	Bind	 "" "" 0 0 0
F	6	Describe	 P ""
F	9	Execute	 "" 0
F	6	Close	 P ""
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.send_query_params(b'select 1', None, param_formats=None, param_types=(), result_format=<Format.TEXT: 0>)
F	16	Parse	 "" "select 1" 0
F	14	Bind	 "" "" 0 0 1 0
F	6	Describe	 P ""
F	9	Execute	 "" 0
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
exit: enqueue
exit: communicate
waiting for Wait.RW
ready for Ready.W
PGconn.flush()
    <- 0
PGconn.pipeline_sync()
F	4	Sync
waiting for Wait.RW
ready for Ready.RW
PGconn.consume_input()
PGconn.notifies()
B	4	ParseComplete
B	4	BindComplete
B	4	NoData
B	10	CommandComplete	 "BEGIN"
    <- None
PGconn.is_busy()
    <- 0
PGconn.get_result()
B	4	CloseComplete
B	4	ParseComplete
B	4	BindComplete
B	33	RowDescription	 1 "?column?" NNNN 0 NNNN 4 -1 0
B	11	DataRow	 1 1 '1'
B	13	CommandComplete	 "SELECT 1"
    <- <psycopg.pq.pq_ctypes.PGresult [COMMAND_OK] at 0x7f708903cf70>
PGconn.is_busy()
    <- 0
PGconn.get_result()
    <- None
PGconn.is_busy()
B	5	ReadyForQuery	 T
    <- 0
PGconn.get_result()
    <- <psycopg.pq.pq_ctypes.PGresult [PIPELINE_SYNC] at 0x7f708903ca60>
PGconn.is_busy()
    <- 1
PGconn.flush()
    <- 0
exit: finally
PGconn.is_busy()
    <- 1
waiting for Wait.R
^Z