Add support for CREATE USER VALID UNTIL clause (#264)

Author: git-hulk

parser/ast.go

@@ -1815,6 +1815,7 @@ type CreateUser struct {
 	OrReplace       bool
 	UserNames       []*RoleName
 	Authentication  *AuthenticationClause
+	ValidUntil      *StringLiteral
 	Hosts           []*HostClause
 	DefaultRole     *DefaultRoleClause
 	DefaultDatabase *Ident
@@ -1848,6 +1849,11 @@ func (c *CreateUser) Accept(visitor ASTVisitor) error {
 			return err
 		}
 	}
+	if c.ValidUntil != nil {
+		if err := c.ValidUntil.Accept(visitor); err != nil {
+			return err
+		}
+	}
 	for _, host := range c.Hosts {
 		if err := host.Accept(visitor); err != nil {
 			return err

parser/format.go

@@ -1069,6 +1069,11 @@ func (c *CreateUser) FormatSQL(formatter *Formatter) {
 		formatter.Break()
 		formatter.WriteExpr(c.Authentication)
 	}
+	if c.ValidUntil != nil {
+		formatter.Break()
+		formatter.WriteString("VALID UNTIL ")
+		formatter.WriteExpr(c.ValidUntil)
+	}
 	if len(c.Hosts) > 0 {
 		formatter.Break()
 		for i, host := range c.Hosts {

parser/keyword.go

@@ -241,7 +241,9 @@ const (
 	KeywordUse          = "USE"
 	KeywordUser         = "USER"
 	KeywordUsing        = "USING"
+	KeywordUntil        = "UNTIL"
 	KeywordUuid         = "UUID"
+	KeywordValid        = "VALID"
 	KeywordValues       = "VALUES"
 	KeywordView         = "VIEW"
 	KeywordVolume       = "VOLUME"
@@ -498,7 +500,9 @@ var keywords = NewSet(
 	KeywordUse,
 	KeywordUser,
 	KeywordUsing,
+	KeywordUntil,
 	KeywordUuid,
+	KeywordValid,
 	KeywordValues,
 	KeywordView,
 	KeywordVolume,

parser/parse_system.go

@@ -824,6 +824,18 @@ func (p *Parser) parseOptionalClauses(createUser *CreateUser) error {
 			createUser.Authentication = auth
 			createUser.StatementEnd = auth.End()
 
+		case p.matchKeyword(KeywordValid):
+			_ = p.lexer.consumeToken() // consume VALID keyword
+			if err := p.expectKeyword(KeywordUntil); err != nil {
+				return err
+			}
+			validUntil, err := p.parseString(p.Pos())
+			if err != nil {
+				return err
+			}
+			createUser.ValidUntil = validUntil
+			createUser.StatementEnd = validUntil.End()
+
 		case p.matchKeyword(KeywordHost):
 			hosts, err := p.parseHostClauses()
 			if err != nil {

parser/testdata/ddl/create_user.sql

@@ -13,6 +13,11 @@ CREATE USER user9 IDENTIFIED WITH ldap SERVER 'ldap_server';
 CREATE USER user10 IDENTIFIED WITH kerberos;
 CREATE USER user11 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM';
 
+-- CREATE USER with VALID UNTIL
+CREATE USER user33 VALID UNTIL '2026-12-12 00:00:00';
+CREATE USER user34 IDENTIFIED WITH plaintext_password BY 'password123' VALID UNTIL '2026-06-15';
+CREATE USER user35 VALID UNTIL 'infinity';
+
 -- CREATE USER with host restrictions
 CREATE USER user12 HOST LOCAL;
 CREATE USER user13 HOST ANY;
@@ -44,8 +49,9 @@ CREATE USER user30 SETTINGS PROFILE 'default';
 CREATE USER user31 SETTINGS readonly=1, max_memory_usage=5000000;
 
 -- Complex CREATE USER with multiple clauses
-CREATE USER user32 
+CREATE USER user32
     IDENTIFIED WITH plaintext_password BY 'password'
+    VALID UNTIL '2025-12-31'
     HOST NAME 'localhost'
     DEFAULT ROLE role1, role2
     DEFAULT DATABASE test_db

parser/testdata/ddl/format/beautify/create_user.sql

@@ -14,6 +14,11 @@ CREATE USER user9 IDENTIFIED WITH ldap SERVER 'ldap_server';
 CREATE USER user10 IDENTIFIED WITH kerberos;
 CREATE USER user11 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM';
 
+-- CREATE USER with VALID UNTIL
+CREATE USER user33 VALID UNTIL '2026-12-12 00:00:00';
+CREATE USER user34 IDENTIFIED WITH plaintext_password BY 'password123' VALID UNTIL '2026-06-15';
+CREATE USER user35 VALID UNTIL 'infinity';
+
 -- CREATE USER with host restrictions
 CREATE USER user12 HOST LOCAL;
 CREATE USER user13 HOST ANY;
@@ -45,8 +50,9 @@ CREATE USER user30 SETTINGS PROFILE 'default';
 CREATE USER user31 SETTINGS readonly=1, max_memory_usage=5000000;
 
 -- Complex CREATE USER with multiple clauses
-CREATE USER user32 
+CREATE USER user32
     IDENTIFIED WITH plaintext_password BY 'password'
+    VALID UNTIL '2025-12-31'
     HOST NAME 'localhost'
     DEFAULT ROLE role1, role2
     DEFAULT DATABASE test_db
@@ -73,6 +79,13 @@ WITH kerberos;
 CREATE USER user11
 IDENTIFIED
 WITH kerberos REALM 'EXAMPLE.COM';
+CREATE USER user33
+VALID UNTIL '2026-12-12 00:00:00';
+CREATE USER user34
+IDENTIFIED WITH plaintext_password BY 'password123'
+VALID UNTIL '2026-06-15';
+CREATE USER user35
+VALID UNTIL 'infinity';
 CREATE USER user12
 HOST LOCAL;
 CREATE USER user13
@@ -120,6 +133,7 @@ SETTINGS
   max_memory_usage=5000000;
 CREATE USER user32
 IDENTIFIED WITH plaintext_password BY 'password'
+VALID UNTIL '2025-12-31'
 HOST NAME 'localhost'
 DEFAULT ROLE role1, role2
 DEFAULT DATABASE test_db

parser/testdata/ddl/format/create_user.sql

@@ -14,6 +14,11 @@ CREATE USER user9 IDENTIFIED WITH ldap SERVER 'ldap_server';
 CREATE USER user10 IDENTIFIED WITH kerberos;
 CREATE USER user11 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM';
 
+-- CREATE USER with VALID UNTIL
+CREATE USER user33 VALID UNTIL '2026-12-12 00:00:00';
+CREATE USER user34 IDENTIFIED WITH plaintext_password BY 'password123' VALID UNTIL '2026-06-15';
+CREATE USER user35 VALID UNTIL 'infinity';
+
 -- CREATE USER with host restrictions
 CREATE USER user12 HOST LOCAL;
 CREATE USER user13 HOST ANY;
@@ -45,8 +50,9 @@ CREATE USER user30 SETTINGS PROFILE 'default';
 CREATE USER user31 SETTINGS readonly=1, max_memory_usage=5000000;
 
 -- Complex CREATE USER with multiple clauses
-CREATE USER user32 
+CREATE USER user32
     IDENTIFIED WITH plaintext_password BY 'password'
+    VALID UNTIL '2025-12-31'
     HOST NAME 'localhost'
     DEFAULT ROLE role1, role2
     DEFAULT DATABASE test_db
@@ -64,6 +70,9 @@ CREATE USER user8 IDENTIFIED WITH sha256_password BY 'hash123';
 CREATE USER user9 IDENTIFIED WITH ldap SERVER 'ldap_server';
 CREATE USER user10 IDENTIFIED WITH kerberos;
 CREATE USER user11 IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM';
+CREATE USER user33 VALID UNTIL '2026-12-12 00:00:00';
+CREATE USER user34 IDENTIFIED WITH plaintext_password BY 'password123' VALID UNTIL '2026-06-15';
+CREATE USER user35 VALID UNTIL 'infinity';
 CREATE USER user12 HOST LOCAL;
 CREATE USER user13 HOST ANY;
 CREATE USER user14 HOST NONE;
@@ -84,4 +93,4 @@ CREATE USER user28 GRANTEES user1, user2 EXCEPT user3;
 CREATE USER user29 SETTINGS max_memory_usage=5000000;
 CREATE USER user30 SETTINGS PROFILE 'default';
 CREATE USER user31 SETTINGS readonly=1, max_memory_usage=5000000;
-CREATE USER user32 IDENTIFIED WITH plaintext_password BY 'password' HOST NAME 'localhost' DEFAULT ROLE role1, role2 DEFAULT DATABASE test_db GRANTEES user1, user2 EXCEPT user3 SETTINGS max_memory_usage=5000000, readonly=1;
+CREATE USER user32 IDENTIFIED WITH plaintext_password BY 'password' VALID UNTIL '2025-12-31' HOST NAME 'localhost' DEFAULT ROLE role1, role2 DEFAULT DATABASE test_db GRANTEES user1, user2 EXCEPT user3 SETTINGS max_memory_usage=5000000, readonly=1;