dev 2019-11

src/App.php

@@ -46,16 +46,16 @@ class App
 
 		// define class aliases
 		class_alias('\\KarmaFW\\App', 'App');
-		class_alias('\\KarmaFW\\App', 'SqlDb');
-		class_alias('\\KarmaFW\\App', 'SqlSchema');
-		class_alias('\\KarmaFW\\App', 'SqlTable');
-		class_alias('\\KarmaFW\\App', 'SqlOrmModel');
-		class_alias('\\KarmaFW\\App', 'SqlQuery');
-		class_alias('\\KarmaFW\\App', 'SqlWhere');
-		class_alias('\\KarmaFW\\App', 'SqlExpr');
-		class_alias('\\KarmaFW\\App', 'SqlLike');
-		class_alias('\\KarmaFW\\App', 'SqlIn');
-		class_alias('\\KarmaFW\\App', 'SqlTools');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlDb', 'SqlDb');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlSchema', 'SqlSchema');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlTable', 'SqlTable');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlOrmModel', 'SqlOrmModel');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlQuery', 'SqlQuery');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlWhere', 'SqlWhere');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlExpr', 'SqlExpr');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlLike', 'SqlLike');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlIn', 'SqlIn');
+		class_alias('\\KarmaFW\\Database\\Sql\\SqlTools', 'SqlTools');
 		
 
 		self::$booted = true;

src/Database/Sql/SqlTools.php

@@ -129,10 +129,10 @@ class SqlTools
                 }else if (is_string($value)) {
                     $where_sql[] = $key . ' = ' . $this->escape($value);
                     
-                }else if ($value instanceof SqlLike) {
+                }else if ($value instanceof \KarmaFW\Database\Sql\SqlLike) {
                     $where_sql[] = $key . ' like ' . (string) $this->escape($value);
                     
-                }else if ($value instanceof SqlIn) {
+                }else if ($value instanceof \KarmaFW\Database\Sql\SqlIn) {
                     $value = (string) $value;
                     if (empty($value)) {
                         $where_sql[] = '0';
@@ -140,10 +140,10 @@ class SqlTools
                         $where_sql[] = $key . ' in (' . $value . ')';
                     }
                     
-                }else if ($value instanceof SqlExpr) {
+                }else if ($value instanceof \KarmaFW\Database\Sql\SqlExpr) {
                     $where_sql[] = $key . ' = ' . (string) $value;
                     
-                }else if ($value instanceof SqlWhere) {
+                }else if ($value instanceof \KarmaFW\Database\Sql\SqlWhere) {
                     $where_sql[] = (string) $value;
                     
                 }else{