Modified tests based on review

This commit is contained in:
Jenny Tam 2017-10-27 09:08:53 -07:00
parent 786bd507d2
commit 886b0af488
2 changed files with 1 additions and 3 deletions

View file

@ -50,8 +50,6 @@ class ColumnMeta
$this->dataType = $dataType;
$this->options = $options;
// first asssumes the column is not encryptable
// $this->encryptable = false;
if (!$noEncrypt) {
$this->checkIfUnsupported();
} else {
@ -462,6 +460,7 @@ function selectFromTable($conn, $tbname, $conds = null, $values = null)
function executeQuery($conn, $sql, $conds = null, $values = null)
{
if (!isColEncrypted()) {
// if not encrypted replace placeholders ('?') with values, if array not empty
if (!empty($values)) {
$tmpArray = explode('?', $conds);
$i = 0;

View file

@ -44,7 +44,6 @@ function fetchFields()
fatalError("Field $j of Row $i is missing");
}
$col = $j + 1;
$data = AE\getInsertData($startRow + $i, $col);
if (isUpdatable($col)) {
// should check data even if $fld is null
$data = AE\getInsertData($startRow + $i, $col);