Merge branch 'mrrobot47-update/db-and-docker-functions' into develop-v4

Author: mbtamuli

php/class-ee-db.php

@@ -9,7 +9,7 @@ public function __construct() {
 			self::init_db();
 		}
 	}
-	
+
 	public function __destruct() {
 		self::$db->close();
 	}
@@ -34,7 +34,7 @@ public static function init_db() {
 	public static function create() {
 		self::$db = new SQLite3( DB );
 		$query    = "CREATE TABLE sites (
-			id INTEGER NOT NULL, 
+			id INTEGER NOT NULL,
 			sitename VARCHAR, 
 			site_type VARCHAR, 
 			site_title VARCHAR, 
@@ -56,19 +56,31 @@ public static function create() {
 			wp_pass VARCHAR, 
 			email VARCHAR, 
 			php_version VARCHAR, 
-			PRIMARY KEY (id), 
+			PRIMARY KEY (id),
 			UNIQUE (sitename), 
-			CHECK (is_enabled IN (0, 1)), 
+			CHECK (is_enabled IN (0, 1)),
 			CHECK (is_ssl IN (0, 1))
 		);";
 
-		self::$db->exec( $query );
-
-		$query    = "CREATE TABLE migrations (
+		$query .= "CREATE TABLE migrations (
 			migration VARCHAR,
 			timestamp DATETIME
 		);";
 
+		$query .= "CREATE TABLE services (
+			id INTEGER NOT NULL,
+			sitename VARCHAR,
+			phpmyadmin BOOLEAN DEFAULT 0,
+			mailhog BOOLEAN DEFAULT 0,
+			postfix BOOLEAN DEFAULT 0,
+			phpredisadmin BOOLEAN DEFAULT 0,
+			adminer BOOLEAN DEFAULT 0,
+			anemometer BOOLEAN DEFAULT 0,
+			debug BOOLEAN DEFAULT 0,
+			PRIMARY KEY (id),
+			FOREIGN KEY (id) REFERENCES sites(id)
+		);";
+
 		self::$db->exec( $query );
 	}
 
@@ -79,7 +91,7 @@ public static function create() {
 	 *
 	 * @return bool
 	 */
-	public static function insert( $data, $table_name='sites' ) {
+	public static function insert( $data, $table_name = 'sites' ) {
 
 		if ( empty ( self::$db ) ) {
 			self::init_db();
@@ -109,7 +121,7 @@ public static function insert( $data, $table_name='sites' ) {
 	 *
 	 * @return array|bool
 	 */
-	public static function select( $columns = array(), $where = array(), $table_name='sites' ) {
+	public static function select( $columns = array(), $where = array(), $table_name = 'sites', $limit = null ) {
 
 		if ( empty ( self::$db ) ) {
 			self::init_db();
@@ -134,6 +146,10 @@ public static function select( $columns = array(), $where = array(), $table_name
 			$select_data_query .= " WHERE $conditions";
 		}
 
+		if ( ! empty( $limit ) ) {
+			$select_data_query .= " LIMIT $limit";
+		}
+
 		$select_data_exec = self::$db->query( $select_data_query );
 		$select_data      = array();
 		if ( $select_data_exec ) {
@@ -157,7 +173,7 @@ public static function select( $columns = array(), $where = array(), $table_name
 	 *
 	 * @return bool
 	 */
-	public static function update( $data, $where, $table_name='sites' ) {
+	public static function update( $data, $where, $table_name = 'sites' ) {
 		if ( empty ( self::$db ) ) {
 			self::init_db();
 		}
@@ -192,7 +208,7 @@ public static function update( $data, $where, $table_name='sites' ) {
 	 *
 	 * @return bool
 	 */
-	public static function delete( $where, $table_name='sites' ) {
+	public static function delete( $where, $table_name = 'sites' ) {
 
 		$conditions = array();
 		foreach ( $where as $key => $value ) {
@@ -268,9 +284,10 @@ public static function get_migrations() {
 		}
 
 		$sites = self::select( [ 'migration' ], [], 'migrations' );
-		if( empty( $sites ) ) {
+		if ( empty( $sites ) ) {
 			return [];
 		}
+
 		return array_column( $sites, 'migration' );
 	}
 }

php/class-ee-docker.php

@@ -152,14 +152,21 @@ public static function disconnect_site_network_from( $site_name, $from_container
 	/**
 	 * Function to boot the containers.
 	 *
-	 * @param String $dir Path to docker-compose.yml.
+	 * @param String $dir      Path to docker-compose.yml.
+	 * @param array  $services Services to bring up.
 	 *
 	 * @return bool success.
 	 */
-	public static function docker_compose_up( $dir ) {
+	public static function docker_compose_up( $dir, $services = [] ) {
 		$chdir_return_code = chdir( $dir );
 		if ( $chdir_return_code ) {
-			return default_launch( 'docker-compose up -d' );
+			if ( empty( $services ) ) {
+				return default_launch( 'docker-compose up -d' );
+			} else {
+				$all_services = implode( ' ', $services );
+
+				return default_launch( "docker-compose up -d $all_services" );
+			}
 		}
 
 		return false;
@@ -168,14 +175,21 @@ public static function docker_compose_up( $dir ) {
 	/**
 	 * Function to destroy the containers.
 	 *
-	 * @param String $dir Path to docker-compose.yml.
+	 * @param String $dir      Path to docker-compose.yml.
+	 * @param array  $services Services to bring up.
 	 *
 	 * @return bool success.
 	 */
-	public static function docker_compose_down( $dir ) {
+	public static function docker_compose_down( $dir, $services = [] ) {
 		$chdir_return_code = chdir( $dir );
 		if ( $chdir_return_code ) {
-			return default_launch( 'docker-compose down' );
+			if ( empty( $services ) ) {
+				return default_launch( 'docker-compose up -d' );
+			} else {
+				$all_services = implode( ' ', $services );
+
+				return default_launch( "docker-compose up $all_services -d" );
+			}
 		}
 
 		return false;