fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

new DBClasses for SQLite3 and Firebird databases.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8555 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
lickawtl 2011-06-30 15:01:45 +00:00
parent 01d0925dd5
commit 5d1eb1c21e
7 changed files with 218 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

20
classes/db/DBCubrid.class.php
View file

@ -449,7 +449,6 @@
if (!file_exists ($file_name)) return;
// read xml file
$buff = FileHandler::readFile ($file_name);
return $this->_createTable ($buff);
}
@ -629,10 +628,14 @@
if(is_a($query, 'Object')) return;
$query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$result = $this->_query ($query);
if ($this->isError ()) {
if ($limit && $output->limit->isPageHandler()){
if ($this->isError ()) return $this->queryError($queryObject);
else return $this->queryPageLimit($queryObject, $result);
}
function queryError($queryObject){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
$buff = new Object ();
$buff->total_count = 0;
$buff->total_page = 0;
@ -642,9 +645,10 @@
return $buff;
}else
return;
}
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
}
function queryPageLimit($queryObject, $result){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
@ -661,7 +665,6 @@
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
} else $total_page = 1;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
$data = $this->_fetch($result, $virtual_no);
@ -676,7 +679,6 @@
$buff = new Object ();
$buff->data = $data;
}
return $buff;
}

80
classes/db/DBFirebird.class.php
View file

@ -291,7 +291,7 @@
// Notify to start a query execution
$this->actStart($query);
// Execute the query statement
$result = ibase_query($this->fd, $query);
$result = @ibase_query($this->fd, $query);
}
else {
// Notify to start a query execution
@ -592,6 +592,7 @@
}
}
if($auto_increment_list)
foreach($auto_increment_list as $increment) {
$schema = sprintf('CREATE GENERATOR GEN_%s_ID;', $table_name);
$output = $this->_query($schema);
@ -620,22 +621,28 @@
/**
* @brief Handle the insertAct
**/
function _executeInsertAct($output) {
function _executeInsertAct($queryObject) {
$query = $this->getInsertSql($queryObject);
if(is_a($query, 'Object')) return;
return $this->_query($query);
}
/**
* @brief handles updateAct
**/
function _executeUpdateAct($output) {
function _executeUpdateAct($queryObject) {
$query = $this->getUpdateSql($queryObject);
if(is_a($query, 'Object')) return;
return $this->_query($query);
}
/**
* @brief handles deleteAct
**/
function _executeDeleteAct($output) {
function _executeDeleteAct($queryObject) {
$query = $this->getDeleteSql($queryObject);
if(is_a($query, 'Object')) return;
return $this->_query($query);
}
/**
@ -644,9 +651,64 @@
* In order to get a list of pages easily when selecting \n
* it supports a method as navigation
**/
function _executeSelectAct($output) {
function _executeSelectAct($queryObject) {
$query = $this->getSelectSql($queryObject);
if(is_a($query, 'Object')) return;
$query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
$result = $this->_query ($query);
if ($this->isError ()) return $this->queryError($queryObject);
else return $this->queryPageLimit($queryObject, $result);
}
function queryError($queryObject){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
$buff = new Object ();
$buff->total_count = 0;
$buff->total_page = 0;
$buff->page = 1;
$buff->data = array ();
$buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
return $buff;
}else
return;
}
function queryPageLimit($queryObject, $result){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
}
$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$result_count = $this->_query($count_query);
$count_output = $this->_fetch($result_count);
$total_count = (int)$count_output->count;
// Total pages
if ($total_count) {
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
} else $total_page = 1;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
$data = $this->_fetch($result, $virtual_no);
$buff = new Object ();
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $queryObject->getLimit()->page;
$buff->data = $data;
$buff->page_navigation = new PageHandler($total_count, $total_page, $queryObject->getLimit()->page, $queryObject->getLimit()->page_count);
}else{
$data = $this->_fetch($result);
$buff = new Object ();
$buff->data = $data;
}
return $buff;
}
}

29
classes/db/DBMssql.class.php
View file

@ -489,8 +489,16 @@
$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
$result = $this->_query($query);
if ($this->isError ()) {
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
if ($this->isError ()) return $this->queryError($queryObject);
else return $this->queryPageLimit($queryObject, $result);
}
function getParser(){
return new DBParser("[", "]");
}
function queryError($queryObject){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
$buff = new Object ();
$buff->total_count = 0;
$buff->total_page = 0;
@ -500,9 +508,10 @@
return $buff;
}else
return;
}
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
}
function queryPageLimit($queryObject, $result){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
@ -519,7 +528,6 @@
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
} else $total_page = 1;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
$data = $this->_fetch($result, $virtual_no);
@ -534,13 +542,8 @@
$buff = new Object ();
$buff->data = $data;
}
return $buff;
}
function getParser(){
return new DBParser("[", "]");
}
return $buff;
}
}

47
classes/db/DBMysql.class.php
View file

@ -438,8 +438,26 @@
// TODO Add code for pagination
$result = $this->_query ($query);
if ($this->isError ()) {
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
if ($this->isError ()) return $this->queryError($queryObject);
else return $this->queryPageLimit($queryObject, $result);
}
function db_insert_id()
{
return mysql_insert_id($this->fd);
}
function db_fetch_object(&$result)
{
return mysql_fetch_object($result);
}
function getParser(){
return new DBParser('`');
}
function queryError($queryObject){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
$buff = new Object ();
$buff->total_count = 0;
$buff->total_page = 0;
@ -449,9 +467,10 @@
return $buff;
}else
return;
}
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
}
function queryPageLimit($queryObject, $result){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
@ -468,7 +487,6 @@
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
} else $total_page = 1;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
$data = $this->_fetch($result, $virtual_no);
@ -483,22 +501,7 @@
$buff = new Object ();
$buff->data = $data;
}
return $buff;
}
function db_insert_id()
{
return mysql_insert_id($this->fd);
}
function db_fetch_object(&$result)
{
return mysql_fetch_object($result);
}
function getParser(){
return new DBParser('`');
return $buff;
}
}

104
classes/db/DBSqlite3_pdo.class.php
View file

@ -402,8 +402,11 @@
/**
* @brief insertAct
**/
function _executeInsertAct($output) {
$this->_prepare($query);
function _executeInsertAct($queryObject) {
$query = $this->getInsertSql($queryObject);
if(is_a($query, 'Object')) return;
$this->_prepare($query);
$val_count = count($val_list);
for($i=0;$i<$val_count;$i++) $this->_bind($val_list[$i]);
@ -414,16 +417,22 @@
/**
* @brief updateAct
**/
function _executeUpdateAct($output) {
$this->_prepare($query);
function _executeUpdateAct($queryObject) {
$query = $this->getUpdateSql($queryObject);
if(is_a($query, 'Object')) return;
$this->_prepare($query);
return $this->_execute();
}
/**
* @brief deleteAct
**/
function _executeDeleteAct($output) {
$this->_prepare($query);
function _executeDeleteAct($queryObject) {
$query = $this->getDeleteSql($queryObject);
if(is_a($query, 'Object')) return;
$this->_prepare($query);
return $this->_execute();
}
@ -433,11 +442,86 @@
* To fetch a list of the page conveniently when selecting, \n
* navigation method supported
**/
function _executeSelectAct($output) {
$buff = new Object();
$buff->data = $data;
return $buff;
function _executeSelectAct($queryObject) {
$query = $this->getSelectSql($queryObject);
if(is_a($query, 'Object')) return;
$this->_prepare($query);
$data = $this->_execute();
if($this->isError()) return;
if ($this->isError ()) return $this->queryError($queryObject);
else return $this->queryPageLimit($queryObject, $data);
}
function queryError($queryObject){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()){
$buff = new Object ();
$buff->total_count = 0;
$buff->total_page = 0;
$buff->page = 1;
$buff->data = array ();
$buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
return $buff;
}else
return;
}
function queryPageLimit($queryObject, $data){
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
}
$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$this->_prepare($count_query);
$count_output = $this->_execute();
$total_count = (int)$count_output->count;
// Total pages
if ($total_count) {
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
} else $total_page = 1;
$this->_prepare($this->getSelectSql($queryObject));
$this->stmt->execute();
if($this->stmt->errorCode() != '00000') {
$this->setError($this->stmt->errorCode(), print_r($this->stmt->errorInfo(),true));
$this->actFinish();
return $buff;
}
$output = null;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
//$data = $this->_fetch($result, $virtual_no);
while($tmp = $this->stmt->fetch(PDO::FETCH_ASSOC)) {
unset($obj);
foreach($tmp as $key => $val) {
$pos = strpos($key, '.');
if($pos) $key = substr($key, $pos+1);
$obj->{$key} = $val;
}
$data[$virtual_no--] = $obj;
}
$this->stmt = null;
$this->actFinish();
$buff = new Object ();
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $queryObject->getLimit()->page;
$buff->data = $data;
$buff->page_navigation = new PageHandler($total_count, $total_page, $queryObject->getLimit()->page, $queryObject->getLimit()->page_count);
}else{
//$data = $this->_fetch($result);
$buff = new Object ();
$buff->data = $data;
}
return $buff;
}
}
return new DBSqlite3_pdo;

1
classes/db/queryparts/Query.class.php
View file

@ -133,7 +133,6 @@
function getSelectString($with_values = true){
$select = '';
foreach($this->columns as $column){
var_dump($column);
if($column->show())
if(is_a($column, 'Subquery')){
$oDB = &DB::getInstance();

2
modules/install/script/ko.install.php
View file

@ -1,4 +1,4 @@
<?
<?php
// ko/en/...
$lang = Context::getLangType();