localstack
diff --git a/‎src/ast/ddl.rs‎
Lines changed: 5 additions & 0 deletions b/‎src/ast/ddl.rs‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/ast/helpers/stmt_create_table.rs‎
Lines changed: 10 additions & 0 deletions b/‎src/ast/helpers/stmt_create_table.rs‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/ast/spans.rs‎
Lines changed: 1 addition & 0 deletions b/‎src/ast/spans.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/dialect/snowflake.rs‎
Lines changed: 13 additions & 0 deletions b/‎src/dialect/snowflake.rs‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/keywords.rs‎
Lines changed: 1 addition & 0 deletions b/‎src/keywords.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/sqlparser_duckdb.rs‎
Lines changed: 1 addition & 0 deletions b/‎tests/sqlparser_duckdb.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/sqlparser_mssql.rs‎
Lines changed: 2 additions & 0 deletions b/‎tests/sqlparser_mssql.rs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎tests/sqlparser_postgres.rs‎
Lines changed: 1 addition & 0 deletions b/‎tests/sqlparser_postgres.rs‎
Lines changed: 1 addition & 0 deletions
@@ -4068,6 +4068,8 @@ pub struct CreateTable {
     /// Snowflake "WITH AGGREGATION POLICY" clause
     /// <https://docs.snowflake.com/en/sql-reference/sql/create-table>
     pub with_aggregation_policy: Option<ObjectName>,
+    /// Snowflake aggregation-policy entity key.
+    pub aggregation_policy_entity_key: Vec<Ident>,
     /// Snowflake "WITH ROW ACCESS POLICY" clause
     /// <https://docs.snowflake.com/en/sql-reference/sql/create-table>
     pub with_row_access_policy: Option<RowAccessPolicy>,
@@ -4497,6 +4499,9 @@ impl fmt::Display for CreateTable {
 
         if let Some(with_aggregation_policy) = &self.with_aggregation_policy {
             write!(f, " WITH AGGREGATION POLICY {with_aggregation_policy}",)?;
+            if !self.aggregation_policy_entity_key.is_empty() {
+                write!(f, " ENTITY KEY ({})", display_comma_separated(&self.aggregation_policy_entity_key))?;
+            }
         }
 
         if let Some(row_access_policy) = &self.with_row_access_policy {
 
@@ -162,6 +162,8 @@ pub struct CreateTableBuilder {
     pub iceberg_default_ddl_collation: Option<String>,
     /// Optional aggregation policy object name.
     pub with_aggregation_policy: Option<ObjectName>,
+    /// Optional entity-key columns for the aggregation policy.
+    pub aggregation_policy_entity_key: Vec<Ident>,
     /// Optional row access policy applied to the table.
     pub with_row_access_policy: Option<RowAccessPolicy>,
     /// Optional storage lifecycle policy applied to the table.
@@ -276,6 +278,7 @@ impl CreateTableBuilder {
             default_ddl_collation: None,
             iceberg_default_ddl_collation: None,
             with_aggregation_policy: None,
+            aggregation_policy_entity_key: vec![],
             with_row_access_policy: None,
             with_storage_lifecycle_policy: None,
             with_tags: None,
@@ -550,6 +553,11 @@ impl CreateTableBuilder {
         self.with_aggregation_policy = with_aggregation_policy;
         self
     }
+    /// Set aggregation-policy entity-key columns.
+    pub fn aggregation_policy_entity_key(mut self, columns: Vec<Ident>) -> Self {
+        self.aggregation_policy_entity_key = columns;
+        self
+    }
     /// Attach a row access policy to the table.
     pub fn with_row_access_policy(
         mut self,
@@ -745,6 +753,7 @@ impl CreateTableBuilder {
             default_ddl_collation: self.default_ddl_collation,
             iceberg_default_ddl_collation: self.iceberg_default_ddl_collation,
             with_aggregation_policy: self.with_aggregation_policy,
+            aggregation_policy_entity_key: self.aggregation_policy_entity_key,
             with_row_access_policy: self.with_row_access_policy,
             with_storage_lifecycle_policy: self.with_storage_lifecycle_policy,
             with_tags: self.with_tags,
@@ -845,6 +854,7 @@ impl From<CreateTable> for CreateTableBuilder {
             default_ddl_collation: table.default_ddl_collation,
             iceberg_default_ddl_collation: table.iceberg_default_ddl_collation,
             with_aggregation_policy: table.with_aggregation_policy,
+            aggregation_policy_entity_key: table.aggregation_policy_entity_key,
             with_row_access_policy: table.with_row_access_policy,
             with_storage_lifecycle_policy: table.with_storage_lifecycle_policy,
             with_tags: table.with_tags,
 
@@ -751,6 +751,7 @@ impl Spanned for CreateTable {
             default_ddl_collation: _,           // string, no span
             iceberg_default_ddl_collation: _,   // string, no span
             with_aggregation_policy: _,         // todo, Snowflake specific
+            aggregation_policy_entity_key: _,   // todo, Snowflake specific
             with_row_access_policy: _,          // todo, Snowflake specific
             with_storage_lifecycle_policy: _,   // todo, Snowflake specific
             with_tags: _,                       // todo, Snowflake specific
 
@@ -2769,6 +2769,19 @@ pub fn parse_create_table(
                     parser.expect_keyword_is(Keyword::POLICY)?;
                     let aggregation_policy = parser.parse_object_name(false)?;
                     builder = builder.with_aggregation_policy(Some(aggregation_policy));
+                    if parser.parse_keywords(&[Keyword::ENTITY, Keyword::KEY]) {
+                        parser.expect_token(&Token::LParen)?;
+                        let columns = parser.parse_comma_separated(|p| p.parse_identifier())?;
+                        parser.expect_token(&Token::RParen)?;
+                        builder = builder.aggregation_policy_entity_key(columns);
+                    }
+                }
+                Keyword::ENTITY if builder.with_aggregation_policy.is_some() => {
+                    parser.expect_keyword_is(Keyword::KEY)?;
+                    parser.expect_token(&Token::LParen)?;
+                    let columns = parser.parse_comma_separated(|p| p.parse_identifier())?;
+                    parser.expect_token(&Token::RParen)?;
+                    builder = builder.aggregation_policy_entity_key(columns);
                 }
                 Keyword::ROW => {
                     parser.expect_keywords(&[Keyword::ACCESS, Keyword::POLICY])?;
 
@@ -411,6 +411,7 @@ define_keywords!(
     ENGINE,
     ENGINE_ATTRIBUTE,
     ENROLL,
+    ENTITY,
     ENUM,
     ENUM16,
     ENUM8,
 
@@ -781,6 +781,7 @@ fn test_duckdb_union_datatype() {
             default_ddl_collation: Default::default(),
             iceberg_default_ddl_collation: Default::default(),
             with_aggregation_policy: Default::default(),
+            aggregation_policy_entity_key: Default::default(),
             with_row_access_policy: Default::default(),
             with_storage_lifecycle_policy: Default::default(),
             with_tags: Default::default(),
 
@@ -2011,6 +2011,7 @@ fn parse_create_table_with_valid_options() {
                 default_ddl_collation: None,
                 iceberg_default_ddl_collation: None,
                 with_aggregation_policy: None,
+                aggregation_policy_entity_key: vec![],
                 with_row_access_policy: None,
                 with_storage_lifecycle_policy: None,
                 with_tags: None,
@@ -2204,6 +2205,7 @@ fn parse_create_table_with_identity_column() {
                 default_ddl_collation: None,
                 iceberg_default_ddl_collation: None,
                 with_aggregation_policy: None,
+                aggregation_policy_entity_key: vec![],
                 with_row_access_policy: None,
                 with_storage_lifecycle_policy: None,
                 with_tags: None,
 
@@ -6731,6 +6731,7 @@ fn parse_trigger_related_functions() {
             default_ddl_collation: None,
             iceberg_default_ddl_collation: None,
             with_aggregation_policy: None,
+            aggregation_policy_entity_key: vec![],
             with_row_access_policy: None,
             with_storage_lifecycle_policy: None,
             with_tags: None,
-Original file line number
+Diff line change
     ENGINE,
     ENGINE_ATTRIBUTE,
     ENROLL,
 +    ENTITY,
     ENUM,
     ENUM16,
     ENUM8,