Fix the last few fixture test failures

Author: fractaledmind

lib/plume/ast/null_column_constraint.rb

@@ -2,11 +2,16 @@
 
 module Plume
 	class NullColumnConstraint < ColumnConstraint
-		optional_token :constraint_kw
-		optional_token :name_tk,
-			reader: :name,
-			default: -> { name_tk_val }
-		required_token :null_kw
-		optional_node :conflict_clause, ConflictClause
+		token :constraint_kw
+		token :name_tk
+		token :null_kw
+
+		attr :name, Stringy
+		node :conflict_clause, ConflictClause
+
+		def self.new(*, **) = super
+		def self.concrete(*, null_kw:, **) = super
+
+		def name = (@name == LiteralNil) ? name_tk_val : @name
 	end
 end

lib/plume/parser.rb

@@ -1004,7 +1004,7 @@ def column_def
 							constraint_kw: Token::Keyword(constraint_kw),
 							name_tk:       Token::Identifier(constraint_name),
 							default_kw:    Token::Keyword(default_kw),
-							value_tk:      id,
+							value_tk:      Token::Identifier(id),
 						)
 					else
 						expected! :LP, "literal-value", "signed-number"