protoc-gen-sqlmodel 0.2.0__tar.gz → 0.3.0__tar.gz

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protoc-gen-sqlmodel
-Version: 0.2.0
+Version: 0.3.0
 Summary: protoc plugin to generate SQLModel classes
 Author: River Studio
 Author-email: River Studio <git@river-studio.net>

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "protoc-gen-sqlmodel"
-version = "0.2.0"
+version = "0.3.0"
 description = "protoc plugin to generate SQLModel classes"
 readme = "README.md"
 classifiers = [

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "protoc-gen-sqlmodel"
-version = "0.2.0"
+version = "0.3.0"
 description = "protoc plugin to generate SQLModel classes"
 readme = "README.md"
 license = { file = "LICENSE" }

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/src/protoc_gen_sqlmodel/proto/sqlmodel_extensions.proto

@@ -25,4 +25,5 @@ extend google.protobuf.FieldOptions {
   string passive_deletes = 50013;
   string link_model = 50014;
   string server_default = 50015;
+  bool nullable = 50016;
 }

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/src/protoc_gen_sqlmodel/proto/sqlmodel_extensions_pb.py

@@ -121,9 +121,16 @@ extend google.protobuf.FieldOptions { optional string server_default = 50015 [js
 ```
 """
 
+ext_nullable: Final[Extension[FieldOptions, bool]] = Extension()
+"""
+```proto
+extend google.protobuf.FieldOptions { optional bool nullable = 50016 [json_name = "[example.sqlmodel.nullable]"] }
+```
+"""
+
 
 _DESC = file_desc(
-    b'\n\x19sqlmodel_extensions.proto\x12\x10example.sqlmodel\x1a google/protobuf/descriptor.proto:7\n\x05table\x18\xd1\x86\x03 \x01(\x08\x12\x1f.google.protobuf.MessageOptionsR\x05table:8\n\x07sa_type\x18\xd2\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x06saType:@\n\x0bprimary_key\x18\xd3\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\nprimaryKey:J\n\x10sqlmodel_default\x18\xd4\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x0fsqlmodelDefault:Y\n\x18sqlmodel_default_factory\x18\xd5\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x16sqlmodelDefaultFactory:>\n\npy_default\x18\xd6\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\tpyDefault:5\n\x05index\x18\xd7\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\x05index:@\n\x0bforeign_key\x18\xd8\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\nforeignKey:C\n\x0crelationship\x18\xd9\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\x0crelationship:F\n\x0eback_populates\x18\xda\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\rbackPopulates:F\n\x0ecascade_delete\x18\xdb\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\rcascadeDelete:<\n\ton_delete\x18\xdc\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x08onDelete:H\n\x0fpassive_deletes\x18\xdd\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x0epassiveDeletes:>\n\nlink_model\x18\xde\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\tlinkModel:F\n\x0eserver_default\x18\xdf\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\rserverDefaultb\x06proto3',
+    b'\n\x19sqlmodel_extensions.proto\x12\x10example.sqlmodel\x1a google/protobuf/descriptor.proto:7\n\x05table\x18\xd1\x86\x03 \x01(\x08\x12\x1f.google.protobuf.MessageOptionsR\x05table:8\n\x07sa_type\x18\xd2\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x06saType:@\n\x0bprimary_key\x18\xd3\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\nprimaryKey:J\n\x10sqlmodel_default\x18\xd4\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x0fsqlmodelDefault:Y\n\x18sqlmodel_default_factory\x18\xd5\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x16sqlmodelDefaultFactory:>\n\npy_default\x18\xd6\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\tpyDefault:5\n\x05index\x18\xd7\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\x05index:@\n\x0bforeign_key\x18\xd8\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\nforeignKey:C\n\x0crelationship\x18\xd9\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\x0crelationship:F\n\x0eback_populates\x18\xda\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\rbackPopulates:F\n\x0ecascade_delete\x18\xdb\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\rcascadeDelete:<\n\ton_delete\x18\xdc\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x08onDelete:H\n\x0fpassive_deletes\x18\xdd\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\x0epassiveDeletes:>\n\nlink_model\x18\xde\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\tlinkModel:F\n\x0eserver_default\x18\xdf\x86\x03 \x01(\t\x12\x1d.google.protobuf.FieldOptionsR\rserverDefault:;\n\x08nullable\x18\xe0\x86\x03 \x01(\x08\x12\x1d.google.protobuf.FieldOptionsR\x08nullableb\x06proto3',
     [
         descriptor_pb.desc(),
     ],
@@ -143,6 +150,7 @@ _DESC = file_desc(
         "passive_deletes": ext_passive_deletes,
         "link_model": ext_link_model,
         "server_default": ext_server_default,
+        "nullable": ext_nullable,
     },
 )
 

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/src/protoc_gen_sqlmodel/utils/__init__.py

@@ -1,6 +1,7 @@
 from protobuf import (
     DescEnum,
     DescExtension,
+    DescField,
     DescFieldValueScalar,
     DescMessage,
     ScalarType,
@@ -8,6 +9,8 @@ from protobuf import (
 from protobuf._descriptors import SupportedFieldPresence
 from protobuf.plugin import File, Module
 
+from protoc_gen_sqlmodel.proto.sqlmodel_extensions_pb import ext_server_default
+
 ENUM = Module("enum").ident("Enum")
 FINAL = Module("typing").ident("Final")
 EXTENSION = Module("protobuf").ident("Extension")
@@ -25,7 +28,12 @@ def get_presence(presence: SupportedFieldPresence) -> str:
             return ""
 
 
-def get_python_scalar_type(scalar: ScalarType):
+def get_python_scalar_type(scalar: ScalarType, desc: DescField | None = None):
+    if desc and (opts := desc.proto.options) and ext_server_default in opts:
+        server_default = opts[ext_server_default]
+        if "uuid" in server_default:
+            return Module("uuid").ident("uuid7")
+
     match scalar:
         case ScalarType.BOOL:
             return "bool"

{protoc_gen_sqlmodel-0.2.0 → protoc_gen_sqlmodel-0.3.0}/src/protoc_gen_sqlmodel/utils/field_handlers.py

@@ -20,6 +20,7 @@ from protoc_gen_sqlmodel.proto.sqlmodel_extensions_pb import (
     ext_foreign_key,
     ext_index,
     ext_link_model,
+    ext_nullable,
     ext_on_delete,
     ext_passive_deletes,
     ext_primary_key,
@@ -51,9 +52,9 @@ FIELD_EXTENSIONS = {
     ext_primary_key: "primary_key",
     ext_py_default: "py_default",
     ext_sa_type: "sa_type",
-    ext_server_default: "server_default",
     ext_sqlmodel_default: "sqlmodel_default",
     ext_sqlmodel_default_factory: "sqlmodel_default_factory",
+    ext_nullable: "nullable",
 }
 
 
@@ -74,6 +75,12 @@ def handle_field_extensions(desc: DescField, default_value: Any | None):
             field_options.append(f"default={default_value}")
             options = True
 
+        if ext_server_default in opts:
+            server_default = opts[ext_server_default]
+            field_options.append('sa_column_kwargs={"server_default": text("')
+            field_options.append(server_default)
+            field_options.append('")}, ')
+
         for ext, field_name in FIELD_EXTENSIONS.items():
             if ext in opts:
                 field_options.append(f"{field_name}=")
@@ -96,7 +103,7 @@ def handle_leaf_field(desc: DescField, f: File):
 
     match desc.value:
         case DescFieldValueScalar(scalar, default_value, _):
-            print_components.append(get_python_scalar_type(scalar))
+            print_components.append(get_python_scalar_type(scalar, desc))
             print_components.append(field_presence)
             if default_value or field_presence:
                 field_default = default_value