Merge pull request #26 from srdante/without-primary-key

Add withoutPrimaryKey method for increment columns

Author: Carl Sverre

README.md

@@ -294,6 +294,20 @@ Schema::create('test', function (Blueprint $table) {
 });
 ```
 
+### Increment Columns without Primary Key
+
+Sometimes you may want to set a custom primary key. However if your table has an int `increment` column,
+Laravel, by default, always sets this column as the primary key. Even if you manually set another one. This behavior can be disabled using the `withoutPrimaryKey` method.
+
+```php
+Schema::create('test', function (Blueprint $table) {
+    $table->id()->withoutPrimaryKey();
+    $table->uuid('uuid');
+    
+    $table->primaryKey(['id',  'uuid']);
+});
+```
+
 ## Testing
 
 Execute the tests using PHPUnit

src/Schema/Grammar.php

@@ -17,7 +17,8 @@
 
 class Grammar extends MySqlGrammar
 {
-    use CompilesKeys, ModifiesColumns;
+    use CompilesKeys;
+    use ModifiesColumns;
 
     public function __construct()
     {
@@ -64,7 +65,8 @@ protected function compileCreateTable($blueprint, $command, $connection)
         // We want to do as little as possible ourselves, so we rely on the parent
         // to compile everything and then potentially sneak some modifiers in.
         return $this->insertCreateTableModifiers(
-            $blueprint, parent::compileCreateTable($blueprint, $command, $connection)
+            $blueprint,
+            parent::compileCreateTable($blueprint, $command, $connection)
         );
     }
 
@@ -174,4 +176,20 @@ protected function compileKey(Blueprint $blueprint, Fluent $command, $type)
         // creating the indexes as a part of the create statement.
         return str_replace(sprintf('alter table %s add ', $this->wrapTable($blueprint)), '', $compiled);
     }
+
+    /**
+     * Get the SQL for an auto-increment column modifier.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string|null
+     */
+    protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+    {
+        if (in_array($column->type, $this->serials) && $column->autoIncrement) {
+            return ($column->withoutPrimaryKey === true)
+                ? ' auto_increment'
+                : ' auto_increment primary key';
+        }
+    }
 }

tests/Hybrid/CreateTable/IncrementWithoutPrimaryKeyTest.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author https://github.com/srdante
+ */
+
+namespace SingleStore\Laravel\Tests\Hybrid\CreateTable;
+
+use SingleStore\Laravel\Schema\Blueprint;
+use SingleStore\Laravel\Tests\BaseTest;
+use SingleStore\Laravel\Tests\Hybrid\HybridTestHelpers;
+
+class IncrementWithoutPrimaryKeyTest extends BaseTest
+{
+    use HybridTestHelpers;
+
+    /** @test */
+    public function it_adds_a_big_increments_without_primary_key()
+    {
+        $blueprint = $this->createTable(function (Blueprint $table) {
+            $table->bigIncrements('id')->withoutPrimaryKey();
+            $table->uuid('uuid');
+
+            $table->primary(['id', 'uuid']);
+        });
+
+        $this->assertCreateStatement(
+            $blueprint,
+            'create table `test` (`id` bigint unsigned not null auto_increment, `uuid` char(36) not null, primary key `test_id_uuid_primary`(`id`, `uuid`))'
+        );
+    }
+
+    /** @test */
+    public function it_adds_an_id_without_primary_key()
+    {
+        $blueprint = $this->createTable(function (Blueprint $table) {
+            $table->id()->withoutPrimaryKey();
+            $table->uuid('uuid');
+
+            $table->primary(['id', 'uuid']);
+        });
+
+        $this->assertCreateStatement(
+            $blueprint,
+            'create table `test` (`id` bigint unsigned not null auto_increment, `uuid` char(36) not null, primary key `test_id_uuid_primary`(`id`, `uuid`))'
+        );
+    }
+}