From 011f90e57509fec0e133ddf700ea6b1fd7c1fe0a Mon Sep 17 00:00:00 2001 From: Jason McCreary Date: Tue, 8 Dec 2020 10:40:01 -0500 Subject: [PATCH 1/2] Default ipAddress column name --- src/Illuminate/Database/Schema/Blueprint.php | 2 +- tests/Database/DatabaseMySqlSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabasePostgresSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabaseSQLiteSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabaseSqlServerSchemaGrammarTest.php | 10 ++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Schema/Blueprint.php b/src/Illuminate/Database/Schema/Blueprint.php index 36dfbb7597b6..a73b6fa4fb5c 100755 --- a/src/Illuminate/Database/Schema/Blueprint.php +++ b/src/Illuminate/Database/Schema/Blueprint.php @@ -1201,7 +1201,7 @@ public function foreignUuid($column) * @param string $column * @return \Illuminate\Database\Schema\ColumnDefinition */ - public function ipAddress($column) + public function ipAddress($column = 'ip_address') { return $this->addColumn('ipAddress', $column); } diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php index c89af64847ad..5b39dbb11411 100755 --- a/tests/Database/DatabaseMySqlSchemaGrammarTest.php +++ b/tests/Database/DatabaseMySqlSchemaGrammarTest.php @@ -1009,6 +1009,16 @@ public function testAddingIpAddress() $this->assertSame('alter table `users` add `foo` varchar(45) not null', $statements[0]); } + public function testAddingIpAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->ipAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table `users` add `ip_address` varchar(45) not null', $statements[0]); + } + public function testAddingMacAddress() { $blueprint = new Blueprint('users'); diff --git a/tests/Database/DatabasePostgresSchemaGrammarTest.php b/tests/Database/DatabasePostgresSchemaGrammarTest.php index 052197fd08c4..fc7f26b2e966 100755 --- a/tests/Database/DatabasePostgresSchemaGrammarTest.php +++ b/tests/Database/DatabasePostgresSchemaGrammarTest.php @@ -856,6 +856,16 @@ public function testAddingIpAddress() $this->assertSame('alter table "users" add column "foo" inet not null', $statements[0]); } + public function testAddingIpAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->ipAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add column "ip_address" inet not null', $statements[0]); + } + public function testAddingMacAddress() { $blueprint = new Blueprint('users'); diff --git a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php index 41e53cc725e7..4786c50e5ca2 100755 --- a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php +++ b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php @@ -741,6 +741,16 @@ public function testAddingIpAddress() $this->assertSame('alter table "users" add column "foo" varchar not null', $statements[0]); } + public function testAddingIpAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->ipAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add column "ip_address" varchar not null', $statements[0]); + } + public function testAddingMacAddress() { $blueprint = new Blueprint('users'); diff --git a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php index 5ca3790522ab..bf4f0317615a 100755 --- a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php +++ b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php @@ -771,6 +771,16 @@ public function testAddingIpAddress() $this->assertSame('alter table "users" add "foo" nvarchar(45) not null', $statements[0]); } + public function testAddingIpAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->ipAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add "ip_address" nvarchar(45) not null', $statements[0]); + } + public function testAddingMacAddress() { $blueprint = new Blueprint('users'); From d8e5b378a1d27ee0071975d28c288d769cf37b1c Mon Sep 17 00:00:00 2001 From: Jason McCreary Date: Tue, 8 Dec 2020 10:46:00 -0500 Subject: [PATCH 2/2] Default macAddress column name --- src/Illuminate/Database/Schema/Blueprint.php | 2 +- tests/Database/DatabaseMySqlSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabasePostgresSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabaseSQLiteSchemaGrammarTest.php | 10 ++++++++++ tests/Database/DatabaseSqlServerSchemaGrammarTest.php | 10 ++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Schema/Blueprint.php b/src/Illuminate/Database/Schema/Blueprint.php index a73b6fa4fb5c..f8c273fbcbc6 100755 --- a/src/Illuminate/Database/Schema/Blueprint.php +++ b/src/Illuminate/Database/Schema/Blueprint.php @@ -1212,7 +1212,7 @@ public function ipAddress($column = 'ip_address') * @param string $column * @return \Illuminate\Database\Schema\ColumnDefinition */ - public function macAddress($column) + public function macAddress($column = 'mac_address') { return $this->addColumn('macAddress', $column); } diff --git a/tests/Database/DatabaseMySqlSchemaGrammarTest.php b/tests/Database/DatabaseMySqlSchemaGrammarTest.php index 5b39dbb11411..3e81cdca0950 100755 --- a/tests/Database/DatabaseMySqlSchemaGrammarTest.php +++ b/tests/Database/DatabaseMySqlSchemaGrammarTest.php @@ -1029,6 +1029,16 @@ public function testAddingMacAddress() $this->assertSame('alter table `users` add `foo` varchar(17) not null', $statements[0]); } + public function testAddingMacAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->macAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table `users` add `mac_address` varchar(17) not null', $statements[0]); + } + public function testAddingGeometry() { $blueprint = new Blueprint('geo'); diff --git a/tests/Database/DatabasePostgresSchemaGrammarTest.php b/tests/Database/DatabasePostgresSchemaGrammarTest.php index fc7f26b2e966..ce8514e4901f 100755 --- a/tests/Database/DatabasePostgresSchemaGrammarTest.php +++ b/tests/Database/DatabasePostgresSchemaGrammarTest.php @@ -876,6 +876,16 @@ public function testAddingMacAddress() $this->assertSame('alter table "users" add column "foo" macaddr not null', $statements[0]); } + public function testAddingMacAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->macAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add column "mac_address" macaddr not null', $statements[0]); + } + public function testCompileForeign() { $blueprint = new Blueprint('users'); diff --git a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php index 4786c50e5ca2..442d0f137d58 100755 --- a/tests/Database/DatabaseSQLiteSchemaGrammarTest.php +++ b/tests/Database/DatabaseSQLiteSchemaGrammarTest.php @@ -761,6 +761,16 @@ public function testAddingMacAddress() $this->assertSame('alter table "users" add column "foo" varchar not null', $statements[0]); } + public function testAddingMacAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->macAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add column "mac_address" varchar not null', $statements[0]); + } + public function testAddingGeometry() { $blueprint = new Blueprint('geo'); diff --git a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php index bf4f0317615a..acb2ed68367e 100755 --- a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php +++ b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php @@ -791,6 +791,16 @@ public function testAddingMacAddress() $this->assertSame('alter table "users" add "foo" nvarchar(17) not null', $statements[0]); } + public function testAddingMacAddressDefaultsColumnName() + { + $blueprint = new Blueprint('users'); + $blueprint->macAddress(); + $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar()); + + $this->assertCount(1, $statements); + $this->assertSame('alter table "users" add "mac_address" nvarchar(17) not null', $statements[0]); + } + public function testAddingGeometry() { $blueprint = new Blueprint('geo');