Skip to content

Commit

Permalink
Reformat Files
Browse files Browse the repository at this point in the history
  • Loading branch information
rayliverified committed Sep 23, 2024
1 parent dcad7c5 commit b5d33bd
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
30 changes: 15 additions & 15 deletions omymodels/models/dataclass/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ def generate_attr(self, column: Column, defaults_off: bool) -> str:
if column.default and defaults_off is False:
column_str = self.add_column_default(column_str, column)
if (
column.nullable
and not (column.default and not defaults_off)
and not defaults_off
column.nullable
and not (column.default and not defaults_off)
and not defaults_off
):
column_str += dt.dataclass_default_attr.format(default=None)
return column_str
Expand All @@ -71,25 +71,25 @@ def add_column_default(column_str: str, column: Column) -> str:
return column_str

def generate_model(
self,
table: TableMeta,
singular: bool = True,
exceptions: Optional[List] = None,
defaults_off: Optional[bool] = False,
*args,
**kwargs,
self,
table: TableMeta,
singular: bool = True,
exceptions: Optional[List] = None,
defaults_off: Optional[bool] = False,
*args,
**kwargs,
) -> str:
model = ""

# mean one model one table
model += "\n\n"
# generate class name
model += (
dt.dataclass_class.format(
class_name=create_class_name(table.name, singular, exceptions),
table_name=table.name,
)
) + "\n\n"
dt.dataclass_class.format(
class_name=create_class_name(table.name, singular, exceptions),
table_name=table.name,
)
) + "\n\n"
columns = {"default": [], "non_default": []}

# generate columns / attrs
Expand Down
28 changes: 14 additions & 14 deletions omymodels/models/pydantic/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,35 +72,35 @@ def add_default_values(column_str: str, column: Column) -> str:
if datetime_now_check(column.default.lower()):
# Handle functions like CURRENT_TIMESTAMP
column.default = "datetime.datetime.now()"
elif column.default.upper() != 'NULL' and "'" not in column.default:
elif column.default.upper() != "NULL" and "'" not in column.default:
column.default = f"'{column.default}'"

# If the default is 'NULL', don't set a default in Pydantic (it already defaults to None)
if column.default.upper() == 'NULL':
if column.default.upper() == "NULL":
return column_str

# Append the default value if it's not None (e.g., explicit default values like '0' or CURRENT_TIMESTAMP)
column_str += pt.pydantic_default_attr.format(default=column.default)
return column_str

def generate_model(
self,
table: TableMeta,
singular: bool = True,
exceptions: Optional[List] = None,
defaults_off: Optional[bool] = False,
*args,
**kwargs,
self,
table: TableMeta,
singular: bool = True,
exceptions: Optional[List] = None,
defaults_off: Optional[bool] = False,
*args,
**kwargs,
) -> str:
model = ""
# mean one model one table
model += "\n\n"
model += (
pt.pydantic_class.format(
class_name=create_class_name(table.name, singular, exceptions),
table_name=table.name,
)
) + "\n\n"
pt.pydantic_class.format(
class_name=create_class_name(table.name, singular, exceptions),
table_name=table.name,
)
) + "\n\n"

for column in table.columns:
column = t.prepare_column_data(column)
Expand Down

0 comments on commit b5d33bd

Please sign in to comment.