Postgres ENUMs are now more truly implemented using 'check' constraints.

taylorotwell · taylorotwell · commit 3bb1f1afed22 · 2013-07-30T16:05:26.000-05:00
diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -358,7 +358,9 @@ protected function typeBoolean(Fluent $column)
 	 */
 	protected function typeEnum(Fluent $column)
 	{
-		return 'varchar(255)';
+		$allowed = array_map(function($a) { return "'".$a."'"; }, $column->allowed);
+
+		return "varchar(255) check ({$column->name} in (".implode(', ', $allowed)."))";
 	}
 
 	/**
diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json
@@ -24,6 +24,7 @@
 		{"message": "Allow array sizes to be checked by validator.", "backport": null},
 		{"message": "Added support for where conditions on unique validation rule.", "backport": null},
 		{"message": "Restore method on Eloquent models now fires restoring and restored events.", "backport": null},
-		{"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null}
+		{"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null},
+		{"message": "Postgres ENUMs are now more truly implemented using 'check' constraints.", "backport": null}
 	]
 }
diff --git a/tests/Database/DatabasePostgresSchemaGrammarTest.php b/tests/Database/DatabasePostgresSchemaGrammarTest.php
@@ -344,7 +344,7 @@ public function testAddingEnum()
 		$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
 		$this->assertEquals(1, count($statements));
-		$this->assertEquals('alter table "users" add column "foo" varchar(255) not null', $statements[0]);
+		$this->assertEquals('alter table "users" add column "foo" varchar(255) check (foo in (\'bar\', \'baz\')) not null', $statements[0]);
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,9 @@ protected function typeBoolean(Fluent $column)`
`358`	`358`	`*/`
`359`	`359`	`protected function typeEnum(Fluent $column)`
`360`	`360`	`{`
`361`		`- return 'varchar(255)';`
	`361`	`+ $allowed = array_map(function($a) { return "'".$a."'"; }, $column->allowed);`
	`362`	`+`
	`363`	`+ return "varchar(255) check ({$column->name} in (".implode(', ', $allowed)."))";`
`362`	`364`	`}`
`363`	`365`
`364`	`366`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`{"message": "Allow array sizes to be checked by validator.", "backport": null},`
`25`	`25`	`{"message": "Added support for where conditions on unique validation rule.", "backport": null},`
`26`	`26`	`{"message": "Restore method on Eloquent models now fires restoring and restored events.", "backport": null},`
`27`		`- {"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null}`
	`27`	`+ {"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null},`
	`28`	`+ {"message": "Postgres ENUMs are now more truly implemented using 'check' constraints.", "backport": null}`
`28`	`29`	`]`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public function testAddingEnum()`
`344`	`344`	`$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());`
`345`	`345`
`346`	`346`	`$this->assertEquals(1, count($statements));`
`347`		`- $this->assertEquals('alter table "users" add column "foo" varchar(255) not null', $statements[0]);`
	`347`	`+ $this->assertEquals('alter table "users" add column "foo" varchar(255) check (foo in (\'bar\', \'baz\')) not null', $statements[0]);`
`348`	`348`	`}`
`349`	`349`
`350`	`350`