Skip to content

Commit 7f870fa

Browse files
committed
Merge branch 'develop-v4' into master-v4
2 parents f38931b + 0e8dbd7 commit 7f870fa

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0-beta.3
1+
4.0.0-beta.4

php/class-ee-db.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,29 @@ public static function create() {
3535
self::$db = new SQLite3( DB );
3636
$query = "CREATE TABLE sites (
3737
id INTEGER NOT NULL,
38-
sitename VARCHAR,
39-
site_type VARCHAR,
40-
site_title VARCHAR,
41-
proxy_type VARCHAR,
42-
cache_type VARCHAR,
43-
site_path VARCHAR,
44-
created_on DATETIME,
45-
is_enabled BOOLEAN DEFAULT 1,
46-
is_ssl BOOLEAN DEFAULT 0,
47-
storage_fs VARCHAR,
48-
storage_db VARCHAR,
49-
db_name VARCHAR,
50-
db_user VARCHAR,
38+
sitename VARCHAR,
39+
site_type VARCHAR,
40+
site_title VARCHAR,
41+
proxy_type VARCHAR,
42+
cache_type VARCHAR,
43+
site_path VARCHAR,
44+
created_on DATETIME,
45+
is_enabled BOOLEAN DEFAULT 1,
46+
is_ssl BOOLEAN DEFAULT 0,
47+
storage_fs VARCHAR,
48+
storage_db VARCHAR,
49+
db_name VARCHAR,
50+
db_user VARCHAR,
5151
db_password VARCHAR,
52-
db_root_password VARCHAR,
53-
db_host VARCHAR,
54-
db_port VARCHAR,
55-
wp_user VARCHAR,
56-
wp_pass VARCHAR,
57-
email VARCHAR,
58-
php_version VARCHAR,
52+
db_root_password VARCHAR,
53+
db_host VARCHAR,
54+
db_port VARCHAR,
55+
wp_user VARCHAR,
56+
wp_pass VARCHAR,
57+
email VARCHAR,
58+
php_version VARCHAR,
5959
PRIMARY KEY (id),
60-
UNIQUE (sitename),
60+
UNIQUE (sitename),
6161
CHECK (is_enabled IN (0, 1)),
6262
CHECK (is_ssl IN (0, 1))
6363
);";
@@ -85,7 +85,7 @@ public static function create() {
8585
id INTEGER PRIMARY KEY AUTOINCREMENT,
8686
sitename VARCHAR,
8787
command VARCHAR,
88-
schedule VARCHAR,
88+
schedule VARCHAR
8989
);";
9090

9191
self::$db->exec( $query );

0 commit comments

Comments
 (0)