Fix borrow errors

Author: kosiew

datafusion/core/src/datasource/listing/table.rs

@@ -197,7 +197,7 @@ impl ListingTableConfig {
     /// Set the schema policy for the [`ListingTable`]
     pub fn with_schema_policy(self, schema_policy: SchemaPolicy) -> Self {
         // If we have a file_schema, enforce Fixed policy with that schema
-        if let Some(schema) = &self.file_schema {
+        if let Some(schema) = &self.file_schema.clone() {
             match schema_policy {
                 SchemaPolicy::Fixed(_) => {
                     // Use provided Fixed policy with our schema
@@ -234,7 +234,7 @@ impl ListingTableConfig {
 
     /// Ensures that if a file schema is provided, the schema policy is set to Fixed
     fn ensure_schema_policy(self) -> Self {
-        if let Some(schema) = &self.file_schema {
+        if let Some(schema) = &self.file_schema.clone() {
             match self.schema_policy {
                 Some(SchemaPolicy::Fixed(_)) => {
                     // Already have a Fixed policy, but make sure it's using our schema
@@ -367,28 +367,29 @@ impl ListingTableConfig {
                     });
                 }
 
-                let schema = match self.schema_policy.unwrap_or(SchemaPolicy::First) {
-                    // For Fixed policy, we already have a schema
-                    SchemaPolicy::Fixed(schema) => schema,
-                    // For Merge policy, we infer from all files (current behavior)
-                    SchemaPolicy::Merge => {
-                        if let Some(url) = self.table_paths.first() {
-                            options.infer_schema(state, url).await?
-                        } else {
-                            Arc::new(Schema::empty())
+                let schema =
+                    match self.schema_policy.clone().unwrap_or(SchemaPolicy::First) {
+                        // For Fixed policy, we already have a schema
+                        SchemaPolicy::Fixed(schema) => schema,
+                        // For Merge policy, we infer from all files (current behavior)
+                        SchemaPolicy::Merge => {
+                            if let Some(url) = self.table_paths.first() {
+                                options.infer_schema(state, url).await?
+                            } else {
+                                Arc::new(Schema::empty())
+                            }
                         }
-                    }
-                    // For First policy, we only read schema from the first file
-                    SchemaPolicy::First => {
-                        if let Some(url) = self.table_paths.first() {
-                            // TODO: Implement a more efficient version that only looks at the first file
-                            // For now, we'll use the same implementation as Merge
-                            options.infer_schema(state, url).await?
-                        } else {
-                            Arc::new(Schema::empty())
+                        // For First policy, we only read schema from the first file
+                        SchemaPolicy::First => {
+                            if let Some(url) = self.table_paths.first() {
+                                // TODO: Implement a more efficient version that only looks at the first file
+                                // For now, we'll use the same implementation as Merge
+                                options.infer_schema(state, url).await?
+                            } else {
+                                Arc::new(Schema::empty())
+                            }
                         }
-                    }
-                };
+                    };
 
                 // When we infer a schema, keep the current policy
                 Ok(Self {