Skip to content

Commit cfadbca

Browse files
ryuringryuring
committed
PostgreSQLとSQLiteの対応 fix #2086 
1 parent dc6193f commit cfadbca

File tree

17 files changed

+492
-14
lines changed

17 files changed

+492
-14
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ node_modules
112112
!/composer/.gitkeep
113113
# vendor
114114
!/vendor/.gitkeep
115+
# db
116+
/db/*
117+
!/db/.gitkeep
115118
# etc
116119
LOCAL_TODO.md
117120
LOCAL_Q&A.md

‎db/.gitkeep

Whitespace-only changes.

‎docker/docker-compose.yml.default

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
- ./phpmyadmin/sessions:/sessions
6363

6464
bc5-pg:
65-
image: postgres:10.5
65+
image: postgres:15.2
6666
container_name: bc5-pg
6767
ports:
6868
- 5432:5432

‎plugins/baser-core/config/Migrations/20230328000000_AlterIdToBaserCoreAll.php

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBaserCoreAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('pages')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
$this->table('password_requests')
25+
->changeColumn('id', 'integer', [
26+
'identity' => true,
27+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
28+
])
29+
->update();
30+
$this->table('content_folders')
31+
->changeColumn('id', 'integer', [
32+
'identity' => true,
33+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
34+
])
35+
->update();
36+
$this->table('plugins')
37+
->changeColumn('id', 'integer', [
38+
'identity' => true,
39+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
40+
])
41+
->update();
42+
$this->table('user_groups')
43+
->changeColumn('id', 'integer', [
44+
'identity' => true,
45+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
46+
])
47+
->update();
48+
$this->table('users')
49+
->changeColumn('id', 'integer', [
50+
'identity' => true,
51+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
52+
])
53+
->update();
54+
$this->table('users_user_groups')
55+
->changeColumn('id', 'integer', [
56+
'identity' => true,
57+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
58+
])
59+
->update();
60+
$this->table('login_stores')
61+
->changeColumn('id', 'integer', [
62+
'identity' => true,
63+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
64+
])
65+
->update();
66+
$this->table('site_configs')
67+
->changeColumn('id', 'integer', [
68+
'identity' => true,
69+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
70+
])
71+
->update();
72+
$this->table('dblogs')
73+
->changeColumn('id', 'integer', [
74+
'identity' => true,
75+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
76+
])
77+
->update();
78+
$this->table('permissions')
79+
->changeColumn('id', 'integer', [
80+
'identity' => true,
81+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
82+
])
83+
->update();
84+
$this->table('sites')
85+
->changeColumn('id', 'integer', [
86+
'identity' => true,
87+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
88+
])
89+
->update();
90+
$this->table('contents')
91+
->changeColumn('id', 'integer', [
92+
'identity' => true,
93+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
94+
])
95+
->update();
96+
$this->table('permission_groups')
97+
->changeColumn('id', 'integer', [
98+
'identity' => true,
99+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
100+
])
101+
->update();
102+
}
103+
104+
}

‎plugins/baser-core/src/Service/BcDatabaseService.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ public function deleteTables($dbConfigKeyName = 'default', $dbConfig = null)
12611261
$sql = "SELECT sequence_name FROM INFORMATION_SCHEMA.sequences WHERE sequence_schema = '{$dbConfig['schema']}';";
12621262
$sequences = [];
12631263
try {
1264-
$sequences = $db->query($sql);
1264+
$sequences = $db->execute($sql)->fetchAll('assoc');
12651265
} catch (BcException $e) {
12661266
}
12671267
if ($sequences) {
@@ -1278,7 +1278,9 @@ public function deleteTables($dbConfigKeyName = 'default', $dbConfig = null)
12781278
break;
12791279

12801280
case 'sqlite':
1281-
@unlink($dbConfig['database']);
1281+
if(file_exists($dbConfig['database'])) {
1282+
unlink($dbConfig['database']);
1283+
}
12821284
break;
12831285
}
12841286
return true;
@@ -1427,11 +1429,11 @@ public function constructionTable(string $plugin, string $dbConfigKeyName = 'def
14271429
$db = $this->getDataSource($dbConfigKeyName, $dbConfig);
14281430
if (!$dbConfig) $dbConfig = ConnectionManager::getConfig($dbConfigKeyName);
14291431
$datasource = strtolower(str_replace('Cake\\Database\\Driver\\', '', $dbConfig['driver']));
1430-
if (!$db->isConnected()) {
1431-
return false;
1432-
} elseif ($datasource == 'sqlite') {
1432+
if ($datasource == 'sqlite') {
14331433
$db->connect();
14341434
chmod($dbConfig['database'], 0666);
1435+
} elseif (!$db->isConnected()) {
1436+
return false;
14351437
}
14361438
return $this->migrate($plugin, $dbConfigKeyName);
14371439
}

‎plugins/bc-blog/config/Migrations/20230328000000_AlterIdToBcBlogAll.php

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBcBlogAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('blog_contents')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
$this->table('blog_categories')
25+
->changeColumn('id', 'integer', [
26+
'identity' => true,
27+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
28+
])
29+
->update();
30+
$this->table('blog_posts')
31+
->changeColumn('id', 'integer', [
32+
'identity' => true,
33+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
34+
])
35+
->update();
36+
$this->table('blog_comments')
37+
->changeColumn('id', 'integer', [
38+
'identity' => true,
39+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
40+
])
41+
->update();
42+
$this->table('blog_posts_blog_tags')
43+
->changeColumn('id', 'integer', [
44+
'identity' => true,
45+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
46+
])
47+
->update();
48+
$this->table('blog_tags')
49+
->changeColumn('id', 'integer', [
50+
'identity' => true,
51+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
52+
])
53+
->update();
54+
}
55+
56+
}

‎plugins/bc-content-link/config/Migrations/20230328000000_AlterIdToBcContentLinkAll.php

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBcContentLinkAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('content_links')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
}
25+
26+
}

‎plugins/bc-custom-content/config/Migrations/20230328000000_AlterIdToBcCustomContentAll.php

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBcCustomContentAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('custom_contents')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
$this->table('custom_tables')
25+
->changeColumn('id', 'integer', [
26+
'identity' => true,
27+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
28+
])
29+
->update();
30+
$this->table('custom_entry_1_recruit')
31+
->changeColumn('id', 'integer', [
32+
'identity' => true,
33+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
34+
])
35+
->update();
36+
$this->table('custom_entry_2_occupations')
37+
->changeColumn('id', 'integer', [
38+
'identity' => true,
39+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
40+
])
41+
->update();
42+
$this->table('custom_links')
43+
->changeColumn('id', 'integer', [
44+
'identity' => true,
45+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
46+
])
47+
->update();
48+
$this->table('custom_fields')
49+
->changeColumn('id', 'integer', [
50+
'identity' => true,
51+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
52+
])
53+
->update();
54+
}
55+
56+
}

‎plugins/bc-editor-template/config/Migrations/20230328000000_AlterIdToBcEditorTemplateAll.php

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBcEditorTemplateAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('editor_teplates')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
}
25+
26+
}

‎plugins/bc-favorite/config/Migrations/20230328000000_AlterIdToBcFavoriteAll.php

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
declare(strict_types=1);
3+
4+
use BaserCore\Database\Migration\BcMigration;
5+
use Phinx\Db\Adapter\PostgresAdapter;
6+
7+
class AlterIdToBcFavoriteAll extends BcMigration
8+
{
9+
/**
10+
* Change Method.
11+
*
12+
* More information on this method is available here:
13+
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
14+
* @return void
15+
*/
16+
public function change()
17+
{
18+
$this->table('favorites')
19+
->changeColumn('id', 'integer', [
20+
'identity' => true,
21+
'generated' => PostgresAdapter::GENERATED_BY_DEFAULT
22+
])
23+
->update();
24+
}
25+
26+
}

‎plugins/bc-installer/src/Controller/Admin/InstallationsController.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Cake\Core\Configure;
2222
use Cake\Event\EventInterface;
2323
use Cake\Http\Cookie\Cookie;
24+
use Cake\Http\Response;
2425
use Cake\ORM\Exception\PersistenceFailedException;
2526
use Cake\Utility\Hash;
2627
use BaserCore\Annotation\UnitTest;
@@ -85,7 +86,7 @@ public function step2(InstallationsAdminServiceInterface $service)
8586
/**
8687
* Step 3: データベースの接続設定
8788
*
88-
* @return void
89+
* @return void|Response
8990
* @noTodo
9091
* @checked
9192
*/
@@ -122,7 +123,7 @@ public function step3(InstallationsAdminServiceInterface $service)
122123
);
123124
$this->BcMessage->setInfo(__d('baser_core', 'データベースの構築に成功しました。'));
124125
return $this->redirect(['action' => 'step4']);
125-
} catch (BcException $e) {
126+
} catch (\Throwable $e) {
126127
$errorMessage = __d('baser_core', 'データベースの構築中にエラーが発生しました。') . "\n" . $e->getMessage();
127128
$this->BcMessage->setError($errorMessage);
128129
}

0 commit comments

Comments
 (0)