allow nulls in handsplayer fields so that stud can import (but most fields are missing)
This commit is contained in:
sqlcoder
parent
3b9fa3b177
commit
0756345f3e
217
pyfpdb/SQL.py
217
pyfpdb/SQL.py
|
|
@ -165,7 +165,6 @@ class Sql:
|
|||
################################
|
||||
# List tables
|
||||
################################
|
||||
print "db_server =", db_server
|
||||
if db_server == 'mysql':
|
||||
self.query['list_tables'] = """SHOW TABLES"""
|
||||
elif db_server == 'postgresql': # what is the correct value here?
|
||||
|
|
@ -495,82 +494,82 @@ class Sql:
|
|||
ante INT,
|
||||
winnings int NOT NULL,
|
||||
rake int NOT NULL,
|
||||
totalProfit INT NOT NULL,
|
||||
totalProfit INT,
|
||||
comment text,
|
||||
commentTs DATETIME,
|
||||
tourneysPlayersId BIGINT UNSIGNED,
|
||||
tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
|
||||
|
||||
wonWhenSeenStreet1 FLOAT NOT NULL,
|
||||
wonWhenSeenStreet1 FLOAT,
|
||||
wonWhenSeenStreet2 FLOAT,
|
||||
wonWhenSeenStreet3 FLOAT,
|
||||
wonWhenSeenStreet4 FLOAT,
|
||||
wonAtSD FLOAT NOT NULL,
|
||||
wonAtSD FLOAT,
|
||||
|
||||
street0VPI BOOLEAN NOT NULL,
|
||||
street0Aggr BOOLEAN NOT NULL,
|
||||
street0_3BChance BOOLEAN NOT NULL,
|
||||
street0_3BDone BOOLEAN NOT NULL,
|
||||
street0VPI BOOLEAN,
|
||||
street0Aggr BOOLEAN,
|
||||
street0_3BChance BOOLEAN,
|
||||
street0_3BDone BOOLEAN,
|
||||
street0_4BChance BOOLEAN,
|
||||
street0_4BDone BOOLEAN,
|
||||
other3BStreet0 BOOLEAN,
|
||||
other4BStreet0 BOOLEAN,
|
||||
|
||||
street1Seen BOOLEAN NOT NULL,
|
||||
street2Seen BOOLEAN NOT NULL,
|
||||
street3Seen BOOLEAN NOT NULL,
|
||||
street4Seen BOOLEAN NOT NULL,
|
||||
sawShowdown BOOLEAN NOT NULL,
|
||||
street1Seen BOOLEAN,
|
||||
street2Seen BOOLEAN,
|
||||
street3Seen BOOLEAN,
|
||||
street4Seen BOOLEAN,
|
||||
sawShowdown BOOLEAN,
|
||||
|
||||
street1Aggr BOOLEAN NOT NULL,
|
||||
street2Aggr BOOLEAN NOT NULL,
|
||||
street3Aggr BOOLEAN NOT NULL,
|
||||
street4Aggr BOOLEAN NOT NULL,
|
||||
street1Aggr BOOLEAN,
|
||||
street2Aggr BOOLEAN,
|
||||
street3Aggr BOOLEAN,
|
||||
street4Aggr BOOLEAN,
|
||||
|
||||
otherRaisedStreet0 BOOLEAN,
|
||||
otherRaisedStreet1 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet2 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet3 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet4 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet1 BOOLEAN,
|
||||
otherRaisedStreet2 BOOLEAN,
|
||||
otherRaisedStreet3 BOOLEAN,
|
||||
otherRaisedStreet4 BOOLEAN,
|
||||
foldToOtherRaisedStreet0 BOOLEAN,
|
||||
foldToOtherRaisedStreet1 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet2 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet3 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet4 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet1 BOOLEAN,
|
||||
foldToOtherRaisedStreet2 BOOLEAN,
|
||||
foldToOtherRaisedStreet3 BOOLEAN,
|
||||
foldToOtherRaisedStreet4 BOOLEAN,
|
||||
|
||||
stealAttemptChance BOOLEAN NOT NULL,
|
||||
stealAttempted BOOLEAN NOT NULL,
|
||||
foldBbToStealChance BOOLEAN NOT NULL,
|
||||
foldedBbToSteal BOOLEAN NOT NULL,
|
||||
foldSbToStealChance BOOLEAN NOT NULL,
|
||||
foldedSbToSteal BOOLEAN NOT NULL,
|
||||
stealAttemptChance BOOLEAN,
|
||||
stealAttempted BOOLEAN,
|
||||
foldBbToStealChance BOOLEAN,
|
||||
foldedBbToSteal BOOLEAN,
|
||||
foldSbToStealChance BOOLEAN,
|
||||
foldedSbToSteal BOOLEAN,
|
||||
|
||||
street1CBChance BOOLEAN NOT NULL,
|
||||
street1CBDone BOOLEAN NOT NULL,
|
||||
street2CBChance BOOLEAN NOT NULL,
|
||||
street2CBDone BOOLEAN NOT NULL,
|
||||
street3CBChance BOOLEAN NOT NULL,
|
||||
street3CBDone BOOLEAN NOT NULL,
|
||||
street4CBChance BOOLEAN NOT NULL,
|
||||
street4CBDone BOOLEAN NOT NULL,
|
||||
street1CBChance BOOLEAN,
|
||||
street1CBDone BOOLEAN,
|
||||
street2CBChance BOOLEAN,
|
||||
street2CBDone BOOLEAN,
|
||||
street3CBChance BOOLEAN,
|
||||
street3CBDone BOOLEAN,
|
||||
street4CBChance BOOLEAN,
|
||||
street4CBDone BOOLEAN,
|
||||
|
||||
foldToStreet1CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet1CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet2CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet2CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet3CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet3CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet4CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet4CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet1CBChance BOOLEAN,
|
||||
foldToStreet1CBDone BOOLEAN,
|
||||
foldToStreet2CBChance BOOLEAN,
|
||||
foldToStreet2CBDone BOOLEAN,
|
||||
foldToStreet3CBChance BOOLEAN,
|
||||
foldToStreet3CBDone BOOLEAN,
|
||||
foldToStreet4CBChance BOOLEAN,
|
||||
foldToStreet4CBDone BOOLEAN,
|
||||
|
||||
street1CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street1CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street2CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street2CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street3CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street3CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street4CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street4CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street1CheckCallRaiseChance BOOLEAN,
|
||||
street1CheckCallRaiseDone BOOLEAN,
|
||||
street2CheckCallRaiseChance BOOLEAN,
|
||||
street2CheckCallRaiseDone BOOLEAN,
|
||||
street3CheckCallRaiseChance BOOLEAN,
|
||||
street3CheckCallRaiseDone BOOLEAN,
|
||||
street4CheckCallRaiseChance BOOLEAN,
|
||||
street4CheckCallRaiseDone BOOLEAN,
|
||||
|
||||
street0Calls TINYINT,
|
||||
street1Calls TINYINT,
|
||||
|
|
@ -613,82 +612,82 @@ class Sql:
|
|||
ante INT,
|
||||
winnings int NOT NULL,
|
||||
rake int NOT NULL,
|
||||
totalProfit INT NOT NULL,
|
||||
totalProfit INT,
|
||||
comment text,
|
||||
commentTs timestamp without time zone,
|
||||
tourneysPlayersId BIGINT,
|
||||
tourneyTypeId INT NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
|
||||
|
||||
wonWhenSeenStreet1 FLOAT NOT NULL,
|
||||
wonWhenSeenStreet1 FLOAT,
|
||||
wonWhenSeenStreet2 FLOAT,
|
||||
wonWhenSeenStreet3 FLOAT,
|
||||
wonWhenSeenStreet4 FLOAT,
|
||||
wonAtSD FLOAT NOT NULL,
|
||||
wonAtSD FLOAT,
|
||||
|
||||
street0VPI BOOLEAN NOT NULL,
|
||||
street0Aggr BOOLEAN NOT NULL,
|
||||
street0_3BChance BOOLEAN NOT NULL,
|
||||
street0_3BDone BOOLEAN NOT NULL,
|
||||
street0VPI BOOLEAN,
|
||||
street0Aggr BOOLEAN,
|
||||
street0_3BChance BOOLEAN,
|
||||
street0_3BDone BOOLEAN,
|
||||
street0_4BChance BOOLEAN,
|
||||
street0_4BDone BOOLEAN,
|
||||
other3BStreet0 BOOLEAN,
|
||||
other4BStreet0 BOOLEAN,
|
||||
|
||||
street1Seen BOOLEAN NOT NULL,
|
||||
street2Seen BOOLEAN NOT NULL,
|
||||
street3Seen BOOLEAN NOT NULL,
|
||||
street4Seen BOOLEAN NOT NULL,
|
||||
sawShowdown BOOLEAN NOT NULL,
|
||||
street1Seen BOOLEAN,
|
||||
street2Seen BOOLEAN,
|
||||
street3Seen BOOLEAN,
|
||||
street4Seen BOOLEAN,
|
||||
sawShowdown BOOLEAN,
|
||||
|
||||
street1Aggr BOOLEAN NOT NULL,
|
||||
street2Aggr BOOLEAN NOT NULL,
|
||||
street3Aggr BOOLEAN NOT NULL,
|
||||
street4Aggr BOOLEAN NOT NULL,
|
||||
street1Aggr BOOLEAN,
|
||||
street2Aggr BOOLEAN,
|
||||
street3Aggr BOOLEAN,
|
||||
street4Aggr BOOLEAN,
|
||||
|
||||
otherRaisedStreet0 BOOLEAN,
|
||||
otherRaisedStreet1 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet2 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet3 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet4 BOOLEAN NOT NULL,
|
||||
otherRaisedStreet1 BOOLEAN,
|
||||
otherRaisedStreet2 BOOLEAN,
|
||||
otherRaisedStreet3 BOOLEAN,
|
||||
otherRaisedStreet4 BOOLEAN,
|
||||
foldToOtherRaisedStreet0 BOOLEAN,
|
||||
foldToOtherRaisedStreet1 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet2 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet3 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet4 BOOLEAN NOT NULL,
|
||||
foldToOtherRaisedStreet1 BOOLEAN,
|
||||
foldToOtherRaisedStreet2 BOOLEAN,
|
||||
foldToOtherRaisedStreet3 BOOLEAN,
|
||||
foldToOtherRaisedStreet4 BOOLEAN,
|
||||
|
||||
stealAttemptChance BOOLEAN NOT NULL,
|
||||
stealAttempted BOOLEAN NOT NULL,
|
||||
foldBbToStealChance BOOLEAN NOT NULL,
|
||||
foldedBbToSteal BOOLEAN NOT NULL,
|
||||
foldSbToStealChance BOOLEAN NOT NULL,
|
||||
foldedSbToSteal BOOLEAN NOT NULL,
|
||||
stealAttemptChance BOOLEAN,
|
||||
stealAttempted BOOLEAN,
|
||||
foldBbToStealChance BOOLEAN,
|
||||
foldedBbToSteal BOOLEAN,
|
||||
foldSbToStealChance BOOLEAN,
|
||||
foldedSbToSteal BOOLEAN,
|
||||
|
||||
street1CBChance BOOLEAN NOT NULL,
|
||||
street1CBDone BOOLEAN NOT NULL,
|
||||
street2CBChance BOOLEAN NOT NULL,
|
||||
street2CBDone BOOLEAN NOT NULL,
|
||||
street3CBChance BOOLEAN NOT NULL,
|
||||
street3CBDone BOOLEAN NOT NULL,
|
||||
street4CBChance BOOLEAN NOT NULL,
|
||||
street4CBDone BOOLEAN NOT NULL,
|
||||
street1CBChance BOOLEAN,
|
||||
street1CBDone BOOLEAN,
|
||||
street2CBChance BOOLEAN,
|
||||
street2CBDone BOOLEAN,
|
||||
street3CBChance BOOLEAN,
|
||||
street3CBDone BOOLEAN,
|
||||
street4CBChance BOOLEAN,
|
||||
street4CBDone BOOLEAN,
|
||||
|
||||
foldToStreet1CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet1CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet2CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet2CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet3CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet3CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet4CBChance BOOLEAN NOT NULL,
|
||||
foldToStreet4CBDone BOOLEAN NOT NULL,
|
||||
foldToStreet1CBChance BOOLEAN,
|
||||
foldToStreet1CBDone BOOLEAN,
|
||||
foldToStreet2CBChance BOOLEAN,
|
||||
foldToStreet2CBDone BOOLEAN,
|
||||
foldToStreet3CBChance BOOLEAN,
|
||||
foldToStreet3CBDone BOOLEAN,
|
||||
foldToStreet4CBChance BOOLEAN,
|
||||
foldToStreet4CBDone BOOLEAN,
|
||||
|
||||
street1CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street1CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street2CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street2CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street3CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street3CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street4CheckCallRaiseChance BOOLEAN NOT NULL,
|
||||
street4CheckCallRaiseDone BOOLEAN NOT NULL,
|
||||
street1CheckCallRaiseChance BOOLEAN,
|
||||
street1CheckCallRaiseDone BOOLEAN,
|
||||
street2CheckCallRaiseChance BOOLEAN,
|
||||
street2CheckCallRaiseDone BOOLEAN,
|
||||
street3CheckCallRaiseChance BOOLEAN,
|
||||
street3CheckCallRaiseDone BOOLEAN,
|
||||
street4CheckCallRaiseChance BOOLEAN,
|
||||
street4CheckCallRaiseDone BOOLEAN,
|
||||
|
||||
street0Calls SMALLINT,
|
||||
street1Calls SMALLINT,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user