Merge remote-tracking branch 'refs/remotes/origin/dba-mapping-rework' into dba-mapping-rework

Author: s3inlc

src/dba/AbstractModelFactory.class.php

@@ -2,7 +2,6 @@
 
 namespace DBA;
 
-use JsonSchema\Constraints\Drafts\Draft06\AnyOfConstraint;
 use MassUpdateSet;
 use PDO, PDOStatement, PDOException;
 use UI;

src/dba/Util.class.php

@@ -37,7 +37,7 @@ public static function cast($obj, $to_class) {
   public static function createPrefixedString(string $table, array $keys): string {
     $arr = array();
     foreach ($keys as $key) {
-      $arr[] = "$table.$key AS '$table.$key'";
+      $arr[] = "$table.$key AS $table.$key";
     }
     return implode(", ", $arr);
   }