Use LF as the line-ending.

We had accumulated some Windows-style CR+LF line endings in expected output.
Let's be consistent.

diff --git a/test/expected/alter_1.out b/test/expected/alter_1.out
index 18041c7b464d6ffa2a336100203762f444fbaac8..a26924162b951f7accf8be77a6b64ecb620aad15 100644 (file)
--- a/test/expected/alter_1.out
+++ b/test/expected/alter_1.out
@@ -1,6 +1,6 @@
-connected\r
-Result set metadata:\r
-t: WVARCHAR(40) digits: 0, nullable\r
-Result set metadata:\r
-t: WVARCHAR(80) digits: 0, nullable\r
-disconnecting\r
+connected
+Result set metadata:
+t: WVARCHAR(40) digits: 0, nullable
+Result set metadata:
+t: WVARCHAR(80) digits: 0, nullable
+disconnecting

diff --git a/test/expected/catalogfunctions_1.out b/test/expected/catalogfunctions_1.out
index 420dced810bbb8bf79b99b44e96bea2bcc8d3a78..baec30905ea652c6bd5ea2b2b8018d0b3708cc5b 100644 (file)
--- a/test/expected/catalogfunctions_1.out
+++ b/test/expected/catalogfunctions_1.out
@@ -1,200 +1,200 @@
-connected\r
-Check for SQLTypeInfo\r
-Result set metadata:\r
-TYPE_NAME: WVARCHAR(128) digits: 0, nullable\r
-DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-PRECISION: INTEGER(10) digits: 0, nullable\r
-LITERAL_PREFIX: WVARCHAR(128) digits: 0, nullable\r
-LITERAL_SUFFIX: WVARCHAR(128) digits: 0, nullable\r
-CREATE_PARAMS: WVARCHAR(128) digits: 0, nullable\r
-NULLABLE: SMALLINT(5) digits: 0, nullable\r
-CASE_SENSITIVE: SMALLINT(5) digits: 0, nullable\r
-SEARCHABLE: SMALLINT(5) digits: 0, nullable\r
-UNSIGNED_ATTRIBUTE: SMALLINT(5) digits: 0, nullable\r
-MONEY: SMALLINT(5) digits: 0, nullable\r
-AUTO_INCREMENT: SMALLINT(5) digits: 0, nullable\r
-LOCAL_TYPE_NAME: WVARCHAR(128) digits: 0, nullable\r
-MINIMUM_SCALE: SMALLINT(5) digits: 0, nullable\r
-MAXIMUM_SCALE: SMALLINT(5) digits: 0, nullable\r
-SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable\r
-NUM_PREC_RADIX: INTEGER(10) digits: 0, nullable\r
-INTERVAL_PRECISION: SMALLINT(5) digits: 0, nullable\r
-Result set:\r
-varchar    12  255 '   '   max. length 1   1   3   NULL    0   NULL    NULL    NULL    NULL    -9  NULL    NULL    0\r
-Check for SQLTables\r
-Result set metadata:\r
-TABLE_CAT: WVARCHAR(128) digits: 0, nullable\r
-TABLE_SCHEM: WVARCHAR(128) digits: 0, nullable\r
-TABLE_NAME: WVARCHAR(128) digits: 0, nullable\r
-TABLE_TYPE: WVARCHAR(128) digits: 0, nullable\r
-REMARKS: WVARCHAR(254) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  booltab TABLE   \r
-contrib_regression public  byteatab    TABLE   \r
-contrib_regression public  intervaltable   TABLE   \r
-contrib_regression public  lo_test_tab TABLE   \r
-contrib_regression public  testtab1    TABLE   \r
-contrib_regression public  testtab_fk  TABLE   \r
-Check for SQLColumns\r
-Result set metadata:\r
-TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_OWNER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_NAME: WVARCHAR(128) digits: 0, nullable\r
-DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-TYPE_NAME: WVARCHAR(128) digits: 0, nullable\r
-PRECISION: INTEGER(10) digits: 0, nullable\r
-LENGTH: INTEGER(10) digits: 0, nullable\r
-SCALE: SMALLINT(5) digits: 0, nullable\r
-RADIX: SMALLINT(5) digits: 0, nullable\r
-NULLABLE: SMALLINT(5) digits: 0, nullable\r
-REMARKS: WVARCHAR(254) digits: 0, nullable\r
-COLUMN_DEF: WVARCHAR(254) digits: 0, nullable\r
-SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable\r
-CHAR_OCTET_LENGTH: INTEGER(10) digits: 0, nullable\r
-ORDINAL_POSITION: INTEGER(10) digits: 0, nullable\r
-IS_NULLABLE: WVARCHAR(254) digits: 0, nullable\r
-DISPLAY_SIZE: INTEGER(10) digits: 0, nullable\r
-FIELD_TYPE: INTEGER(10) digits: 0, nullable\r
-AUTO_INCREMENT: INTEGER(10) digits: 0, nullable\r
-PHYSICAL NUMBER: SMALLINT(5) digits: 0, nullable\r
-TABLE OID: INTEGER(10) digits: 0, nullable\r
-BASE TYPEID: INTEGER(10) digits: 0, nullable\r
-TYPMOD: INTEGER(10) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  booltab id  4   int4\r
-contrib_regression public  booltab t   -9  varchar\r
-contrib_regression public  booltab b   12  bool\r
-contrib_regression public  byteatab    id  4   int4\r
-contrib_regression public  byteatab    t   -3  bytea\r
-contrib_regression public  intervaltable   id  4   int4\r
-contrib_regression public  intervaltable   iv  -9  interval\r
-contrib_regression public  intervaltable   d   -9  varchar\r
-contrib_regression public  lo_test_tab id  4   int4\r
-contrib_regression public  lo_test_tab large_data  -4  lo\r
-contrib_regression public  testtab1    id  4   int4\r
-contrib_regression public  testtab1    t   -9  varchar\r
-contrib_regression public  testtab1_pkey   id  4   int4\r
-contrib_regression public  testtab_fk  id  4   int4\r
-contrib_regression public  testtab_fk  t   -9  varchar\r
-Check for SQLSpecialColumns\r
-Result set metadata:\r
-SCOPE: SMALLINT(5) digits: 0, nullable\r
-COLUMN_NAME: WVARCHAR(128) digits: 0, nullable\r
-DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-TYPE_NAME: WVARCHAR(128) digits: 0, nullable\r
-PRECISION: INTEGER(10) digits: 0, nullable\r
-LENGTH: INTEGER(10) digits: 0, nullable\r
-SCALE: SMALLINT(5) digits: 0, nullable\r
-PSEUDO_COLUMN: SMALLINT(5) digits: 0, nullable\r
-Result set:\r
-NULL   xmin    4   xid 10  4   0   2\r
-Check for SQLStatistics\r
-Result set metadata:\r
-TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_OWNER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_NAME: WVARCHAR(128) digits: 0, nullable\r
-NON_UNIQUE: SMALLINT(5) digits: 0, nullable\r
-INDEX_QUALIFIER: WVARCHAR(128) digits: 0, nullable\r
-INDEX_NAME: WVARCHAR(128) digits: 0, nullable\r
-TYPE: SMALLINT(5) digits: 0, nullable\r
-SEQ_IN_INDEX: SMALLINT(5) digits: 0, nullable\r
-COLUMN_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLLATION: WCHAR(1) digits: 0, nullable\r
-CARDINALITY: INTEGER(10) digits: 0, nullable\r
-PAGES: INTEGER(10) digits: 0, nullable\r
-FILTER_CONDITION: WVARCHAR(128) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  testtab1    0   public  testtab1_pkey   3   1   id  A   NULL    NULL    NULL\r
-Check for SQLPrimaryKeys\r
-Result set metadata:\r
-TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_OWNER: WVARCHAR(128) digits: 0, nullable\r
-TABLE_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_NAME: WVARCHAR(128) digits: 0, nullable\r
-KEY_SEQ: SMALLINT(5) digits: 0, nullable\r
-PK_NAME: WVARCHAR(128) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  testtab1    id  1   testtab1_pkey\r
-Check for SQLForeignKeys\r
-Result set metadata:\r
-pktable_cat: WVARCHAR(63) digits: 0, nullable\r
-pktable_schem: WVARCHAR(63) digits: 0, not nullable\r
-pktable_name: WVARCHAR(63) digits: 0, not nullable\r
-pkcolumn_name: WVARCHAR(63) digits: 0, not nullable\r
-fktable_cat: WVARCHAR(63) digits: 0, nullable\r
-fktable_schem: WVARCHAR(63) digits: 0, not nullable\r
-fktable_name: WVARCHAR(63) digits: 0, not nullable\r
-fkcolumn_name: WVARCHAR(63) digits: 0, not nullable\r
-key_seq: SMALLINT(5) digits: 0, nullable\r
-update_rule: SMALLINT(5) digits: 0, nullable\r
-delete_rule: SMALLINT(5) digits: 0, nullable\r
-fk_name: WVARCHAR(63) digits: 0, not nullable\r
-pk_name: WVARCHAR(63) digits: 0, not nullable\r
-deferrablity: SMALLINT(5) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  testtab1    id  contrib_regression  public  testtab_fk  id  1   3   3   testtab_fk_id_fkey  testtab1_pkey   7\r
-Check for SQLProcedures\r
-Result set metadata:\r
-procedure_cat: WVARCHAR(255) digits: 0, nullable\r
-procedure_schem: WVARCHAR(63) digits: 0, not nullable\r
-procedure_name: WVARCHAR(63) digits: 0, not nullable\r
-num_input_params: WVARCHAR(255) digits: 0, nullable\r
-num_output_params: WVARCHAR(255) digits: 0, nullable\r
-num_result_sets: WVARCHAR(255) digits: 0, nullable\r
-remarks: WVARCHAR(255) digits: 0, nullable\r
-procedure_type: SMALLINT(5) digits: 0, nullable\r
-Result set:\r
-   public  simple_add                  2\r
-Check for SQLProcedureColumns\r
-Result set metadata:\r
-PROCEDURE_CAT: WVARCHAR(128) digits: 0, nullable\r
-PROCEDUR_SCHEM: WVARCHAR(128) digits: 0, nullable\r
-PROCEDURE_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_TYPE: SMALLINT(5) digits: 0, nullable\r
-DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-TYPE_NAME: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_SIZE: INTEGER(10) digits: 0, nullable\r
-BUFFER_LENGTH: INTEGER(10) digits: 0, nullable\r
-DECIMAL_DIGITS: SMALLINT(5) digits: 0, nullable\r
-NUM_PREC_RADIX: SMALLINT(5) digits: 0, nullable\r
-NULLABLE: SMALLINT(5) digits: 0, nullable\r
-REMARKS: WVARCHAR(128) digits: 0, nullable\r
-COLUMN_DEF: WVARCHAR(128) digits: 0, nullable\r
-SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable\r
-SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable\r
-CHAR_OCTET_LENGTH: INTEGER(10) digits: 0, nullable\r
-ORDINAL_POSITION: INTEGER(10) digits: 0, nullable\r
-IS_NULLABLE: WVARCHAR(128) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  simple_add      1   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    1   \r
-contrib_regression public  simple_add      1   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    2   \r
-contrib_regression public  simple_add      4   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    3   \r
-Check for SQLTablePrivileges\r
-Result set metadata:\r
-TABLE_CAT: WVARCHAR(128) digits: 0, nullable\r
-TABLE_SCHEM: WVARCHAR(128) digits: 0, nullable\r
-TABLE_NAME: WVARCHAR(128) digits: 0, nullable\r
-GRANTOR: WVARCHAR(128) digits: 0, nullable\r
-GRANTEE: WVARCHAR(128) digits: 0, nullable\r
-PRIVILEGE: WVARCHAR(128) digits: 0, nullable\r
-IS_GRANTABLE: WVARCHAR(128) digits: 0, nullable\r
-Result set:\r
-contrib_regression public  testtab1    _SYSTEM INSERT  YES\r
-contrib_regression public  testtab1    _SYSTEM SELECT  YES\r
-contrib_regression public  testtab1    _SYSTEM UPDATE  YES\r
-contrib_regression public  testtab1    _SYSTEM DELETE  YES\r
-contrib_regression public  testtab1    _SYSTEM REFERENCES  YES\r
-Check for SQLGetInfo\r
-Term for "table": table\r
-Result set:\r
-contrib_regression public  testtab1    TABLE   \r
-contrib_regression public  testtab_fk  TABLE   \r
-Result set:\r
-disconnecting\r
-connected\r
-Result set:\r
-disconnecting\r
+connected
+Check for SQLTypeInfo
+Result set metadata:
+TYPE_NAME: WVARCHAR(128) digits: 0, nullable
+DATA_TYPE: SMALLINT(5) digits: 0, nullable
+PRECISION: INTEGER(10) digits: 0, nullable
+LITERAL_PREFIX: WVARCHAR(128) digits: 0, nullable
+LITERAL_SUFFIX: WVARCHAR(128) digits: 0, nullable
+CREATE_PARAMS: WVARCHAR(128) digits: 0, nullable
+NULLABLE: SMALLINT(5) digits: 0, nullable
+CASE_SENSITIVE: SMALLINT(5) digits: 0, nullable
+SEARCHABLE: SMALLINT(5) digits: 0, nullable
+UNSIGNED_ATTRIBUTE: SMALLINT(5) digits: 0, nullable
+MONEY: SMALLINT(5) digits: 0, nullable
+AUTO_INCREMENT: SMALLINT(5) digits: 0, nullable
+LOCAL_TYPE_NAME: WVARCHAR(128) digits: 0, nullable
+MINIMUM_SCALE: SMALLINT(5) digits: 0, nullable
+MAXIMUM_SCALE: SMALLINT(5) digits: 0, nullable
+SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable
+SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable
+NUM_PREC_RADIX: INTEGER(10) digits: 0, nullable
+INTERVAL_PRECISION: SMALLINT(5) digits: 0, nullable
+Result set:
+varchar    12  255 '   '   max. length 1   1   3   NULL    0   NULL    NULL    NULL    NULL    -9  NULL    NULL    0
+Check for SQLTables
+Result set metadata:
+TABLE_CAT: WVARCHAR(128) digits: 0, nullable
+TABLE_SCHEM: WVARCHAR(128) digits: 0, nullable
+TABLE_NAME: WVARCHAR(128) digits: 0, nullable
+TABLE_TYPE: WVARCHAR(128) digits: 0, nullable
+REMARKS: WVARCHAR(254) digits: 0, nullable
+Result set:
+contrib_regression public  booltab TABLE   
+contrib_regression public  byteatab    TABLE   
+contrib_regression public  intervaltable   TABLE   
+contrib_regression public  lo_test_tab TABLE   
+contrib_regression public  testtab1    TABLE   
+contrib_regression public  testtab_fk  TABLE   
+Check for SQLColumns
+Result set metadata:
+TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable
+TABLE_OWNER: WVARCHAR(128) digits: 0, nullable
+TABLE_NAME: WVARCHAR(128) digits: 0, nullable
+COLUMN_NAME: WVARCHAR(128) digits: 0, nullable
+DATA_TYPE: SMALLINT(5) digits: 0, nullable
+TYPE_NAME: WVARCHAR(128) digits: 0, nullable
+PRECISION: INTEGER(10) digits: 0, nullable
+LENGTH: INTEGER(10) digits: 0, nullable
+SCALE: SMALLINT(5) digits: 0, nullable
+RADIX: SMALLINT(5) digits: 0, nullable
+NULLABLE: SMALLINT(5) digits: 0, nullable
+REMARKS: WVARCHAR(254) digits: 0, nullable
+COLUMN_DEF: WVARCHAR(254) digits: 0, nullable
+SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable
+SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable
+CHAR_OCTET_LENGTH: INTEGER(10) digits: 0, nullable
+ORDINAL_POSITION: INTEGER(10) digits: 0, nullable
+IS_NULLABLE: WVARCHAR(254) digits: 0, nullable
+DISPLAY_SIZE: INTEGER(10) digits: 0, nullable
+FIELD_TYPE: INTEGER(10) digits: 0, nullable
+AUTO_INCREMENT: INTEGER(10) digits: 0, nullable
+PHYSICAL NUMBER: SMALLINT(5) digits: 0, nullable
+TABLE OID: INTEGER(10) digits: 0, nullable
+BASE TYPEID: INTEGER(10) digits: 0, nullable
+TYPMOD: INTEGER(10) digits: 0, nullable
+Result set:
+contrib_regression public  booltab id  4   int4
+contrib_regression public  booltab t   -9  varchar
+contrib_regression public  booltab b   12  bool
+contrib_regression public  byteatab    id  4   int4
+contrib_regression public  byteatab    t   -3  bytea
+contrib_regression public  intervaltable   id  4   int4
+contrib_regression public  intervaltable   iv  -9  interval
+contrib_regression public  intervaltable   d   -9  varchar
+contrib_regression public  lo_test_tab id  4   int4
+contrib_regression public  lo_test_tab large_data  -4  lo
+contrib_regression public  testtab1    id  4   int4
+contrib_regression public  testtab1    t   -9  varchar
+contrib_regression public  testtab1_pkey   id  4   int4
+contrib_regression public  testtab_fk  id  4   int4
+contrib_regression public  testtab_fk  t   -9  varchar
+Check for SQLSpecialColumns
+Result set metadata:
+SCOPE: SMALLINT(5) digits: 0, nullable
+COLUMN_NAME: WVARCHAR(128) digits: 0, nullable
+DATA_TYPE: SMALLINT(5) digits: 0, nullable
+TYPE_NAME: WVARCHAR(128) digits: 0, nullable
+PRECISION: INTEGER(10) digits: 0, nullable
+LENGTH: INTEGER(10) digits: 0, nullable
+SCALE: SMALLINT(5) digits: 0, nullable
+PSEUDO_COLUMN: SMALLINT(5) digits: 0, nullable
+Result set:
+NULL   xmin    4   xid 10  4   0   2
+Check for SQLStatistics
+Result set metadata:
+TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable
+TABLE_OWNER: WVARCHAR(128) digits: 0, nullable
+TABLE_NAME: WVARCHAR(128) digits: 0, nullable
+NON_UNIQUE: SMALLINT(5) digits: 0, nullable
+INDEX_QUALIFIER: WVARCHAR(128) digits: 0, nullable
+INDEX_NAME: WVARCHAR(128) digits: 0, nullable
+TYPE: SMALLINT(5) digits: 0, nullable
+SEQ_IN_INDEX: SMALLINT(5) digits: 0, nullable
+COLUMN_NAME: WVARCHAR(128) digits: 0, nullable
+COLLATION: WCHAR(1) digits: 0, nullable
+CARDINALITY: INTEGER(10) digits: 0, nullable
+PAGES: INTEGER(10) digits: 0, nullable
+FILTER_CONDITION: WVARCHAR(128) digits: 0, nullable
+Result set:
+contrib_regression public  testtab1    0   public  testtab1_pkey   3   1   id  A   NULL    NULL    NULL
+Check for SQLPrimaryKeys
+Result set metadata:
+TABLE_QUALIFIER: WVARCHAR(128) digits: 0, nullable
+TABLE_OWNER: WVARCHAR(128) digits: 0, nullable
+TABLE_NAME: WVARCHAR(128) digits: 0, nullable
+COLUMN_NAME: WVARCHAR(128) digits: 0, nullable
+KEY_SEQ: SMALLINT(5) digits: 0, nullable
+PK_NAME: WVARCHAR(128) digits: 0, nullable
+Result set:
+contrib_regression public  testtab1    id  1   testtab1_pkey
+Check for SQLForeignKeys
+Result set metadata:
+pktable_cat: WVARCHAR(63) digits: 0, nullable
+pktable_schem: WVARCHAR(63) digits: 0, not nullable
+pktable_name: WVARCHAR(63) digits: 0, not nullable
+pkcolumn_name: WVARCHAR(63) digits: 0, not nullable
+fktable_cat: WVARCHAR(63) digits: 0, nullable
+fktable_schem: WVARCHAR(63) digits: 0, not nullable
+fktable_name: WVARCHAR(63) digits: 0, not nullable
+fkcolumn_name: WVARCHAR(63) digits: 0, not nullable
+key_seq: SMALLINT(5) digits: 0, nullable
+update_rule: SMALLINT(5) digits: 0, nullable
+delete_rule: SMALLINT(5) digits: 0, nullable
+fk_name: WVARCHAR(63) digits: 0, not nullable
+pk_name: WVARCHAR(63) digits: 0, not nullable
+deferrablity: SMALLINT(5) digits: 0, nullable
+Result set:
+contrib_regression public  testtab1    id  contrib_regression  public  testtab_fk  id  1   3   3   testtab_fk_id_fkey  testtab1_pkey   7
+Check for SQLProcedures
+Result set metadata:
+procedure_cat: WVARCHAR(255) digits: 0, nullable
+procedure_schem: WVARCHAR(63) digits: 0, not nullable
+procedure_name: WVARCHAR(63) digits: 0, not nullable
+num_input_params: WVARCHAR(255) digits: 0, nullable
+num_output_params: WVARCHAR(255) digits: 0, nullable
+num_result_sets: WVARCHAR(255) digits: 0, nullable
+remarks: WVARCHAR(255) digits: 0, nullable
+procedure_type: SMALLINT(5) digits: 0, nullable
+Result set:
+   public  simple_add                  2
+Check for SQLProcedureColumns
+Result set metadata:
+PROCEDURE_CAT: WVARCHAR(128) digits: 0, nullable
+PROCEDUR_SCHEM: WVARCHAR(128) digits: 0, nullable
+PROCEDURE_NAME: WVARCHAR(128) digits: 0, nullable
+COLUMN_NAME: WVARCHAR(128) digits: 0, nullable
+COLUMN_TYPE: SMALLINT(5) digits: 0, nullable
+DATA_TYPE: SMALLINT(5) digits: 0, nullable
+TYPE_NAME: WVARCHAR(128) digits: 0, nullable
+COLUMN_SIZE: INTEGER(10) digits: 0, nullable
+BUFFER_LENGTH: INTEGER(10) digits: 0, nullable
+DECIMAL_DIGITS: SMALLINT(5) digits: 0, nullable
+NUM_PREC_RADIX: SMALLINT(5) digits: 0, nullable
+NULLABLE: SMALLINT(5) digits: 0, nullable
+REMARKS: WVARCHAR(128) digits: 0, nullable
+COLUMN_DEF: WVARCHAR(128) digits: 0, nullable
+SQL_DATA_TYPE: SMALLINT(5) digits: 0, nullable
+SQL_DATETIME_SUB: SMALLINT(5) digits: 0, nullable
+CHAR_OCTET_LENGTH: INTEGER(10) digits: 0, nullable
+ORDINAL_POSITION: INTEGER(10) digits: 0, nullable
+IS_NULLABLE: WVARCHAR(128) digits: 0, nullable
+Result set:
+contrib_regression public  simple_add      1   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    1   
+contrib_regression public  simple_add      1   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    2   
+contrib_regression public  simple_add      4   4   int4    10  4   0   10  2   NULL    NULL    4   NULL    NULL    3   
+Check for SQLTablePrivileges
+Result set metadata:
+TABLE_CAT: WVARCHAR(128) digits: 0, nullable
+TABLE_SCHEM: WVARCHAR(128) digits: 0, nullable
+TABLE_NAME: WVARCHAR(128) digits: 0, nullable
+GRANTOR: WVARCHAR(128) digits: 0, nullable
+GRANTEE: WVARCHAR(128) digits: 0, nullable
+PRIVILEGE: WVARCHAR(128) digits: 0, nullable
+IS_GRANTABLE: WVARCHAR(128) digits: 0, nullable
+Result set:
+contrib_regression public  testtab1    _SYSTEM INSERT  YES
+contrib_regression public  testtab1    _SYSTEM SELECT  YES
+contrib_regression public  testtab1    _SYSTEM UPDATE  YES
+contrib_regression public  testtab1    _SYSTEM DELETE  YES
+contrib_regression public  testtab1    _SYSTEM REFERENCES  YES
+Check for SQLGetInfo
+Term for "table": table
+Result set:
+contrib_regression public  testtab1    TABLE   
+contrib_regression public  testtab_fk  TABLE   
+Result set:
+disconnecting
+connected
+Result set:
+disconnecting

diff --git a/test/expected/colattribute_2.out b/test/expected/colattribute_2.out
index 4aca48a74e9279ff05e40b97e9158943457ff0c2..fb963dbacc8a7d28c294c1fb90b7c6a0e92ddab7 100644 (file)
--- a/test/expected/colattribute_2.out
+++ b/test/expected/colattribute_2.out
@@ -1,160 +1,160 @@
-Running tests with UnknownSizes=-1;MaxVarcharSize=100...\r
-connected\r
-Testing SQLColAttribute...\r
-\r
--- Column 1: intcol --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: int4\r
-\r
--- Column 2: textcol --\r
-SQL_DESC_OCTET_LENGTH: 16380\r
-SQL_DESC_TYPE_NAME: text\r
-\r
--- Column 3: unknowncol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: unknown\r
-\r
--- Column 4: varcharcol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 5: empty_varchar_col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 6: varchar5col --\r
-SQL_DESC_OCTET_LENGTH: 10\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 7: interval --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: interval day to second\r
-disconnecting\r
-Running tests with UnknownSizes=0;MaxVarcharSize=100...\r
-connected\r
-Testing SQLColAttribute...\r
-\r
--- Column 1: intcol --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: int4\r
-\r
--- Column 2: textcol --\r
-SQL_DESC_OCTET_LENGTH: 16380\r
-SQL_DESC_TYPE_NAME: text\r
-\r
--- Column 3: unknowncol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: unknown\r
-\r
--- Column 4: varcharcol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 5: empty_varchar_col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 6: varchar5col --\r
-SQL_DESC_OCTET_LENGTH: 10\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 7: interval --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: interval day to second\r
-disconnecting\r
-Running tests with UnknownSizes=1;MaxVarcharSize=100...\r
-connected\r
-Testing SQLColAttribute...\r
-\r
--- Column 1: intcol --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: int4\r
-\r
--- Column 2: textcol --\r
-SQL_DESC_OCTET_LENGTH: 16380\r
-SQL_DESC_TYPE_NAME: text\r
-\r
--- Column 3: unknowncol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: unknown\r
-\r
--- Column 4: varcharcol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 5: empty_varchar_col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 6: varchar5col --\r
-SQL_DESC_OCTET_LENGTH: 10\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 7: interval --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: interval day to second\r
-disconnecting\r
-Running tests with UnknownSizes=2;MaxVarcharSize=100...\r
-connected\r
-Testing SQLColAttribute...\r
-\r
--- Column 1: intcol --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: int4\r
-\r
--- Column 2: textcol --\r
-SQL_DESC_OCTET_LENGTH: 12\r
-SQL_DESC_TYPE_NAME: text\r
-\r
--- Column 3: unknowncol --\r
-SQL_DESC_OCTET_LENGTH: 28\r
-SQL_DESC_TYPE_NAME: unknown\r
-\r
--- Column 4: varcharcol --\r
-SQL_DESC_OCTET_LENGTH: 28\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 5: empty_varchar_col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 6: varchar5col --\r
-SQL_DESC_OCTET_LENGTH: 10\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 7: interval --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: interval day to second\r
-disconnecting\r
-Running tests with UnknownSizes=100;MaxVarcharSize=100...\r
-connected\r
-Testing SQLColAttribute...\r
-\r
--- Column 1: intcol --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: int4\r
-\r
--- Column 2: textcol --\r
-SQL_DESC_OCTET_LENGTH: 16380\r
-SQL_DESC_TYPE_NAME: text\r
-\r
--- Column 3: unknowncol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: unknown\r
-\r
--- Column 4: varcharcol --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 5: empty_varchar_col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 6: varchar5col --\r
-SQL_DESC_OCTET_LENGTH: 200\r
-SQL_DESC_TYPE_NAME: varchar\r
-\r
--- Column 7: interval --\r
-SQL_DESC_OCTET_LENGTH: 0\r
-SQL_DESC_TYPE_NAME: interval day to second\r
-disconnecting\r
+Running tests with UnknownSizes=-1;MaxVarcharSize=100...
+connected
+Testing SQLColAttribute...
+
+-- Column 1: intcol --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: int4
+
+-- Column 2: textcol --
+SQL_DESC_OCTET_LENGTH: 16380
+SQL_DESC_TYPE_NAME: text
+
+-- Column 3: unknowncol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: unknown
+
+-- Column 4: varcharcol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 5: empty_varchar_col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 6: varchar5col --
+SQL_DESC_OCTET_LENGTH: 10
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 7: interval --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: interval day to second
+disconnecting
+Running tests with UnknownSizes=0;MaxVarcharSize=100...
+connected
+Testing SQLColAttribute...
+
+-- Column 1: intcol --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: int4
+
+-- Column 2: textcol --
+SQL_DESC_OCTET_LENGTH: 16380
+SQL_DESC_TYPE_NAME: text
+
+-- Column 3: unknowncol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: unknown
+
+-- Column 4: varcharcol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 5: empty_varchar_col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 6: varchar5col --
+SQL_DESC_OCTET_LENGTH: 10
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 7: interval --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: interval day to second
+disconnecting
+Running tests with UnknownSizes=1;MaxVarcharSize=100...
+connected
+Testing SQLColAttribute...
+
+-- Column 1: intcol --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: int4
+
+-- Column 2: textcol --
+SQL_DESC_OCTET_LENGTH: 16380
+SQL_DESC_TYPE_NAME: text
+
+-- Column 3: unknowncol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: unknown
+
+-- Column 4: varcharcol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 5: empty_varchar_col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 6: varchar5col --
+SQL_DESC_OCTET_LENGTH: 10
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 7: interval --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: interval day to second
+disconnecting
+Running tests with UnknownSizes=2;MaxVarcharSize=100...
+connected
+Testing SQLColAttribute...
+
+-- Column 1: intcol --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: int4
+
+-- Column 2: textcol --
+SQL_DESC_OCTET_LENGTH: 12
+SQL_DESC_TYPE_NAME: text
+
+-- Column 3: unknowncol --
+SQL_DESC_OCTET_LENGTH: 28
+SQL_DESC_TYPE_NAME: unknown
+
+-- Column 4: varcharcol --
+SQL_DESC_OCTET_LENGTH: 28
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 5: empty_varchar_col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 6: varchar5col --
+SQL_DESC_OCTET_LENGTH: 10
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 7: interval --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: interval day to second
+disconnecting
+Running tests with UnknownSizes=100;MaxVarcharSize=100...
+connected
+Testing SQLColAttribute...
+
+-- Column 1: intcol --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: int4
+
+-- Column 2: textcol --
+SQL_DESC_OCTET_LENGTH: 16380
+SQL_DESC_TYPE_NAME: text
+
+-- Column 3: unknowncol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: unknown
+
+-- Column 4: varcharcol --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 5: empty_varchar_col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 6: varchar5col --
+SQL_DESC_OCTET_LENGTH: 200
+SQL_DESC_TYPE_NAME: varchar
+
+-- Column 7: interval --
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_TYPE_NAME: interval day to second
+disconnecting

diff --git a/test/expected/deprecated_2.out b/test/expected/deprecated_2.out
index 98f0dee88f505df8dafe51734b76df768bdd23c5..4e9b16ad0276dcd0838a74f65bfd07b48b36c739 100644 (file)
--- a/test/expected/deprecated_2.out
+++ b/test/expected/deprecated_2.out
@@ -1,30 +1,30 @@
-Check for SQLAllocEnv\r
-Check for SQLAllocConnect\r
-Check for SQLAllocStmt\r
-Check for SQLSetConnectOption\r
-Check for SQLGetConnectOption\r
-Access type is: read-write\r
-Check for SQLError\r
-Error check: ERROR: relation "table_not_here" does not exist;\r
-Error while executing the query\r
-Check for SQLSetParam\r
-Result set:\r
-100\r
-Check for SQLGetStmtOption\r
-Cursor type is: forward\r
-Check for SQLSetStmtOption\r
-Cursor type is: static\r
-Check for SQLSetScrollOptions\r
-Cursor type is: keyset driven\r
-Check for SQLColAttributes\r
-Column 1: foo\r
-Column 2: bar\r
-Check for SQLParamOptions\r
-Status of execution\r
-Check for SQLFreeStmt\r
-Check for SQLFreeConnect\r
-Check for SQLFreeEnv\r
-connected\r
-Check for SQLTransact\r
-Result set:\r
-disconnecting\r
+Check for SQLAllocEnv
+Check for SQLAllocConnect
+Check for SQLAllocStmt
+Check for SQLSetConnectOption
+Check for SQLGetConnectOption
+Access type is: read-write
+Check for SQLError
+Error check: ERROR: relation "table_not_here" does not exist;
+Error while executing the query
+Check for SQLSetParam
+Result set:
+100
+Check for SQLGetStmtOption
+Cursor type is: forward
+Check for SQLSetStmtOption
+Cursor type is: static
+Check for SQLSetScrollOptions
+Cursor type is: keyset driven
+Check for SQLColAttributes
+Column 1: foo
+Column 2: bar
+Check for SQLParamOptions
+Status of execution
+Check for SQLFreeStmt
+Check for SQLFreeConnect
+Check for SQLFreeEnv
+connected
+Check for SQLTransact
+Result set:
+disconnecting

diff --git a/test/expected/diagnostic_2.out b/test/expected/diagnostic_2.out
index a15dc1bdb31feddecc4b2a7d1bf4c4d141c28d80..244576ad7dae576742ff789507db2f2f7df5b501 100755 (executable)
--- a/test/expected/diagnostic_2.out
+++ b/test/expected/diagnostic_2.out
@@ -1,25 +1,25 @@
-connected\r
-SQLExecDirect\r
-42601=ERROR: syntax error at or near "broken";\r
-Error while executing the query\r
-get same message again\r
-42601=ERROR: syntax error at or near "broken";\r
-Error while executing the query\r
-SQLExecDirect\r
-42601=ERROR: syntax error at or near "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r
-42601=xxxxxxx\r
-42601\r
-killing connection...\r
-57P01=FATAL: terminating connection due to administrator command;\r
-Error while executing the query\r
-SQLGetDiagRec on connection says:\r
-No error information\r
-SQLGetDiagRec called again:\r
-No error information\r
+connected
+SQLExecDirect
+42601=ERROR: syntax error at or near "broken";
+Error while executing the query
+get same message again
+42601=ERROR: syntax error at or near "broken";
+Error while executing the query
+SQLExecDirect
+42601=ERROR: syntax error at or near "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+42601=xxxxxxx
+42601
+killing connection...
+57P01=FATAL: terminating connection due to administrator command;
+Error while executing the query
+SQLGetDiagRec on connection says:
+No error information
+SQLGetDiagRec called again:
+No error information

diff --git a/test/expected/parse_1.out b/test/expected/parse_1.out
index 6f0d04b1f99cd20c1710ba51a70da5f730695d9b..d3d3f5556135292f6b13aafe75c6773f7e9199c9 100644 (file)
--- a/test/expected/parse_1.out
+++ b/test/expected/parse_1.out
@@ -1,12 +1,12 @@
-connected\r
-Result set metadata:\r
-id: INTEGER(10) digits: 0, not nullable\r
-t: WVARCHAR(20) digits: 0, nullable\r
-Result set metadata:\r
-id: INTEGER(10) digits: 0, not nullable\r
-t: WVARCHAR(20) digits: 0, nullable\r
-Result set metadata:\r
-id: INTEGER(10) digits: 0, not nullable\r
-t: WVARCHAR(20) digits: 0, nullable\r
-con"stant: WVARCHAR(7) digits: 0, nullable\r
-disconnecting\r
+connected
+Result set metadata:
+id: INTEGER(10) digits: 0, not nullable
+t: WVARCHAR(20) digits: 0, nullable
+Result set metadata:
+id: INTEGER(10) digits: 0, not nullable
+t: WVARCHAR(20) digits: 0, nullable
+Result set metadata:
+id: INTEGER(10) digits: 0, not nullable
+t: WVARCHAR(20) digits: 0, nullable
+con"stant: WVARCHAR(7) digits: 0, nullable
+disconnecting