Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

=& SC_Query_Exの修正 #1093

Merged
merged 3 commits into from
Dec 20, 2024
Merged

=& SC_Query_Exの修正 #1093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0e8064
fixed #622
nobuhiko Dec 20, 2024
00b9bad
= &修正
nobuhiko Dec 20, 2024
c4e3e7b
Merge branch 'master' into fixed_issue_622
nanasess Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html/admin/load_module_config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
if (!empty($module_id) && is_numeric($module_id)) {
GC_Utils_Ex::gfPrintLog('loading module ====> module_id = ' . $module_id);

$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();
$arrRet = $objQuery->select('module_code', 'dtb_module', 'module_id = ?', array($module_id));

if (isset($arrRet[0]['module_code'])) {
Expand Down
14 changes: 7 additions & 7 deletions html/test/upgrade/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
);

switch (getMode()) {
case 'products_list':
displayProductsList();
break;
case 'products_list':
displayProductsList();
break;

default:
displayProductsList();
break;
default:
displayProductsList();
break;
}

/**
Expand Down Expand Up @@ -106,7 +106,7 @@ function updateModuleTable($arrProductsList)
{
$table = 'dtb_module';
$where = 'module_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();

$objQuery->begin();
foreach ($arrProductsList as $arrProduct) {
Expand Down
8 changes: 4 additions & 4 deletions tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$HOME = realpath(__DIR__).'/../../../..';
require_once $HOME.'/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';
$HOME = realpath(__DIR__) . '/../../../..';
require_once $HOME . '/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php';

class SC_Helper_Address_registAddressTest extends SC_Helper_Address_TestBase
{
Expand All @@ -22,7 +22,7 @@ protected function tearDown(): void
/*
public function testregistAddressTest_顧客idが無い場合_システムエラーを返す()
{
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();
$this->setUpAddress();
//$this->expected = "1";
$this->objAddress->registAddress(null);
Expand Down Expand Up @@ -56,7 +56,7 @@ public function testregistAddressTest_会員の登録配送先を追加する()
'fax03' => '1114',
'country_id' => null
);
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();
$this->expected = '1002';
$this->objAddress->registAddress($arrSql);
$col = 'other_deliv_id';
Expand Down
8 changes: 4 additions & 4 deletions tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_saveKiyakuTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$HOME = realpath(__DIR__).'/../../../..';
require_once $HOME.'/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';
$HOME = realpath(__DIR__) . '/../../../..';
require_once $HOME . '/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php';

class SC_Helper_Kiyaku_saveKiyakuTest extends SC_Helper_Kiyaku_TestBase
{
Expand All @@ -24,7 +24,7 @@ public function testsaveKiyakuTest_新規で規約を登録する場合_1003を

if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避

$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();
$this->setUpKiyaku();
$this->expected = '1003';

Expand Down Expand Up @@ -54,7 +54,7 @@ public function testsaveKiyakuTest_規約を更新する場合_1001を返す()
{
if(DB_TYPE != 'pgsql') { //postgresqlだとどうしてもDBエラーになるのでとりいそぎ回避

$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery = SC_Query_Ex::getSingletonInstance();
$this->setUpKiyaku();
$sqlval = array(
'kiyaku_id' => '1001',
Expand Down
Loading