Skip to content

Commit

Permalink
- deprecated db methods removed (except db_query())
Browse files Browse the repository at this point in the history
  • Loading branch information
@open-lims
open-lims committed Mar 4, 2016
1 parent bcf8bf6 commit 6705ec8
Show file tree
Hide file tree
Showing 140 changed files with 1,443 additions and 1,464 deletions.
55 changes: 17 additions & 38 deletions www/core/db/db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
class Database
{
private $pdo;

private $last_statement;

private $query_log;
private $query_log_status;

Expand Down Expand Up @@ -61,21 +64,29 @@ public function connect($type, $server, $port, $username, $password, $database)

public function prepare($query)
{
if ($this->query_log_status === true)
{
$this->query_log = $this->query_log."\n".$query;
}

return $this->pdo->prepare($query);
}

public function execute($statement)
{
$last_statement = $statement;
$statement->execute();
}

public function row_count($statement)
{
$last_statement = $statement;
return $statement->rowCount();
}

public function fetch($statement)
{
$last_statement = $statement;
return $statement->fetch(PDO::FETCH_ASSOC);
}

Expand All @@ -102,6 +113,11 @@ public function get_query_log()
}
}

public function get_last_error()
{
return $last_statement->errorInfo();
}

public function close()
{
unset($this->pdo);
Expand All @@ -118,44 +134,7 @@ public function db_query($query)
$pg_result->execute();

return $pg_result;
}

public function db_fetch_assoc($assoc)
{
return $assoc->fetch(PDO::FETCH_ASSOC);
}

public function db_fetch_assoc_wrow($resultset, $row)
{
return $this->sql->sql_fetch_assoc_wrow($resultset, $row);
}

public function db_fetch_array($resultset)
{
return $this->sql->sql_fetch_array($resultset);
}

public function db_fetch_array_wrow($resultset, $row)
{
return $this->sql->sql_fetch_array_wrow($resultset, $row);
}



public function db_num_rows($resultset)
{
return $this->sql->sql_num_rows($resultset);
}

public function db_affected_rows($resultset)
{
return $resultset->rowCount();
}

public function db_last_error()
{
return $this->sql->sql_last_error();
}
}
}

?>
6 changes: 3 additions & 3 deletions www/core/include/base/batch/access/base_batch.wrapper.access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static function list_batches($create_datetime, $end_datetime, $order_by,
{
for ($i = 0; $i<=$end-1; $i++)
{
if (($data = $db->db_fetch_assoc($res)) == null)
if (($data = $db->fetch($res)) == null)
{
break;
}
Expand All @@ -128,7 +128,7 @@ public static function list_batches($create_datetime, $end_datetime, $order_by,
}
else
{
while ($data = $db->db_fetch_assoc($res))
while ($data = $db->fetch($res))
{
array_push($return_array, $data);
}
Expand Down Expand Up @@ -170,7 +170,7 @@ public static function count_batches($create_datetime, $end_datetime)
"".$sql_where."";

$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

return $data['result'];
}
Expand Down
24 changes: 12 additions & 12 deletions www/core/include/base/batch/access/base_batch_run.access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function __construct($batch_id)
{
$sql = "SELECT * FROM ".constant("BASE_BATCH_RUN_TABLE")." WHERE id='".$batch_id."'";
$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

if ($data['id'])
{
Expand Down Expand Up @@ -118,11 +118,11 @@ public function create($type_id, $binary_id, $user_id)

$res_write = $db->db_query($sql_write);

if ($db->db_affected_rows($res_write) == 1)
if ($db->row_count($res_write) == 1)
{
$sql_read = "SELECT id FROM ".constant("BASE_BATCH_RUN_TABLE")." WHERE id = currval('".self::BASE_BATCH_RUN_PK_SEQUENCE."'::regclass)";
$res_read = $db->db_query($sql_read);
$data_read = $db->db_fetch_assoc($res_read);
$data_read = $db->fetch($res_read);

self::__construct($data_read['id']);

Expand Down Expand Up @@ -155,7 +155,7 @@ public function delete()
$sql = "DELETE FROM ".constant("BASE_BATCH_RUN_TABLE")." WHERE id = ".$tmp_batch_id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res) == 1)
if ($db->row_count($res) == 1)
{
return true;
}
Expand Down Expand Up @@ -318,7 +318,7 @@ public function set_binary_id($binary_id)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET binary_id = '".$binary_id."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->binary_id = $binary_id;
return true;
Expand Down Expand Up @@ -348,7 +348,7 @@ public function set_status($status)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET status = '".$status."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->status = $status;
return true;
Expand Down Expand Up @@ -378,7 +378,7 @@ public function set_create_datetime($create_datetime)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET create_datetime = '".$create_datetime."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->create_datetime = $create_datetime;
return true;
Expand Down Expand Up @@ -408,7 +408,7 @@ public function set_start_datetime($start_datetime)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET start_datetime = '".$start_datetime."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->start_datetime = $start_datetime;
return true;
Expand Down Expand Up @@ -438,7 +438,7 @@ public function set_end_datetime($end_datetime)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET end_datetime = '".$end_datetime."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->end_datetime = $end_datetime;
return true;
Expand Down Expand Up @@ -468,7 +468,7 @@ public function set_last_lifesign($last_lifesign)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET last_lifesign = '".$last_lifesign."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->last_lifesign = $last_lifesign;
return true;
Expand Down Expand Up @@ -498,7 +498,7 @@ public function set_user_id($user_id)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET user_id = '".$user_id."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->user_id = $user_id;
return true;
Expand Down Expand Up @@ -528,7 +528,7 @@ public function set_type_id($type_id)
$sql = "UPDATE ".constant("BASE_BATCH_RUN_TABLE")." SET type_id = '".$type_id."' WHERE id = '".$this->batch_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->type_id = $type_id;
return true;
Expand Down
16 changes: 8 additions & 8 deletions www/core/include/base/batch/access/base_batch_type.access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function __construct($batch_type_id)
{
$sql = "SELECT * FROM ".constant("BASE_BATCH_TYPE_TABLE")." WHERE id='".$batch_type_id."'";
$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

if ($data['id'])
{
Expand Down Expand Up @@ -93,11 +93,11 @@ public function create($name, $internal_name, $binary_id)

$res_write = $db->db_query($sql_write);

if ($db->db_affected_rows($res_write) == 1)
if ($db->row_count($res_write) == 1)
{
$sql_read = "SELECT id FROM ".constant("BASE_BATCH_TYPE_TABLE")." WHERE id = currval('".self::BASE_BATCH_TYPE_PK_SEQUENCE."'::regclass)";
$res_read = $db->db_query($sql_read);
$data_read = $db->db_fetch_assoc($res_read);
$data_read = $db->fetch($res_read);

self::__construct($data_read['id']);

Expand Down Expand Up @@ -130,7 +130,7 @@ public function delete()
$sql = "DELETE FROM ".constant("BASE_BATCH_TYPE_TABLE")." WHERE id = ".$tmp_batch_type_id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res) == 1)
if ($db->row_count($res) == 1)
{
return true;
}
Expand Down Expand Up @@ -203,7 +203,7 @@ public function set_name($name)
$sql = "UPDATE ".constant("BASE_BATCH_TYPE_TABLE")." SET name = '".$name."' WHERE id = '".$this->batch_type_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->name = $name;
return true;
Expand Down Expand Up @@ -233,7 +233,7 @@ public function set_internal_name($internal_name)
$sql = "UPDATE ".constant("BASE_BATCH_TYPE_TABLE")." SET internal_name = '".$internal_name."' WHERE id = '".$this->batch_type_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->internal_name = $internal_name;
return true;
Expand Down Expand Up @@ -263,7 +263,7 @@ public function set_binary_id($binary_id)
$sql = "UPDATE ".constant("BASE_BATCH_TYPE_TABLE")." SET binary_id = '".$binary_id."' WHERE id = '".$this->batch_type_id."'";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->binary_id = $binary_id;
return true;
Expand Down Expand Up @@ -293,7 +293,7 @@ public static function get_id_by_internal_name($internal_name)
{
$sql = "SELECT id FROM ".constant("BASE_BATCH_TYPE_TABLE")." WHERE internal_name='".$internal_name."'";
$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

if ($data['id'])
{
Expand Down
18 changes: 9 additions & 9 deletions www/core/include/base/environment/access/country.access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function __construct($id)
{
$sql = "SELECT * FROM ".constant("COUNTRY_TABLE")." WHERE id = ".$id."";
$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

if ($data['id'])
{
Expand Down Expand Up @@ -95,11 +95,11 @@ public function create($english_name, $local_name, $iso_3166)

$res_write = $db->db_query($sql_write);

if ($db->db_affected_rows($res_write) == 1)
if ($db->row_count($res_write) == 1)
{
$sql_read = "SELECT id FROM ".constant("COUNTRY_TABLE")." WHERE id = currval('".self::COUNTRY_PK_SEQUENCE."'::regclass)";
$res_read = $db->db_query($sql_read);
$data_read = $db->db_fetch_assoc($res_read);
$data_read = $db->fetch($res_read);

self::__construct($data_read['id']);

Expand Down Expand Up @@ -132,7 +132,7 @@ public function delete()
$sql = "DELETE FROM ".constant("COUNTRY_TABLE")." WHERE id = ".$tmp_id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res) == 1)
if ($db->row_count($res) == 1)
{
return true;
}
Expand Down Expand Up @@ -205,7 +205,7 @@ public function set_english_name($english_name)
$sql = "UPDATE ".constant("COUNTRY_TABLE")." SET english_name = '".$english_name."' WHERE id = ".$this->id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->english_name = $english_name;
return true;
Expand Down Expand Up @@ -234,7 +234,7 @@ public function set_local_name($local_name)
$sql = "UPDATE ".constant("COUNTRY_TABLE")." SET local_name = '".$local_name."' WHERE id = ".$this->id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->local_name = $local_name;
return true;
Expand Down Expand Up @@ -263,7 +263,7 @@ public function set_iso_3166($iso_3166)
$sql = "UPDATE ".constant("COUNTRY_TABLE")." SET iso_3166 = '".$iso_3166."' WHERE id = ".$this->id."";
$res = $db->db_query($sql);

if ($db->db_affected_rows($res))
if ($db->row_count($res))
{
$this->iso_3166 = $iso_3166;
return true;
Expand Down Expand Up @@ -292,7 +292,7 @@ public static function exist_id($id)
{
$sql = "SELECT id FROM ".constant("COUNTRY_TABLE")." WHERE id = '".$id."'";
$res = $db->db_query($sql);
$data = $db->db_fetch_assoc($res);
$data = $db->fetch($res);

if ($data['id'])
{
Expand Down Expand Up @@ -321,7 +321,7 @@ public static function list_entries()
$sql = "SELECT id,english_name,local_name,iso_3166 FROM ".constant("COUNTRY_TABLE")." ORDER BY english_name";
$res = $db->db_query($sql);

while ($data = $db->db_fetch_assoc($res))
while ($data = $db->fetch($res))
{
$temp_array = array();
$temp_array['id'] = $data['id'];
Expand Down
Loading

0 comments on commit 6705ec8

Please sign in to comment.