YamlMerger: logging merged files, globals.sql: fix comboActiveUsers

diff --git a/dart_tools/bin/yaml_merger.dart b/dart_tools/bin/yaml_merger.dart
index 95f56e8e78c594293ff61a123d742192ebcbf995..fe6e36e6f7d03ec47c70326b55d6b92a9f54dcbb 100644 (file)
--- a/dart_tools/bin/yaml_merger.dart
+++ b/dart_tools/bin/yaml_merger.dart
@@ -42,6 +42,7 @@ class Merger {
   }
   /// Merges the [fileSource] and [filePreference] into the [target] file.
   void mergeOneFile(File fileSource, File filePreference, String target) {
+    print('merging ${fileSource.path}');
     parseKeys(filePreference);
     final output = <String>[];
     final foundKeys = <String>{};
@@ -110,7 +111,8 @@ class Merger {
       logger.error('source not a directory: $pathTarget');
     } else {
       /// Copy/merge the files from dirSource:
-      for (var file in dirSource.listSync()) {
+      final dirs = dirSource.listSync().toList();
+      for (var file in dirs) {
         final node = basename(file.path);
         if (! node.endsWith('.yaml')){
           continue;

diff --git a/rest_server/data/sql/precedence/global.sql.yaml b/rest_server/data/sql/precedence/global.sql.yaml
index 3dde8062875561dc338751005ecc7d77171e3ea1..d55edefb37fc4ec11e896ee8ab333e11bde7fbee 100644 (file)
--- a/rest_server/data/sql/precedence/global.sql.yaml
+++ b/rest_server/data/sql/precedence/global.sql.yaml
@@ -15,4 +15,4 @@ comboActiveUsers:
   type: list
   parameters: []
   sql: "SELECT user_id, user_displayname from users
-    WHERE user_status = 1 ORDER BY by user_displayname;"
+    WHERE user_status = 1 ORDER BY user_displayname;"