diff --git a/addons/photoswipe/rx_photoswipe.js b/addons/photoswipe/rx_photoswipe.js
index d21fbabce..dc06dc4be 100644
--- a/addons/photoswipe/rx_photoswipe.js
+++ b/addons/photoswipe/rx_photoswipe.js
@@ -25,7 +25,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
// CSS selector for photoswipe items.
var ps_find_selector = 'img:not(' + ps_skip_elements + ps_skip_class + '), img' + ps_enroll_class;
- // parse slide data (url, title, size ...) from DOM elements
+ // parse slide data (url, title, size ...) from DOM elements
// (children of gallerySelector)
var parseThumbnailElements = function(el) {
var imgElements = $(el).find(ps_find_selector),
@@ -39,7 +39,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
imgEl = imgElements.get(i); // ![]()
element
- // include only element nodes
+ // include only element nodes
if (imgEl.nodeType !== 1 || !imgEl.src || !$(imgEl).attr('data-pswp-pid')) {
continue;
}
@@ -56,11 +56,11 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
var ps_skip_alt_class = '.photoswipe-no-caption';
if(imgEl.alt && !$(imgEl).is(ps_skip_alt_class)) {
- item.title = imgEl.alt;
+ item.title = imgEl.alt;
}
if(imgEl.title && !$(imgEl).is(ps_skip_alt_class)) {
- item.title = imgEl.title;
+ item.title = imgEl.title;
}
item.el = imgEl; // save link to element for getThumbBoundsFn
@@ -87,7 +87,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
if(!clickedListItem) {
return;
}
-
+
e = e || window.event;
e.preventDefault ? e.preventDefault() : e.returnValue = false;
@@ -108,8 +108,8 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
}*/
for (var i = 0; i < numChildNodes; i++) {
- if(childNodes[i].nodeType !== 1 || !$(childNodes[i]).attr('data-pswp-pid')) {
- continue;
+ if(childNodes[i].nodeType !== 1 || !$(childNodes[i]).attr('data-pswp-pid')) {
+ continue;
}
if(childNodes[i] === clickedListItem) {
@@ -140,7 +140,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
if(!vars[i]) {
continue;
}
- var pair = vars[i].split('=');
+ var pair = vars[i].split('=');
if(pair.length < 2) {
continue;
}
@@ -172,7 +172,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
// See Options -> getThumbBoundsFn section of documentation for more info
var thumbnail = items[index].el,
pageYScroll = window.pageYOffset || document.documentElement.scrollTop,
- rect = thumbnail.getBoundingClientRect();
+ rect = thumbnail.getBoundingClientRect();
return {x:rect.left, y:rect.top + pageYScroll, w:rect.width};
},
@@ -191,7 +191,7 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
// PhotoSwipe opened from URL
if(fromURL) {
if(options.galleryPIDs) {
- // parse real index when custom PIDs are used
+ // parse real index when custom PIDs are used
// http://photoswipe.com/documentation/faq.html#custom-pid-in-url
for(var j = 0; j < items.length; j++) {
if(items[j].pid == index) {
@@ -232,7 +232,6 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
var regx_skip = /(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i;
var regx_allow_i6pngfix = /(?:common\/tpl\/images\/blank\.gif$)/i;
- var isMobile = String(navigator.userAgent).match(/mobile/i);
var galleryImgEls = $(galleryElements[i]).find(ps_find_selector);
for(var j = 0, jl = galleryImgEls.length; j < jl; j++) {
// skip components
@@ -241,11 +240,6 @@ var initPhotoSwipeFromDOM = function(gallerySelector) {
//$(galleryImgEls[j]).attr('data-pswp-uid', i+1);
$(galleryImgEls[j]).attr('data-pswp-pid', j+1);
- // Fix stretching of image on mobile
- if (isMobile) {
- galleryImgEls[j].style.height = 'auto';
- galleryImgEls[j].height = null;
- }
}
}
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 0c9f71190..0a2eb1f35 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -338,11 +338,7 @@ class Context
}
// start session
- if (\PHP_SAPI === 'cli')
- {
- $_SESSION = [];
- }
- else
+ if (\PHP_SAPI !== 'cli')
{
if (self::$_current_request->getRouteOption('enable_session'))
{
@@ -1218,7 +1214,7 @@ class Context
else
{
// Set HTTP_RAW_POST_DATA for third-party apps that look for it.
- if (empty($_POST) && empty($_FILES) && !isset($GLOBALS['HTTP_RAW_POST_DATA']))
+ if (!$_POST && !isset($GLOBALS['HTTP_RAW_POST_DATA']))
{
$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents('php://input');
}
@@ -1234,7 +1230,7 @@ class Context
}
// Decide whether it's JSON or XMLRPC by looking at the first character of the POST data.
- if (empty($_POST) && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
+ if (!$_POST && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
{
self::$_instance->request_method = substr($GLOBALS['HTTP_RAW_POST_DATA'], 0, 1) === '<' ? 'XMLRPC' : 'JSON';
return;
@@ -1262,7 +1258,7 @@ class Context
}
// Set JSON and XMLRPC arguments.
- if(isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' && empty($_POST) && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
+ if(isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' && !$_POST && !empty($GLOBALS['HTTP_RAW_POST_DATA']))
{
$params = array();
$request_method = self::getRequestMethod();
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 609fe787a..4f9a09bce 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -151,20 +151,13 @@ class HTMLDisplayHandler
Context::loadFile(array($edited_layout_css, 'all', '', 100));
}
}
- if (!$layout_path)
+ if(!$layout_path)
{
$layout_path = './common/tpl';
}
- if (!$layout_file)
+ if(!$layout_file)
{
- if ($layout_path === './common/tpl')
- {
- $layout_file = 'default_layout';
- }
- else
- {
- $layout_file = 'layout';
- }
+ $layout_file = 'default_layout';
}
$oTemplate = new Rhymix\Framework\Template;
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index e0faee25e..5b910d223 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -151,16 +151,7 @@ class ModuleHandler extends Handler
$site_module_info->domain = Rhymix\Framework\URL::getCurrentDomain();
$site_module_info->is_default_domain = 'N';
$site_module_info->is_default_replaced = true;
-
- // Reset context variables if the domain was replaced.
Context::set('site_module_info', $site_module_info);
- Context::set('_default_url', null);
- Context::set('request_uri', $current_url = Context::getRequestUri());
- if ($query_string = http_build_query(Context::getCurrentRequest()->args))
- {
- $current_url .= '?' . $query_string;
- }
- Context::set('current_url', $current_url);
}
}
}
diff --git a/classes/page/PageHandler.class.php b/classes/page/PageHandler.class.php
index 0a74fcd0f..82d45e97f 100644
--- a/classes/page/PageHandler.class.php
+++ b/classes/page/PageHandler.class.php
@@ -44,23 +44,24 @@ class PageHandler extends Handler implements Iterator
$this->page_count = $page_count;
$this->point = 0;
- if ($this->cur_page > $total_page)
+ $first_page = $cur_page - (int) ($page_count / 2);
+ if($first_page < 1)
{
- $this->cur_page = $total_page;
- }
- if ($this->page_count > $total_page)
- {
- $this->page_count = $total_page;
+ $first_page = 1;
}
- $first_page = max(1, $this->cur_page - floor($this->page_count / 2));
- if (($first_page + $this->page_count - 1) > $total_page)
+ if($total_page > $page_count && $first_page + $page_count - 1 > $total_page)
{
- $first_page = max(1, $total_page - $this->page_count + 1);
+ $first_page -= $first_page + $page_count - 1 - $total_page;
}
$this->first_page = $first_page;
$this->last_page = $total_page;
+
+ if($total_page < $this->page_count)
+ {
+ $this->page_count = $total_page;
+ }
}
/**
diff --git a/common/framework/DB.php b/common/framework/DB.php
index 0f30246e8..b436ce9e8 100644
--- a/common/framework/DB.php
+++ b/common/framework/DB.php
@@ -1126,17 +1126,17 @@ class DB
}
else
{
- $exceptions = ['TABLE'];
+ $exceptions = [];
}
// Add prefixes to all other table names in the query string.
- return preg_replace_callback('/\b((?:DELETE\s+)?FROM|JOIN|INTO(?: TABLE)?|TABLE|(?column as $column_info)
{
- // Is this column generated?
- $is_generated = strval($column_info['generated'] ?? '') !== '';
- if ($is_generated)
- {
- $column = new DBTable\GeneratedColumn;
- $column->generated = strtolower($column_info['generated']);
- $column->is_stored = strtolower($column_info['stored'] ?? '');
- $column->is_stored = $column->is_stored !== 'virtual' && toBool($column->is_stored);
- }
- else
- {
- $column = new DBTable\Column;
- }
-
// Get the column name and type.
+ $column = new DBTable\Column;
$column->name = strval($column_info['name']);
list($column->type, $column->xetype, $column->size) = self::getTypeAndSize(strval($column_info['type']), strval($column_info['size']));
diff --git a/common/framework/parsers/dbquery/VariableBase.php b/common/framework/parsers/dbquery/VariableBase.php
index f4e29a0c5..0c5f984dd 100644
--- a/common/framework/parsers/dbquery/VariableBase.php
+++ b/common/framework/parsers/dbquery/VariableBase.php
@@ -398,11 +398,7 @@ class VariableBase
// Don't apply a filter if there is no variable.
$column = $this instanceof ColumnWrite ? $this->name : $this->column;
$filter = isset($this->filter) ? $this->filter : '';
- if (is_object($value) && !method_exists($value, '__toString'))
- {
- throw new \Rhymix\Framework\Exceptions\QueryError('Variable ' . $this->var . ' for column ' . $column . ' is not stringable');
- }
- if (is_scalar($value) && strval($value) === '')
+ if (!is_array($value) && strval($value) === '')
{
$filter = '';
}
diff --git a/common/framework/parsers/dbtable/GeneratedColumn.php b/common/framework/parsers/dbtable/GeneratedColumn.php
deleted file mode 100644
index 60a9726fb..000000000
--- a/common/framework/parsers/dbtable/GeneratedColumn.php
+++ /dev/null
@@ -1,12 +0,0 @@
-charset . ' COLLATE ' . $column->charset . '_general_ci';
}
}
- if ($column instanceof GeneratedColumn)
- {
- $columndef .= ' GENERATED ' . strtoupper($column->generated ?: 'always');
- $columndef .= ' AS (' . $column->default_value . ')';
- if ($column->is_stored)
- {
- $columndef .= ' STORED';
- }
- }
- else
- {
- if ($column->default_value !== null)
- {
- if (preg_match('/(?:int|float|double|decimal|number)/i', $column->type) && is_numeric($column->default_value))
- {
- $columndef .= ' DEFAULT ' . $column->default_value;
- }
- elseif (preg_match('/^\w+\(\)$/', $column->default_value))
- {
- $columndef .= ' DEFAULT ' . $column->default_value;
- }
- else
- {
- $columndef .= ' DEFAULT \'' . $column->default_value . '\'';
- }
- }
- }
if ($column->not_null)
{
$columndef .= ' NOT NULL';
}
+ if ($column->default_value !== null)
+ {
+ if (preg_match('/(?:int|float|double|decimal|number)/i', $column->type) && is_numeric($column->default_value))
+ {
+ $columndef .= ' DEFAULT ' . $column->default_value;
+ }
+ elseif (preg_match('/^\w+\(\)$/', $column->default_value))
+ {
+ $columndef .= ' DEFAULT ' . $column->default_value;
+ }
+ else
+ {
+ $columndef .= ' DEFAULT \'' . $column->default_value . '\'';
+ }
+ }
if ($column->auto_increment)
{
$columndef .= ' AUTO_INCREMENT';
}
-
$columns[] = $columndef;
}
diff --git a/common/functions.php b/common/functions.php
index 2e2080687..84b923681 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -671,7 +671,7 @@ function utf8_mbencode($str): string
$bytes = array(ord($m[0][0]), ord($m[0][1]), ord($m[0][2]), ord($m[0][3]));
$codepoint = ((0x07 & $bytes[0]) << 18) + ((0x3F & $bytes[1]) << 12) + ((0x3F & $bytes[2]) << 6) + (0x3F & $bytes[3]);
return '&#x' . dechex($codepoint) . ';';
- }, (string)$str) ?? '';
+ }, (string)$str);
}
/**
@@ -686,11 +686,11 @@ function utf8_normalize_spaces($str, bool $multiline = false): string
{
if ($multiline)
{
- return preg_replace(['/((?!\x0A)[\pZ\pC])+/u', '/\x20*\x0A\x20*/'], [' ', "\n"], (string)$str) ?? '';
+ return preg_replace(['/((?!\x0A)[\pZ\pC])+/u', '/\x20*\x0A\x20*/'], [' ', "\n"], (string)$str);
}
else
{
- return preg_replace('/[\pZ\pC]+/u', ' ', (string)$str) ?? '';
+ return preg_replace('/[\pZ\pC]+/u', ' ', (string)$str);
}
}
diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index 40a94dba2..6d7be5095 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -145,7 +145,7 @@
chunkfail: function(e, res) {
lastUploadTime = Date.now();
if (chunkStatus) {
- alert(window.xe.lang.msg_file_upload_error + " (Type 3)" + "\n" + res.errorThrown + "\n" + res.textStatus);
+ alert(window.xe.lang.msg_file_upload_error + " (Type 3)" + "
\n" + res.errorThrown + "
\n" + res.textStatus);
return chunkStatus = false;
}
},
@@ -169,7 +169,7 @@
result = jQuery.parseJSON(result);
}
if (!result) {
- alert(window.xe.lang.msg_file_upload_error + " (Type 5)" + "\n" + res.response().result);
+ alert(window.xe.lang.msg_file_upload_error + " (Type 5)" + "
\n" + res.response().result);
return false;
}
@@ -215,7 +215,7 @@
return false;
} else {
$container.data('editorStatus', null);
- alert(window.xe.lang.msg_file_upload_error + " (Type 6)" + "\n" + res.response().result);
+ alert(window.xe.lang.msg_file_upload_error + " (Type 6)" + "
\n" + res.response().result);
return false;
}
},
@@ -229,7 +229,7 @@
}
}, 1000);
if (chunkStatus) {
- alert(window.xe.lang.msg_file_upload_error + " (Type 7)" + "\n" + res.errorThrown + "\n" + res.textStatus);
+ alert(window.xe.lang.msg_file_upload_error + " (Type 7)" + "
\n" + res.errorThrown + "
\n" + res.textStatus);
return false;
}
},
diff --git a/common/scripts/cron.php b/common/scripts/cron.php
index 954d6a062..5d3ff146d 100644
--- a/common/scripts/cron.php
+++ b/common/scripts/cron.php
@@ -4,18 +4,14 @@
* This script runs the task queue.
*
* Unlike other scripts provided with Rhymix, it can be called
- * both on the CLI (through index.php) and over the network (directly).
+ * both on the command line and over the network.
*/
define('RXQUEUE_CRON', true);
// If called on the CLI, run additional checks.
if (PHP_SAPI === 'cli')
{
- if (!defined('RX_VERSION'))
- {
- echo "Error: This script must not be called directly.\n";
- exit(1);
- }
+ require_once __DIR__ . '/common.php';
}
else
{
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index b45f9f457..cdaaed1dc 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -56,7 +56,11 @@ class AdminAdminModel extends Admin
*/
public function getSiteAllList()
{
- $siteList = $this->getAllSitesThatHaveModules(Context::get('domain'));
+ if(Context::get('domain'))
+ {
+ $domain = Context::get('domain');
+ }
+ $siteList = $this->getAllSitesThatHaveModules($domain);
$this->add('site_list', $siteList);
}
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index 30508fc69..a372bc029 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -466,13 +466,11 @@ class CommentItem extends BaseObject
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
if($strlen)
{
- $content = escape(cut_str($content, $strlen, '...'), false);
- }
- else
- {
- $content = escape($content);
+ $content = cut_str($content, $strlen, '...');
}
+ $content = escape($content);
+
if ($content === '')
{
return $default_content;
@@ -513,12 +511,9 @@ class CommentItem extends BaseObject
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
if($strlen)
{
- return escape(cut_str($content, $strlen, '...'), false);
- }
- else
- {
- return escape($content);
+ $content = cut_str($content, $strlen, '...');
}
+ return escape($content);
}
/**
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 1fdf94d8f..dcf90e8d7 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -634,12 +634,10 @@ class DocumentItem extends BaseObject
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
if($strlen)
{
- return escape(cut_str($content, $strlen, '...'), false);
- }
- else
- {
- return escape($content);
+ $content = cut_str($content, $strlen, '...');
}
+
+ return escape($content);
}
function getContentText($strlen = 0)
@@ -655,22 +653,17 @@ class DocumentItem extends BaseObject
}
$content = preg_replace('!(||get('content'));
- //$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
- //$content = preg_replace_callback('/]*>/is', array($this, '_addAllowScriptAccess'), $content);
+ $content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
+ $content = preg_replace_callback('/]*>/is', array($this, '_addAllowScriptAccess'), $content);
if($strlen)
{
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
- return escape(cut_str($content, $strlen, '...'), false);
- }
- else
- {
- return escape($content);
+ $content = cut_str($content, $strlen, '...');
}
+
+ return escape($content);
}
- /**
- * @deprecated
- */
function _addAllowScriptAccess($m)
{
if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
@@ -681,9 +674,6 @@ class DocumentItem extends BaseObject
return $m[0];
}
- /**
- * @deprecated
- */
function _checkAllowScriptAccess($m)
{
if($m[1] == 'object')
@@ -816,7 +806,8 @@ class DocumentItem extends BaseObject
// Truncate string
$content = cut_str($content, $str_size, $tail);
- return escape($content, false);
+
+ return escape($content);
}
function getRegdate($format = 'Y.m.d H:i:s', $conversion = true)
diff --git a/modules/member/tpl/js/signup_check.js b/modules/member/tpl/js/signup_check.js
index 7b0ff1585..5c4d2e1a4 100644
--- a/modules/member/tpl/js/signup_check.js
+++ b/modules/member/tpl/js/signup_check.js
@@ -19,32 +19,31 @@ function memberSetEvent() {
// 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
function memberCheckValue(event) {
var field = event.target;
- if(!field.name || !field.value) {
- return;
- }
+ var _name = field.name;
+ var _value = field.value;
+ if(!_name || !_value) return;
- exec_json('member.procMemberCheckValue', {
- name: field.name,
- value: field.value
- }, function(data) {
- completeMemberCheckValue(data, null, field);
- });
+ var params = {name:_name, value:_value};
+ var response_tags = ['error','message'];
+
+ exec_xml('member','procMemberCheckValue', params, completeMemberCheckValue, response_tags, field);
}
// 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
-function completeMemberCheckValue(data, unused, field) {
+function completeMemberCheckValue(ret_obj, response_tags, field) {
var _id = 'dummy_check'+field.name;
var dummy = jQuery('#'+_id);
+
+ if(ret_obj['message']=='success') {
+ dummy.html('').hide();
+ return;
+ }
+
if (!dummy.length) {
dummy = jQuery('').attr('id', _id).appendTo(field.parentNode);
}
- if(data.message == 'success') {
- dummy.html('').hide();
- return;
- } else {
- dummy.html(data.message).show();
- }
+ dummy.html(ret_obj['message']).show();
}
// 결과 메세지를 정리하는 함수
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index c7916f4cc..7831e9f72 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -443,10 +443,6 @@ class ModuleController extends Module
{
$oMenuAdminController = getAdminController('menu');
$menuSrl = $oMenuAdminController->getUnlinkedMenu();
- if ($menuSrl instanceof BaseObject && !$menuSrl->toBool())
- {
- return $menuSrl;
- }
$menuArgs->menu_srl = $menuSrl;
$menuArgs->menu_item_srl = getNextSequence();
diff --git a/modules/module/queries/getDomainInfo.xml b/modules/module/queries/getDomainInfo.xml
index 29c00c7ec..09801fd88 100644
--- a/modules/module/queries/getDomainInfo.xml
+++ b/modules/module/queries/getDomainInfo.xml
@@ -1,11 +1,7 @@
-
+
@@ -13,6 +9,7 @@
+
diff --git a/modules/rss/tpl/format/rss10.html b/modules/rss/tpl/format/rss10.html
index d829d1bd9..d04b25392 100644
--- a/modules/rss/tpl/format/rss10.html
+++ b/modules/rss/tpl/format/rss10.html
@@ -28,7 +28,7 @@
-
{$oDocument->getTitleText()}
{$oDocument->getPermanentUrl()}
- {$oDocument->getSummary(400)}
+ {$oDocument->getSummary(400)|escape}
{$oDocument->getNickName()}
{date('c', ztime($oDocument->get('regdate')))}
diff --git a/modules/rss/tpl/format/rss20.html b/modules/rss/tpl/format/rss20.html
index b88e42a09..0343a938c 100644
--- a/modules/rss/tpl/format/rss20.html
+++ b/modules/rss/tpl/format/rss20.html
@@ -22,7 +22,7 @@
{\Rhymix\Framework\Filters\HTMLFilter::fixRelativeUrls(utf8_trim(utf8_normalize_spaces($oDocument->get('content'))))|escape}
- {$oDocument->getSummary(400)}
+ {$oDocument->getSummary(400)|escape}
{Context::replaceUserLang($oDocument->getModuleName())}
{Context::replaceUserLang($category_name)}
diff --git a/tests/_data/dbtable/generated.xml b/tests/_data/dbtable/generated.xml
deleted file mode 100644
index 0c136faa3..000000000
--- a/tests/_data/dbtable/generated.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/tests/unit/framework/DBTest.php b/tests/unit/framework/DBTest.php
index 730b25aed..6fe855180 100644
--- a/tests/unit/framework/DBTest.php
+++ b/tests/unit/framework/DBTest.php
@@ -175,22 +175,6 @@ class DBTest extends \Codeception\Test\Unit
$target = 'INSERT INTO `' . $prefix . 'documents` (a, b, c) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE b = ?, c = ?';
$this->assertEquals($target, $oDB->addPrefixes($source));
- $source = "LOAD DATA LOCAL INFILE '/tmp/foo.csv' INTO TABLE foo_table FIELDS TERMINATED BY ',' ENCLOSED BY '\"' LINES TERMINATED BY '\\n' (a, b, c)";
- $target = "LOAD DATA LOCAL INFILE '/tmp/foo.csv' INTO TABLE `" . $prefix . "foo_table` FIELDS TERMINATED BY ',' ENCLOSED BY '\"' LINES TERMINATED BY '\\n' (a, b, c)";
- $this->assertEquals($target, $oDB->addPrefixes($source));
-
- $source = 'ALTER TABLE documents ADD INDEX idx_foo (a, b)';
- $target = 'ALTER TABLE `' . $prefix . 'documents` ADD INDEX idx_foo (a, b)';
- $this->assertEquals($target, $oDB->addPrefixes($source));
-
- $source = 'TRUNCATE TABLE documents';
- $target = 'TRUNCATE TABLE `' . $prefix . 'documents`';
- $this->assertEquals($target, $oDB->addPrefixes($source));
-
- $source = 'DROP TABLE documents';
- $target = 'DROP TABLE `' . $prefix . 'documents`';
- $this->assertEquals($target, $oDB->addPrefixes($source));
-
$source = 'update documents set a = ?, b = ? where c = ?';
$this->assertEquals($source, $oDB->addPrefixes($source));
diff --git a/tests/unit/framework/parsers/DBTableParserTest.php b/tests/unit/framework/parsers/DBTableParserTest.php
index 4c7b2e9ec..ab8b00d47 100644
--- a/tests/unit/framework/parsers/DBTableParserTest.php
+++ b/tests/unit/framework/parsers/DBTableParserTest.php
@@ -63,14 +63,4 @@ class DBTableParserTest extends \Codeception\Test\Unit
$this->assertStringContainsString('CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci', $sql);
$this->assertStringContainsString('ENGINE = InnoDB', $sql);
}
-
- public function testGeneratedColumn()
- {
- $table = Rhymix\Framework\Parsers\DBTableParser::loadXML(\RX_BASEDIR . 'tests/_data/dbtable/generated.xml');
- $sql = $table->getCreateQuery('rx_');
- $this->assertStringContainsString('CREATE TABLE `rx_generated`', $sql);
- $this->assertStringContainsString('`gentest1` BIGINT GENERATED ALWAYS AS (document_srl + member_srl) STORED NOT NULL,', $sql);
- $this->assertStringContainsString('`gentest2` BIGINT GENERATED ALWAYS AS (MAX(module_srl, document_srl)),', $sql);
- $this->assertStringContainsString('`gentest3` VARCHAR(40) GENERATED ALWAYS AS (CONCAT(module_srl, \'_\', document_srl)) NOT NULL,', $sql);
- }
}