Join columns as value in Wheres v0.1.2

README.md

@@ -298,10 +298,37 @@ DELETE FROM `sessions` INNER JOIN `users` ON `sessions`.`user` = `users`.`id` WH
 
 `kind` Type of Join to apply E.g.: INNER, LEFT.
 
-### Advanced
 
-#### Literal strings ####
-You can send an unprepared strings as values in Wheres adding a double `\\` at the start of the condition:
+### Delete on joined condition
+
+```typescript
+sessionsTable.join([{
+    keyField: usersTwoTable.user,
+    fields: ["username"],
+    kind: "INNER"
+}]).delete({
+    username: "users__username"
+}).then((data: any) => {
+    console.log(data);
+}).catch((err: any) => {
+    console.error(err)
+});
+```
+
+Query executed: 
+```sql
+DELETE FROM `usersTwo` INNER JOIN `users` ON `usersTwo`.`user` = `users`.`id` WHERE `usersTwo`.`username` = `users`.`username`;
+```
+
+#### Params ####
+`keyField` Model foreign key.
+
+`kind` Type of Join to apply E.g.: INNER, LEFT.
+
+## Advanced
+
+### Literal strings
+You can send an unprepared strings as values in Wheres adding a double `\\` at the start of the value:
 
 ```typescript
 sessionsTable.getAll({

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unicoderns/orm",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Unicoderns Object/Relational Mapping",
   "author": {
     "name": "Unicoderns SA",

sources/model.ts

@@ -296,9 +296,15 @@ export class Model {
                 } else {
                     let joinkeys = item.split("__");
                     if (joinkeys.length == 2) {
-                        sql = sql + "`" + joinkeys[0] + "`.`" + joinkeys[1] + "` = ?";
+                        sql = sql + "`" + joinkeys[0] + "`.`" + joinkeys[1];
                     } else {
-                        sql = sql + "`" + this.tableName + "`.`" + item + "` = ?";
+                        sql = sql + "`" + this.tableName + "`.`" + item;
+                    }
+                    joinkeys = String(where[item]).split("__");
+                    if (joinkeys.length == 2) {
+                        sql = sql + "` = `" + joinkeys[0] + "`.`" + joinkeys[1] + "`";
+                    } else {
+                        sql = sql + "` = ?"
                     }
                 }
                 if (id < array.length - 1) {
@@ -307,7 +313,8 @@ export class Model {
             });
             // getting values
             filteredKeys.forEach((item: string) => {
-                if (String(where[item]).charAt(0) != "\\") {
+                let joinkeys = String(where[item]).split("__");
+                if ((String(where[item]).charAt(0) != "\\") && (joinkeys.length != 2)) {
                     values.push(where[item]);
                 }
             });

sources/tests/join.test.ts

@@ -163,29 +163,24 @@ describe('Joins', () => {
             console.error(err)
         });
     });
-
-    /*
-        it('INNER join update usersTwo with literal from users', () => {
-            var expected = {
-                sql: 'SELECT `sessions`.`id`, `sessions`.`created`, `sessions`.`ip`, `sessions`.`user`, `users`.`username` AS `users__username`, `users`.`email` AS `users__email`, `users`.`firstName` AS `users__firstName`, `users`.`lastName` AS `users__lastName` FROM `sessions` LEFT JOIN `users` ON `sessions`.`user` = `users`.`id` WHERE `users`.`id` = ?;',
-                values: [3]
-            };
-            usersTwoTable.returnQuery().join([{
-                keyField: usersTwoTable.user,
-                fields: ["username"],
-                kind: "INNER"
-            }]).update({
-                data: {
-                    username: "users__username"
-                },
-                where: "*"
-            }).then((query: Models.Query) => {
-                expect(query).toEqual(expected);
-            }).catch((err: any) => {
-                console.error(err)
-            });
+
+    it('INNER join delete usersTwo with literal from users', () => {
+        var expected = {
+            sql: 'DELETE FROM `usersTwo` INNER JOIN `users` ON `usersTwo`.`user` = `users`.`id` WHERE `usersTwo`.`username` = `users`.`username`;',
+            values: []
+        };
+        usersTwoTable.returnQuery().join([{
+            keyField: usersTwoTable.user,
+            fields: ["username"],
+            kind: "INNER"
+        }]).delete({
+            username: "users__username"
+        }).then((query: Models.Query) => {
+            expect(query).toEqual(expected);
+        }).catch((err: any) => {
+            console.error(err)
         });
-    */
+    });
 
     /*
         it('INNER join update usersTwo with literal from users', () => {