Optimized code for database-sqlsever. (#7719)

Author: limingxinleo

src/Query/Grammars/SqlServerGrammar.php

@@ -16,7 +16,7 @@
 use Hyperf\Database\Query\Builder;
 use Hyperf\Database\Query\Expression;
 use Hyperf\Database\Query\Grammars\Grammar;
-use Hyperf\Database\Sqlsrv\Query\IndexHint;
+use Hyperf\Database\Query\IndexHint;
 use Hyperf\Stringable\Str;
 
 use function Hyperf\Collection\collect;

src/Query/IndexHint.php

@@ -48,6 +48,7 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
      */
     public function processColumns(array $results): array
     {
+        /* @phpstan-ignore-next-line */
         return array_map(function ($result) {
             $result = (object) $result;
 

src/Query/Processors/SqlServerProcessor.php

@@ -17,8 +17,8 @@
 use Hyperf\Database\Query\Builder;
 use Hyperf\Database\Query\Expression;
 use Hyperf\Database\Query\Expression as ExpressionContract;
+use Hyperf\Database\Query\IndexHint;
 use Hyperf\Database\Sqlsrv\Exception\InvalidArgumentException;
-use RectorPrefix202308\Illuminate\Contracts\Database\Query\ConditionExpression;
 
 use function Hyperf\Collection\head;
 
@@ -93,11 +93,10 @@ public function offset($value): static
      * @param mixed $operator
      * @param mixed $value
      * @param string $boolean
-     * @return $this
      */
     public function where($column, $operator = null, $value = null, $boolean = 'and'): static
     {
-        if ($column instanceof ConditionExpression) {
+        if ($column instanceof Expression) {
             $type = 'Expression';
 
             $this->wheres[] = compact('type', 'column', 'boolean');
@@ -161,14 +160,10 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
 
         $type = 'Basic';
 
-        $columnString = ($column instanceof ExpressionContract)
-            ? $this->grammar->getValue($column)
-            : $column;
-
         // If the column is making a JSON reference we'll check to see if the value
         // is a boolean. If it is, we'll add the raw boolean string as an actual
         // value to the query to ensure this is properly handled by the query.
-        if (str_contains($columnString, '->') && is_bool($value)) {
+        if (str_contains($column, '->') && is_bool($value)) {
             $value = new Expression($value ? 'true' : 'false');
 
             if (is_string($column)) {
@@ -211,7 +206,7 @@ public function having($column, $operator = null, $value = null, $boolean = 'and
     {
         $type = 'Basic';
 
-        if ($column instanceof ConditionExpression) {
+        if ($column instanceof Expression) {
             $type = 'Expression';
 
             $this->havings[] = compact('type', 'column', 'boolean');
@@ -328,8 +323,6 @@ public function orWhereJsonDoesntContainKey(string $column): static
 
     /**
      * Add an index hint to suggest a query index.
-     *
-     * @return $this
      */
     public function useIndex(string $index): static
     {
@@ -340,8 +333,6 @@ public function useIndex(string $index): static
 
     /**
      * Add an index hint to force a query index.
-     *
-     * @return $this
      */
     public function forceIndex(string $index): static
     {
@@ -352,8 +343,6 @@ public function forceIndex(string $index): static
 
     /**
      * Add an index hint to ignore a query index.
-     *
-     * @return $this
      */
     public function ignoreIndex(string $index): static
     {

src/Query/SqlServerBuilder.php

@@ -772,6 +772,7 @@ protected function typeTimeTz(Fluent $column): string
     protected function typeTimestamp(Fluent $column): string
     {
         if ($column->useCurrent) {
+            /* @phpstan-ignore-next-line */
             $column->default(new Expression('CURRENT_TIMESTAMP'));
         }
 
@@ -786,6 +787,7 @@ protected function typeTimestamp(Fluent $column): string
     protected function typeTimestampTz(Fluent $column): string
     {
         if ($column->useCurrent) {
+            /* @phpstan-ignore-next-line */
             $column->default(new Expression('CURRENT_TIMESTAMP'));
         }
 
@@ -897,14 +899,14 @@ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
 
     /**
      * Get the SQL for an auto-increment column modifier.
-     *
-     * @return null|string
      */
-    protected function modifyIncrement(Blueprint $blueprint, Fluent $column)
+    protected function modifyIncrement(Blueprint $blueprint, Fluent $column): ?string
     {
         if (! $column->change && in_array($column->type, $this->serials) && $column->autoIncrement) {
             return ' identity primary key';
         }
+
+        return null;
     }
 
     /**

src/Schema/Grammars/SqlServerGrammar.php

@@ -14,6 +14,7 @@
 
 use Closure;
 use Hyperf\Database\Connection;
+use Hyperf\Database\Grammar;
 use Hyperf\Database\Sqlsrv\Query\Grammars\SqlServerGrammar as QueryGrammar;
 use Hyperf\Database\Sqlsrv\Query\Processors\SqlServerProcessor;
 use Hyperf\Database\Sqlsrv\Query\SqlServerBuilder as QueryBuilder;
@@ -104,7 +105,8 @@ protected function getDefaultQueryGrammar(): QueryGrammar
     }
 
     /**
-     * Get the default schema grammar instance.
+     * Set the table prefix and return the grammar.
+     * @return Grammar&SchemaGrammar
      */
     protected function getDefaultSchemaGrammar(): SchemaGrammar
     {