fix for table prefix being supplied.

Author: n0nag0n

src/ActiveRecord.php

@@ -716,8 +716,11 @@ public function addCondition(string $field, string $operator, $value, string $de
             $value = $this->filterParam($value);
         }
         $name = strtolower($name);
+
+		// skip adding the `table.` prefix if it's already there or a function is being supplied.
+		$skip_table_prefix = (strpos($field, '.') !== false || strpos($field, '(') !== false);
         $expressions = new Expressions([
-            'source' => ('where' === $name ? $this->table . '.' : '') . $field,
+            'source' => ('where' === $name && $skip_table_prefix === false ? $this->table . '.' : '') . $field,
             'operator' => $operator,
             'target' => (
                 is_array($value)

tests/ActiveRecordPdoIntegrationTest.php

@@ -624,4 +624,53 @@ public function testTextBasedPrimaryKeyDuplicateKey() {
 		$this->expectExceptionMessage('UNIQUE constraint failed: my_text_table.my_pk');
 		$myTextTable2->save();
 	}
+
+	public function testWhereConditionWithSuppliedTableName() {
+		$user = new User(new PDO('sqlite:test.db'));
+        $user->name = 'demo';
+        $user->password = md5('demo');
+        $user->insert();
+
+		$contact = new Contact(new PDO('sqlite:test.db'));
+        $contact->user_id = $user->id;
+        $contact->email = '[email protected]';
+        $contact->address = 'test address';
+        $contact->insert();
+
+		$user
+			->select('user.*, contact.email')
+			->join('contact', 'contact.user_id = user.id')
+			->eq('user.name', 'demo')
+			->find();
+		
+		$this->assertEquals('demo', $user->name);
+		$this->assertEquals('[email protected]', $user->email);
+	}
+
+	public function testWhereConditionWithFunctionName() {
+
+		$this->ActiveRecord->execute("CREATE TABLE IF NOT EXISTS json_test (
+            id INTEGER PRIMARY KEY, 
+            data TEXT, 
+			created_dt TEXT
+        );");
+
+		$json = new class(new PDO('sqlite:test.db')) extends ActiveRecord {
+			public function __construct($pdo) {
+				parent::__construct($pdo);
+				$this->table = 'json_test';
+				$this->primaryKey = 'id';
+			}
+		};
+        $json->data = '{"name": "demo", "email": "[email protected]"}';
+        $json->created_dt = gmdate('Y-m-d H:i:s');
+        $json->insert();
+		$json
+			->select('json_test.*, json_extract(data, "$.email") as email')
+			->eq('json_extract(data, "$.name")', 'demo')
+			->find();
+		
+		$this->assertEquals('demo', json_decode($json->data)->name);
+		$this->assertEquals('[email protected]', $json->email);
+	}
 }