@@ -28,11 +28,11 @@ public override DatabaseModel Create(DbConnection connection, DatabaseModelFacto
2828 ydbConnection . Open ( ) ;
2929 }
3030
31- try
31+ try
3232 {
3333 var tableNames = new List < string > ( ) ;
3434 tableNames . AddRange ( options . Tables ) ;
35-
35+
3636 if ( tableNames . Count == 0 )
3737 {
3838 tableNames . AddRange (
@@ -42,12 +42,12 @@ where ydbObject.Type is SchemeType.Table or SchemeType.ColumnTable or SchemeType
4242 select ydbObject . Name
4343 ) ;
4444 }
45-
45+
4646 var databaseModel = new DatabaseModel
4747 {
4848 DatabaseName = connection . Database
4949 } ;
50-
50+
5151 foreach ( var ydbTable in tableNames . Select ( tableName =>
5252 YdbSchema . DescribeTable ( ydbConnection , tableName ) . GetAwaiter ( ) . GetResult ( ) ) )
5353 {
@@ -56,9 +56,9 @@ select ydbObject.Name
5656 Name = ydbTable . Name ,
5757 Database = databaseModel
5858 } ;
59-
59+
6060 var columnNameToDatabaseColumn = new Dictionary < string , DatabaseColumn > ( ) ;
61-
61+
6262 foreach ( var column in ydbTable . Columns )
6363 {
6464 var databaseColumn = new DatabaseColumn
@@ -68,11 +68,11 @@ select ydbObject.Name
6868 StoreType = column . StorageType ,
6969 IsNullable = column . IsNullable
7070 } ;
71-
71+
7272 databaseTable . Columns . Add ( databaseColumn ) ;
7373 columnNameToDatabaseColumn [ column . Name ] = databaseColumn ;
7474 }
75-
75+
7676 foreach ( var index in ydbTable . Indexes )
7777 {
7878 var databaseIndex = new DatabaseIndex
@@ -81,28 +81,30 @@ select ydbObject.Name
8181 Table = databaseTable ,
8282 IsUnique = index . Type == YdbTableIndex . IndexType . GlobalUniqueIndex
8383 } ;
84-
84+
8585 foreach ( var columnName in index . IndexColumns )
8686 {
8787 databaseIndex . Columns . Add ( columnNameToDatabaseColumn [ columnName ] ) ;
8888 databaseIndex . IsDescending . Add ( false ) ;
8989 }
90-
90+
9191 databaseTable . Indexes . Add ( databaseIndex ) ;
9292 }
93-
93+
9494 databaseTable . PrimaryKey = new DatabasePrimaryKey
9595 {
9696 Name = null // YDB does not have a primary key named
9797 } ;
98-
98+
9999 foreach ( var columnName in ydbTable . PrimaryKey )
100100 {
101101 databaseTable . PrimaryKey . Columns . Add ( columnNameToDatabaseColumn [ columnName ] ) ;
102102 }
103-
103+
104104 databaseModel . Tables . Add ( databaseTable ) ;
105105 }
106+
107+ return databaseModel ;
106108 }
107109 finally
108110 {
@@ -111,7 +113,5 @@ select ydbObject.Name
111113 ydbConnection . Close ( ) ;
112114 }
113115 }
114-
115- return databaseModel ;
116116 }
117117}
0 commit comments