Skip to content

Commit 190c71d

Browse files
author
AIC Web Tech
committed
Fixing to work with Mysql 8.0
1 parent 7d27439 commit 190c71d

File tree

13 files changed

+248
-242
lines changed

13 files changed

+248
-242
lines changed

app/Engine.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,6 @@ public function actionStatics($input) {
822822
$Access = \App\ApiAccessManager::lookUpByInput($input);
823823

824824
$response = new \stdClass;
825-
$response->mysql = config('database.mysql.server_version');
826-
$response->regexp = config('database.mysql.new_regexp');
827825
$response->bibles = $this->actionBibles($input);
828826
$response->books = $this->actionBooks($input);
829827
$response->shortcuts = $this->actionShortcuts($input);
@@ -963,7 +961,9 @@ public function actionShortcuts($input) {
963961
}
964962

965963
$Shortcuts = $namespaced_class::select('id', 'name', 'short1', 'short2', 'reference', 'display')
966-
->orderBy('id', 'ASC') -> get() -> all();
964+
->orderBy('id', 'ASC')
965+
->where('display', 1) // remove in v 5.5 RE BSS-57
966+
-> get() -> all();
967967

968968
return $Shortcuts;
969969
}

app/Models/ApiKey.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ public function isLimitReached($date = null)
139139

140140
public function getAccessLimit()
141141
{
142+
if($this->access_level_id == ApiAccessLevel::FULL) {
143+
return 0;
144+
}
145+
142146
$limit_raw = $this->limit;
143147

144148
if($limit_raw === null) {

app/Models/Verses/VerseStandard.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public static function getSearch($Passages = NULL, $Search = NULL, $parameters =
130130
throw new \Exception($msg);
131131
}
132132

133+
// $Query->dump();
133134

134135
if(config('app.debug_query')) {
135136
// $Query->dump();

app/SqlSearch.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,8 @@ protected function _termFormat($term, $exact_phrase = FALSE, $whole_words = FALS
502502
}
503503

504504
if(config('database.mysql.new_regexp')) {
505-
$pre = ($has_st_pct) ? '' : '\\\\b';
506-
$post = ($has_en_pct) ? '' : '\\\\b';
505+
$pre = ($has_st_pct) ? '' : '\\b';
506+
$post = ($has_en_pct) ? '' : '\\b';
507507
} else {
508508
$pre = ($has_st_pct) ? '' : '([[:<:]]|[‹])';
509509
$post = ($has_en_pct) ? '' : '([[:>:]]|[›])';

changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Bible SuperSearch API Changelog
22

3-
= 5.5.0 / March ??, 2024
3+
= 5.4.1 / Feb 29, 2024
4+
* Fixed to work with MySLQ 8.0
5+
* Applying upstream security fixes and bug fixes
6+
* Added config to control whether to allow parallel searches across Bibles of different languages.
47
* Downloads: Bibles are now grouped by language in the ZIP file.
58

69
= 5.4.0 / December 20, 2023

0 commit comments

Comments
 (0)