@@ -273,7 +273,7 @@ export class SqlSimpleParser {
273
273
) ;
274
274
275
275
//Add Primary Key to List
276
- this . primaryKeyList . push ( primaryKeyModel ) ;
276
+ this . primaryKeyList = this . primaryKeyList . concat ( primaryKeyModel ) ;
277
277
}
278
278
} else {
279
279
//Parse Primary Key
@@ -293,7 +293,7 @@ export class SqlSimpleParser {
293
293
) ;
294
294
295
295
//Add Primary Key to List
296
- this . primaryKeyList . push ( primaryKeyModel ) ;
296
+ this . primaryKeyList = this . primaryKeyList . concat ( primaryKeyModel ) ;
297
297
} else {
298
298
// let start = i + 2;
299
299
// let end = 0;
@@ -312,7 +312,7 @@ export class SqlSimpleParser {
312
312
) ;
313
313
314
314
//Add Primary Key to List
315
- this . primaryKeyList . push ( primaryKeyModel ) ;
315
+ this . primaryKeyList = this . primaryKeyList . concat ( primaryKeyModel ) ;
316
316
} else {
317
317
const startIndex = name . toLocaleLowerCase ( ) . indexOf ( "(" ) ;
318
318
const endIndex = name . indexOf ( ")" ) + 1 ;
@@ -343,7 +343,7 @@ export class SqlSimpleParser {
343
343
) ;
344
344
345
345
//Add Primary Key to List
346
- this . primaryKeyList . push ( primaryKeyModel ) ;
346
+ this . primaryKeyList = this . primaryKeyList . concat ( primaryKeyModel ) ;
347
347
/*
348
348
while (end === 0) {
349
349
let primaryKeyRow = lines[start].trim();
@@ -503,13 +503,22 @@ export class SqlSimpleParser {
503
503
private CreatePrimaryKey (
504
504
primaryKeyName : string ,
505
505
primaryKeyTableName : string
506
- ) {
507
- const primaryKey : PrimaryKeyModel = {
508
- PrimaryKeyTableName : primaryKeyTableName ,
509
- PrimaryKeyName : this . RemoveNameQuantifiers ( primaryKeyName ) ,
510
- } ;
506
+ ) :PrimaryKeyModel [ ] {
507
+ const primaryKeyNames = this . RemoveNameQuantifiers ( primaryKeyName )
508
+ . split ( "," )
509
+ . filter ( ( n ) => n )
510
+ // remove multiple spaces
511
+ . map ( ( n ) => n . replace ( / \s + / g, " " ) . trim ( ) ) ;
512
+ const primaryKeys :PrimaryKeyModel [ ] = [ ] ;
513
+ primaryKeyNames . forEach ( name => {
514
+ const primaryKey : PrimaryKeyModel = {
515
+ PrimaryKeyTableName : primaryKeyTableName ,
516
+ PrimaryKeyName : name ,
517
+ } ;
518
+ primaryKeys . push ( primaryKey ) ;
519
+ } ) ;
511
520
512
- return primaryKey ;
521
+ return primaryKeys ;
513
522
}
514
523
515
524
private CreateProperty (
0 commit comments