Merge pull request #1826 from MasterOdin/sqlserver_binary_uuid

Add support for BinaryUUID to SqlServer
cakephp · Jun 25, 2020 · c63dcec · c63dcec
2 parents 1b88860 + 4af7c57
commit c63dcec
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/Phinx/Db/Adapter/SqlServerAdapter.php b/src/Phinx/Db/Adapter/SqlServerAdapter.php
@@ -34,6 +34,7 @@ class SqlServerAdapter extends PdoAdapter
  */
  protected static $specificColumnTypes = [
  self::PHINX_TYPE_FILESTREAM,
+ self::PHINX_TYPE_BINARYUUID,
  ];
 
  /**
@@ -1078,6 +1079,7 @@ public function getSqlType($type, $limit = null)
  return ['name' => 'varbinary'];
  case static::PHINX_TYPE_BOOLEAN:
  return ['name' => 'bit'];
+ case static::PHINX_TYPE_BINARYUUID:
  case static::PHINX_TYPE_UUID:
  return ['name' => 'uniqueidentifier'];
  case static::PHINX_TYPE_FILESTREAM:

diff --git a/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php b/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
@@ -234,6 +234,34 @@ public function testCreateTableWithMultiplePrimaryKeys()
  $this->assertFalse($this->adapter->hasIndex('table1', ['tag_id', 'user_email']));
  }
 
+ public function testCreateTableWithPrimaryKeyAsUuid()
+ {
+ $options = [
+ 'id' => false,
+ 'primary_key' => 'id',
+ ];
+ $table = new \Phinx\Db\Table('ztable', $options, $this->adapter);
+ $table->addColumn('id', 'uuid')->save();
+ $table->addColumn('user_id', 'integer')->save();
+ $this->assertTrue($this->adapter->hasColumn('ztable', 'id'));
+ $this->assertTrue($this->adapter->hasIndex('ztable', 'id'));
+ $this->assertTrue($this->adapter->hasColumn('ztable', 'user_id'));
+ }
+
+ public function testCreateTableWithPrimaryKeyAsBinaryUuid()
+ {
+ $options = [
+ 'id' => false,
+ 'primary_key' => 'id',
+ ];
+ $table = new \Phinx\Db\Table('ztable', $options, $this->adapter);
+ $table->addColumn('id', 'binaryuuid')->save();
+ $table->addColumn('user_id', 'integer')->save();
+ $this->assertTrue($this->adapter->hasColumn('ztable', 'id'));
+ $this->assertTrue($this->adapter->hasIndex('ztable', 'id'));
+ $this->assertTrue($this->adapter->hasColumn('ztable', 'user_id'));
+ }
+
  public function testCreateTableWithMultipleIndexes()
  {
  $table = new \Phinx\Db\Table('table1', [], $this->adapter);