Changeset: 369d962db1f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=369d962db1f9
Modified Files:
        sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
        sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
Branch: Dec2016
Log Message:

Remove \r.


diffs (truncated from 402 to 300 lines):

diff --git a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out 
b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
--- a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
+++ b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
@@ -24,112 +24,112 @@ Ready.
 # 16:31:35 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-10384" "--port=31486"
 # 16:31:35 >  
 
-#SELECT COUNT(*) AS duplicates, name FROM sys.schemas GROUP BY name HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, name FROM sys.schemas GROUP BY name HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.schemas # table_name
 % duplicates,  name # name
 % bigint,      varchar # type
 % 1,   0 # length
-#SELECT COUNT(*) AS duplicates, table_type_name FROM sys.table_types GROUP BY 
table_type_name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_type_name FROM sys.table_types GROUP BY 
table_type_name HAVING COUNT(*) > 1;
 % sys.L3,      sys.table_types # table_name
 % duplicates,  table_type_name # name
 % bigint,      varchar # type
 % 1,   0 # length
-#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys._tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys._tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys._tables,    sys._tables # table_name
 % duplicates,  schema_id,      name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, schema_id, name FROM tmp._tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, schema_id, name FROM tmp._tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
 % tmp.L3,      tmp._tables,    tmp._tables # table_name
 % duplicates,  schema_id,      name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys.tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys.tables GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
 % .L40,        .tables,        .tables # table_name
 % duplicates,  schema_id,      name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM sys._columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM sys._columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys._columns,   sys._columns # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp._columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp._columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % tmp.L3,      tmp._columns,   tmp._columns # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.columns GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % .L14,        .columns,       .columns # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, func_id, name FROM sys.args GROUP BY func_id, 
name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, func_id, name FROM sys.args GROUP BY func_id, 
name HAVING COUNT(*) > 1;
 % sys.L3,      sys.args,       sys.args # table_name
 % duplicates,  func_id,        name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, schema_id, systemname, sqlname FROM sys.types 
GROUP BY schema_id, systemname, sqlname HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, schema_id, systemname, sqlname FROM sys.types 
GROUP BY schema_id, systemname, sqlname HAVING COUNT(*) > 1;
 % sys.L3,      sys.types,      sys.types,      sys.types # table_name
 % duplicates,  schema_id,      systemname,     sqlname # name
 % bigint,      int,    varchar,        varchar # type
 % 1,   1,      0,      0 # length
-#SELECT COUNT(*) AS duplicates, id, name FROM sys.objects GROUP BY id, name 
HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id, name FROM sys.objects GROUP BY id, name 
HAVING COUNT(*) > 1;
 % sys.L3,      sys.objects,    sys.objects # table_name
 % duplicates,  id,     name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, id, name FROM tmp.objects GROUP BY id, name 
HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id, name FROM tmp.objects GROUP BY id, name 
HAVING COUNT(*) > 1;
 % tmp.L3,      tmp.objects,    tmp.objects # table_name
 % duplicates,  id,     name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.keys GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.keys GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys.keys,       sys.keys # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.keys GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.keys GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % tmp.L3,      tmp.keys,       tmp.keys # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.idxs GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.idxs GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys.idxs,       sys.idxs # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.idxs GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.idxs GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % tmp.L3,      tmp.idxs,       tmp.idxs # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.triggers GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM sys.triggers GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys.triggers,   sys.triggers # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.triggers GROUP BY 
table_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_id, name FROM tmp.triggers GROUP BY 
table_id, name HAVING COUNT(*) > 1;
 % tmp.L3,      tmp.triggers,   tmp.triggers # table_name
 % duplicates,  table_id,       name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys.sequences GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, schema_id, name FROM sys.sequences GROUP BY 
schema_id, name HAVING COUNT(*) > 1;
 % sys.L3,      sys.sequences,  sys.sequences # table_name
 % duplicates,  schema_id,      name # name
 % bigint,      int,    varchar # type
 % 1,   1,      0 # length
-#SELECT COUNT(*) AS duplicates, dependency_type_name FROM sys.dependency_types 
GROUP BY dependency_type_name HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, dependency_type_name FROM sys.dependency_types 
GROUP BY dependency_type_name HAVING COUNT(*) > 1;
 % sys.L3,      sys.dependency_types # table_name
 % duplicates,  dependency_type_name # name
 % bigint,      varchar # type
 % 1,   0 # length
-#SELECT COUNT(*) AS duplicates, name FROM sys.auths GROUP BY name HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, name FROM sys.auths GROUP BY name HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.auths # table_name
 % duplicates,  name # name
 % bigint,      varchar # type
 % 1,   0 # length
-#SELECT COUNT(*) AS duplicates, def FROM sys.optimizers GROUP BY def HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, def FROM sys.optimizers GROUP BY def HAVING 
COUNT(*) > 1;
 % .L10,        .optimizers # table_name
 % duplicates,  def # name
 % bigint,      clob # type
diff --git a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out 
b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
--- a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
+++ b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
@@ -72,217 +72,217 @@ Ready.
 # 16:31:34 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-10384" "--port=31486"
 # 16:31:34 >  
 
-#SELECT COUNT(*) AS duplicates, id FROM sys.schemas GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.schemas GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.schemas # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, table_type_id FROM sys.table_types GROUP BY 
table_type_id HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, table_type_id FROM sys.table_types GROUP BY 
table_type_id HAVING COUNT(*) > 1;
 % sys.L3,      sys.table_types # table_name
 % duplicates,  table_type_id # name
 % bigint,      smallint # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys._tables GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys._tables GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys._tables # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM tmp._tables GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM tmp._tables GROUP BY id HAVING 
COUNT(*) > 1;
 % tmp.L3,      tmp._tables # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.tables GROUP BY id HAVING COUNT(*) 
> 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.tables GROUP BY id HAVING COUNT(*) 
> 1;
 % .L40,        .tables # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys._columns GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys._columns GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys._columns # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM tmp._columns GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM tmp._columns GROUP BY id HAVING 
COUNT(*) > 1;
 % tmp.L3,      tmp._columns # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.columns GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.columns GROUP BY id HAVING 
COUNT(*) > 1;
 % .L14,        .columns # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.functions GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.functions GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.functions # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, function_id FROM sys.systemfunctions GROUP BY 
function_id HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, function_id FROM sys.systemfunctions GROUP BY 
function_id HAVING COUNT(*) > 1;
 % sys.L3,      sys.systemfunctions # table_name
 % duplicates,  function_id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.args GROUP BY id HAVING COUNT(*) > 
1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.args GROUP BY id HAVING COUNT(*) > 
1;
 % sys.L3,      sys.args # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.types GROUP BY id HAVING COUNT(*) 
> 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.types GROUP BY id HAVING COUNT(*) 
> 1;
 % sys.L3,      sys.types # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id, nr FROM sys.objects GROUP BY id, nr HAVING 
COUNT(*) > 1;  -- without column: nr it returns duplicates
+#SELECT COUNT(*) AS duplicates, id, nr FROM sys.objects GROUP BY id, nr HAVING 
COUNT(*) > 1;  -- without column: nr it returns duplicates
 % sys.L3,      sys.objects,    sys.objects # table_name
 % duplicates,  id,     nr # name
 % bigint,      int,    int # type
 % 1,   1,      1 # length
-#SELECT COUNT(*) AS duplicates, id, nr FROM tmp.objects GROUP BY id, nr HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id, nr FROM tmp.objects GROUP BY id, nr HAVING 
COUNT(*) > 1;
 % tmp.L3,      tmp.objects,    tmp.objects # table_name
 % duplicates,  id,     nr # name
 % bigint,      int,    int # type
 % 1,   1,      1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.keys GROUP BY id HAVING COUNT(*) > 
1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.keys GROUP BY id HAVING COUNT(*) > 
1;
 % sys.L3,      sys.keys # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM tmp.keys GROUP BY id HAVING COUNT(*) > 
1;
+#SELECT COUNT(*) AS duplicates, id FROM tmp.keys GROUP BY id HAVING COUNT(*) > 
1;
 % tmp.L3,      tmp.keys # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.idxs GROUP BY id HAVING COUNT(*) > 
1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.idxs GROUP BY id HAVING COUNT(*) > 
1;
 % sys.L3,      sys.idxs # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM tmp.idxs GROUP BY id HAVING COUNT(*) > 
1;
+#SELECT COUNT(*) AS duplicates, id FROM tmp.idxs GROUP BY id HAVING COUNT(*) > 
1;
 % tmp.L3,      tmp.idxs # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.triggers GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.triggers GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.triggers # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM tmp.triggers GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM tmp.triggers GROUP BY id HAVING 
COUNT(*) > 1;
 % tmp.L3,      tmp.triggers # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.sequences GROUP BY id HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.sequences GROUP BY id HAVING 
COUNT(*) > 1;
 % sys.L3,      sys.sequences # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, dependency_type_id FROM sys.dependency_types 
GROUP BY dependency_type_id HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, dependency_type_id FROM sys.dependency_types 
GROUP BY dependency_type_id HAVING COUNT(*) > 1;
 % sys.L3,      sys.dependency_types # table_name
 % duplicates,  dependency_type_id # name
 % bigint,      smallint # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, id, depend_id FROM sys.dependencies GROUP BY 
id, depend_id HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, id, depend_id FROM sys.dependencies GROUP BY 
id, depend_id HAVING COUNT(*) > 1;
 % sys.L3,      sys.dependencies,       sys.dependencies # table_name
 % duplicates,  id,     depend_id # name
 % bigint,      int,    int # type
 % 1,   1,      1 # length
-#SELECT COUNT(*) AS duplicates, id FROM sys.auths GROUP BY id HAVING COUNT(*) 
> 1;
+#SELECT COUNT(*) AS duplicates, id FROM sys.auths GROUP BY id HAVING COUNT(*) 
> 1;
 % sys.L3,      sys.auths # table_name
 % duplicates,  id # name
 % bigint,      int # type
 % 1,   1 # length
-#SELECT COUNT(*) AS duplicates, name FROM sys.users GROUP BY name HAVING 
COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, name FROM sys.users GROUP BY name HAVING 
COUNT(*) > 1;
 % .L10,        .users # table_name
 % duplicates,  name # name
 % bigint,      varchar # type
 % 1,   0 # length
-#SELECT COUNT(*) AS duplicates, login_id, role_id FROM sys.user_role GROUP BY 
login_id, role_id HAVING COUNT(*) > 1;
+#SELECT COUNT(*) AS duplicates, login_id, role_id FROM sys.user_role GROUP BY 
login_id, role_id HAVING COUNT(*) > 1;
 % sys.L3,      sys.user_role,  sys.user_role # table_name
 % duplicates,  login_id,       role_id # name
 % bigint,      int,    int # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to