Skip to content

Commit

Permalink
Merge branch 'master' into Girgias_remove_set_xml_usage
Browse files Browse the repository at this point in the history
  • Loading branch information
k00ni committed Oct 20, 2023
2 parents e079f0d + 54886d4 commit 33330b5
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mariadb-10.10.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MariaDB 10.10 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb-10.11.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MariaDB 10.11 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb-10.5.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MariaDB 10.5 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb-10.6.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MariaDB 10.6 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb-10.9.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MariaDB 10.9 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql-5.5.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MySQL 5.5 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql-5.6.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MySQL 5.6 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql-5.7.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MySQL 5.7 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql-8.0.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MySQL 8.0 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql-8.1.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: MySQL 8.1 Tests

on: push
on: [push, pull_request]

jobs:
pdo-mysql:
Expand Down
2 changes: 1 addition & 1 deletion store/ARC2_StoreLoadQueryHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ public function bufferGraphSQL($g2t)

public function bufferIDSQL($tbl, $id, $val, $val_type)
{
$tbl = $tbl.'2val';
$tbl .= '2val';
if ('id2val' == $tbl) {
$cols = 'id, val, val_type';
$vals = '('.$id.", '".$this->store->a['db_object']->escape($val)."', ".$val_type.')';
Expand Down

0 comments on commit 33330b5

Please sign in to comment.