Merge pull request #205 from sdevore/master

Add table alias to the custom finder `bitmasked` and update to use ge…

src/Model/Behavior/BitmaskedBehavior.php

@@ -61,7 +61,7 @@ class BitmaskedBehavior extends Behavior {
 
 		$bits = $this->encodeBitmask($options['bits']);
 
-		return $query->where([$this->_config['field'] => $bits]);
+		return $query->where([$this->_table->getAlias() . '.' . $this->_config['field'] => $bits]);
 	}
 
 	/**
@@ -316,7 +316,7 @@ class BitmaskedBehavior extends Behavior {
 		$bitmask = $this->encodeBitmask($bits);
 
 		$field = $this->_config['field'];
-		return [$this->_table->alias() . '.' . $field => $bitmask];
+		return [$this->_table->getAlias() . '.' . $field => $bitmask];
 	}
 
 	/**
@@ -360,10 +360,10 @@ class BitmaskedBehavior extends Behavior {
 		$connection = $this->_table->connection();
 		$config = $connection->config();
 		if ((strpos($config['driver'], 'Postgres') !== false)) {
-			return ['("' . $this->_table->alias() . '"."' . $field . '"' . $contain . ')'];
+			return ['("' . $this->_table->getAlias() . '"."' . $field . '"' . $contain . ')'];
 		}
 
-		return ['(' . $this->_table->alias() . '.' . $field . $contain . ')'];
+		return ['(' . $this->_table->getAlias() . '.' . $field . $contain . ')'];
 	}
 
 }