Fix and cleanup existing test suite

Author: dpanta94

src/Schema/Builder.php

@@ -3,10 +3,8 @@
 namespace StellarWP\Schema;
 
 use StellarWP\Schema\Config;
-use StellarWP\Schema\Fields;
-use StellarWP\Schema\Fields\Contracts\Schema_Interface as Field_Schema_Interface;
 use StellarWP\Schema\Tables;
-use StellarWP\Schema\Tables\Contracts\Schema_Interface as Table_Schema_Interface;
+use StellarWP\Schema\Tables\Contracts\Table_Interface as Table_Schema_Interface;
 use StellarWP\Schema\Tables\Filters\Group_FilterIterator;
 use WP_CLI;
 
@@ -37,7 +35,7 @@ public function __construct( $db = null, $container = null ) {
 	}
 
 	/**
-	 * Whether all the custom tables exist or not. Does not check custom fields.
+	 * Whether all the custom tables exist or not.
 	 *
 	 * Note: the method will return `false` if even one table is missing.
 	 *
@@ -47,7 +45,7 @@ public function __construct( $db = null, $container = null ) {
 	 *
 	 * @param string|null $group An optional group name to restrict the check to.
 	 *
-	 * @return bool Whether all custom tables exist or not. Does not check custom fields.
+	 * @return bool Whether all custom tables exist or not.
 	 */
 	public function all_tables_exist( $group = null ) {
 		$table_schemas = $this->get_registered_table_schemas();
@@ -64,7 +62,6 @@ public function all_tables_exist( $group = null ) {
 		$result = $this->db::get_col( 'SHOW TABLES' );
 		foreach ( $table_schemas as $table_schema ) {
 			if ( ! in_array( $table_schema::table_name(), $result, true ) ) {
-
 				return false;
 			}
 		}
@@ -108,35 +105,6 @@ public function down() {
 		 * @since 1.0.0
 		 */
 		do_action( 'stellarwp_post_drop_tables' );
-
-		/**
-		 * Runs before the custom fields are dropped.
-		 *
-		 * @since 1.0.0
-		 */
-		do_action( 'stellarwp_pre_drop_fields' );
-
-		$field_schemas = $this->get_registered_field_schemas();
-
-		/**
-		 * Filters the fields to be dropped.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param \Iterator $field_classes A list of Field_Schema_Interface objects that will have their fields dropped.
-		 */
-		$field_schemas = apply_filters( 'stellarwp_fields_to_drop', $field_schemas );
-
-		foreach ( $field_schemas as $field_schema ) {
-			$field_schema->drop();
-		}
-
-		/**
-		 * Runs after the custom tables have been dropped by The Events Calendar.
-		 *
-		 * @since 1.0.0
-		 */
-		do_action( 'stellarwp_post_drop_fields' );
 	}
 
 	/**
@@ -153,17 +121,6 @@ public function empty_custom_tables() {
 		}
 	}
 
-	/**
-	 * Get the registered field handlers.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return Fields\Collection
-	 */
-	public function get_registered_field_schemas(): Fields\Collection {
-		return $this->container->get( Fields\Collection::class );
-	}
-
 	/**
 	 * Get the md5 hash of all the registered schemas classes with their versions.
 	 *

src/Schema/Columns/Contracts/Auto_Incrementable.php

@@ -18,7 +18,7 @@
  *
  * @package StellarWP\Schema\Columns\Contracts
  */
-interface Auto_Incrementable {
+interface Auto_Incrementable extends Primarable {
 	/**
 	 * Get the auto increment of the column.
 	 *

src/Schema/Columns/Contracts/Column.php

@@ -136,7 +136,7 @@ public function get_nullable(): bool {
 	 *
 	 * @return mixed The default value of the column.
 	 */
-	public function get_default(): mixed {
+	public function get_default() {
 		return $this->default;
 	}
 
@@ -255,9 +255,9 @@ public function set_on_update( ?string $on_update ): self {
 	/**
 	 * Get the definition of the column.
 	 *
-	 * @return string The definition of the column.
+	 * @return array The definition of the column.
 	 */
-	public function get_definition(): string {
+	public function get_definition(): array {
 		$sql = "`{$this->get_name()}` {$this->get_type()}";
 
 		if ( $this instanceof Lengthable && $this instanceof Precisionable ) {
@@ -289,7 +289,20 @@ public function get_definition(): string {
 			$sql .= ' ON UPDATE ' . $this->get_on_update();
 		}
 
-		return $sql;
+		$index_sql = '';
+
+		if ( $this->is_index() ) {
+			if ( $this->is_primary_key() ) {
+				$index_sql = 'PRIMARY KEY';
+			} elseif ( $this->is_unique() ) {
+				$index_sql = 'UNIQUE KEY `' . $this->get_name() . '`';
+			} elseif ( $this->is_index() ) {
+				$index_sql = 'INDEX `' . $this->get_name() . '`';
+			}
+			$index_sql = "{$index_sql} ({$this->get_name()})";
+		}
+
+		return [ $sql, $index_sql ];
 	}
 
 	/**

src/Schema/Columns/Contracts/Column_Interface.php

@@ -54,7 +54,7 @@ public function get_nullable(): bool;
 	 *
 	 * @return mixed The default value of the column.
 	 */
-	public function get_default(): mixed;
+	public function get_default();
 
 	/**
 	 * Get the on update value of the column.
@@ -66,9 +66,9 @@ public function get_on_update(): ?string;
 	/**
 	 * Get the definition of the column.
 	 *
-	 * @return string The definition of the column.
+	 * @return array The definition of the column.
 	 */
-	public function get_definition(): string;
+	public function get_definition(): array;
 
 	/**
 	 * Get whether the column is searchable.

…ma/Columns/Contracts/Datetime_Column.php src/Schema/Columns/Datetime_Column.phpsrc/Schema/Columns/Contracts/Datetime_Column.php renamed to src/Schema/Columns/Datetime_Column.php src/Schema/Columns/Contracts/Datetime_Column.php renamed to src/Schema/Columns/Datetime_Column.php

@@ -4,21 +4,23 @@
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
 
 declare( strict_types=1 );
 
-namespace StellarWP\Schema\Columns\Contracts;
+namespace StellarWP\Schema\Columns;
+
+use StellarWP\Schema\Columns\Contracts\Column;
 
 /**
  * Class Datetime_Column
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
-abstract class Datetime_Column extends Column {
+class Datetime_Column extends Column {
 	/**
 	 * The type of the column.
 	 *

…chema/Columns/Contracts/Float_Column.php src/Schema/Columns/Float_Column.phpsrc/Schema/Columns/Contracts/Float_Column.php renamed to src/Schema/Columns/Float_Column.php src/Schema/Columns/Contracts/Float_Column.php renamed to src/Schema/Columns/Float_Column.php

@@ -4,14 +4,27 @@
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
 
 declare( strict_types=1 );
 
-namespace StellarWP\Schema\Columns\Contracts;
+namespace StellarWP\Schema\Columns;
 
-abstract class Float_Column extends Column implements Lengthable, Signable, Precisionable, Uniquable {
+use StellarWP\Schema\Columns\Contracts\Column;
+use StellarWP\Schema\Columns\Contracts\Lengthable;
+use StellarWP\Schema\Columns\Contracts\Signable;
+use StellarWP\Schema\Columns\Contracts\Precisionable;
+use StellarWP\Schema\Columns\Contracts\Uniquable;
+
+/**
+ * Class Float_Column
+ *
+ * @since TBD
+ *
+ * @package StellarWP\Schema\Columns
+ */
+class Float_Column extends Column implements Lengthable, Signable, Precisionable, Uniquable {
 	/**
 	 * The length of the column.
 	 *
@@ -36,9 +49,9 @@ abstract class Float_Column extends Column implements Lengthable, Signable, Prec
 	/**
 	 * The default value of the column.
 	 *
-	 * @var int
+	 * @var float
 	 */
-	protected ?int $default = null;
+	protected $default = null;
 
 	/**
 	 * The type of the column.

src/Schema/Columns/ID.php

@@ -11,8 +11,6 @@
 
 namespace StellarWP\Schema\Columns;
 
-use StellarWP\Schema\Columns\Contracts\Integer_Column;
-
 /**
  * Class ID
  *
@@ -41,4 +39,11 @@ class ID extends Integer_Column {
 	 * @var string
 	 */
 	protected string $name = 'id';
+
+	/**
+	 * Whether the column is a primary key.
+	 *
+	 * @var bool
+	 */
+	protected bool $is_primary_key = true;
 }

…ema/Columns/Contracts/Integer_Column.php src/Schema/Columns/Integer_Column.phpsrc/Schema/Columns/Contracts/Integer_Column.php renamed to src/Schema/Columns/Integer_Column.php src/Schema/Columns/Contracts/Integer_Column.php renamed to src/Schema/Columns/Integer_Column.php

@@ -4,21 +4,27 @@
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
 
 declare( strict_types=1 );
 
-namespace StellarWP\Schema\Columns\Contracts;
+namespace StellarWP\Schema\Columns;
+
+use StellarWP\Schema\Columns\Contracts\Column;
+use StellarWP\Schema\Columns\Contracts\Lengthable;
+use StellarWP\Schema\Columns\Contracts\Signable;
+use StellarWP\Schema\Columns\Contracts\Auto_Incrementable;
+use StellarWP\Schema\Columns\Contracts\Uniquable;
 
 /**
  * Class Integer_Column
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
-abstract class Integer_Column extends Column implements Lengthable, Signable, Auto_Incrementable, Primarable, Uniquable {
+class Integer_Column extends Column implements Lengthable, Signable, Auto_Incrementable, Uniquable {
 	/**
 	 * The length of the column.
 	 *
@@ -45,7 +51,7 @@ abstract class Integer_Column extends Column implements Lengthable, Signable, Au
 	 *
 	 * @var int
 	 */
-	protected ?int $default = null;
+	protected $default = null;
 
 	/**
 	 * The type of the column.
@@ -97,6 +103,7 @@ public function get_length(): int {
 	 */
 	public function set_auto_increment( bool $auto_increment ): self {
 		$this->auto_increment = $auto_increment;
+		$this->set_is_primary_key( true );
 		return $this;
 	}
 

…hema/Columns/Contracts/String_Column.php src/Schema/Columns/String_Column.phpsrc/Schema/Columns/Contracts/String_Column.php renamed to src/Schema/Columns/String_Column.php src/Schema/Columns/Contracts/String_Column.php renamed to src/Schema/Columns/String_Column.php

@@ -4,21 +4,25 @@
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
 
 declare( strict_types=1 );
 
-namespace StellarWP\Schema\Columns\Contracts;
+namespace StellarWP\Schema\Columns;
+
+use StellarWP\Schema\Columns\Contracts\Column;
+use StellarWP\Schema\Columns\Contracts\Lengthable;
+use StellarWP\Schema\Columns\Contracts\Uniquable;
 
 /**
  * Class String_Column
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
-abstract class String_Column extends Column implements Lengthable, Uniquable {
+class String_Column extends Column implements Lengthable, Uniquable {
 	/**
 	 * The length of the column.
 	 *
@@ -31,7 +35,7 @@ abstract class String_Column extends Column implements Lengthable, Uniquable {
 	 *
 	 * @var string
 	 */
-	protected ?string $default = null;
+	protected $default = null;
 
 	/**
 	 * The type of the column.

…Schema/Columns/Contracts/Text_Column.php src/Schema/Columns/Text_Column.phpsrc/Schema/Columns/Contracts/Text_Column.php renamed to src/Schema/Columns/Text_Column.php src/Schema/Columns/Contracts/Text_Column.php renamed to src/Schema/Columns/Text_Column.php

@@ -4,23 +4,24 @@
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
 
 declare( strict_types=1 );
 
-namespace StellarWP\Schema\Columns\Contracts;
+namespace StellarWP\Schema\Columns;
 
+use StellarWP\Schema\Columns\Contracts\Column;
 use InvalidArgumentException;
 
 /**
  * Class Text_Column
  *
  * @since TBD
  *
- * @package StellarWP\Schema\Columns\Contracts
+ * @package StellarWP\Schema\Columns
  */
-abstract class Text_Column extends Column {
+class Text_Column extends Column {
 	/**
 	 * The type of the column.
 	 *