updated ZaliczkiNajemcow reinstall

SE/se-lib/Core/Pdo.php

@@ -162,7 +162,7 @@ class Core_Pdo extends PDO {
 	}
 
 	/* assert's that field struct has defined or throw exception if cannot set default value:
-			['type'] = 'int', 'varchar', ... (MySQL Types)
+			['type'] = 'varchar', 'int', ... (MySQL Types)
 			['is_nullable'] = true, false
 			['default_value'] = NULL or (string, numeric - based on type)
 			  default_value is not set when default_value == NULL and is_nullable == false
@@ -397,6 +397,10 @@ EOF_STRUCT_MYSQL;
 				$keyFieldsSql = "`" . implode("`,`", $fld['key_fields']) . "`";
 				return "KEY `{$fldName}` ({$keyFieldsSql})";
 				break;
+			case 'PRIMARY KEY':
+				$keyFieldsSql = "`" . implode("`,`", $fld['key_fields']) . "`";
+				return "PRIMARY KEY ({$keyFieldsSql})";
+				break;
 		}
 		return null;
 	}

SE/se-lib/Route/ZaliczkiNajemcow.php

@@ -329,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `ZALICZKI_NAJEMCOW_HIST` (
   `ID_BILLING_USERS` varchar(11) NOT NULL DEFAULT 'N/S;',
   `NAJEMCA` varchar(255) NOT NULL DEFAULT 'N/S;',
   `T_TELBOX_NEIGHBOUR_IN` varchar(32) NOT NULL DEFAULT 'N/S;',
-  `NR_LOKALU` varchar(255) NOT NULL DEFAULT 'N/S;',
+  `NR_LOKALU` varchar(32) NOT NULL DEFAULT 'N/S;',
   `ROK` varchar(5) NOT NULL DEFAULT 'N/S;',
   `CZY_ROZLICZENIE` varchar(10) NOT NULL DEFAULT 'N/S;',
   `POW_CALK` varchar(11) NOT NULL DEFAULT 'N/S;',
@@ -374,10 +374,10 @@ EOF_SQL_HIST_CREATE;
 		$sqlCreate = <<<EOF_SQL_CREATE
 CREATE TABLE IF NOT EXISTS `ZALICZKI_NAJEMCOW` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `ID_BILLING_USERS` int(11) NOT NULL,
+  `ID_BILLING_USERS` int(11) NOT NULL DEFAULT 0,
   `NAJEMCA` varchar(255) NOT NULL DEFAULT '',
   `T_TELBOX_NEIGHBOUR_IN` varchar(32) NOT NULL DEFAULT '',
-  `NR_LOKALU` varchar(255) NOT NULL DEFAULT '',
+  `NR_LOKALU` varchar(32) NOT NULL DEFAULT '',
   `ROK` int(4) NOT NULL,
   `CZY_ROZLICZENIE` enum('TAK','NIE') NOT NULL DEFAULT 'NIE',
   `POW_CALK` double NOT NULL,
@@ -433,56 +433,58 @@ EOF_SQL_CREATE;
 			$pdo->exec($sqlHistCreate);
 			$pdo->exec($sqlCreate);
 		}
-		if(0){// TODO: assertTableStruct ZALICZKI_NAJEMCOW
+		if(1){// TODO: assertTableStruct ZALICZKI_NAJEMCOW
 			$expectedStruct = array();
 			$expectedStruct['ID'] = array('type'=>'int', 'extra'=>'AUTO_INCREMENT');// `ID` int(11) NOT NULL AUTO_INCREMENT,
-			$expectedStruct['ID_BILLING_USERS'] = array('type'=>'int');// `ID_BILLING_USERS` int(11) NOT NULL,
-			$expectedStruct['NAJEMCA'] = array('type'=>'varchar', 'max_length'=>'255', 'default'=>'');// `NAJEMCA` varchar(255) NOT NULL DEFAULT '',
-			$expectedStruct['T_TELBOX_NEIGHBOUR_IN'] = array('type'=>'varchar');// `T_TELBOX_NEIGHBOUR_IN` varchar(32) NOT NULL DEFAULT '',
-			$expectedStruct['NR_LOKALU'] = array('type'=>'varchar');// `NR_LOKALU` varchar(255) NOT NULL DEFAULT '',
-			$expectedStruct['ROK'] = array('type'=>'varchar');// `ROK` int(4) NOT NULL,
-			$expectedStruct['CZY_ROZLICZENIE'] = array('type'=>'varchar');// `CZY_ROZLICZENIE` enum('TAK','NIE') NOT NULL DEFAULT 'NIE',
-			$expectedStruct['POW_CALK'] = array('type'=>'varchar');// `POW_CALK` double NOT NULL,
-			$expectedStruct['POW_LOKALU'] = array('type'=>'varchar');// `POW_LOKALU` double NOT NULL,
-			$expectedStruct['KOSZT_OD'] = array('type'=>'varchar');// `KOSZT_OD` datetime NOT NULL,
-			$expectedStruct['KOSZT_DO'] = array('type'=>'varchar');// `KOSZT_DO` datetime NOT NULL,
-			$expectedStruct['m01'] = array('type'=>'varchar');// `m01` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m02'] = array('type'=>'varchar');// `m02` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m03'] = array('type'=>'varchar');// `m03` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m04'] = array('type'=>'varchar');// `m04` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m05'] = array('type'=>'varchar');// `m05` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m06'] = array('type'=>'varchar');// `m06` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m07'] = array('type'=>'varchar');// `m07` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m08'] = array('type'=>'varchar');// `m08` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m09'] = array('type'=>'varchar');// `m09` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m10'] = array('type'=>'varchar');// `m10` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m11'] = array('type'=>'varchar');// `m11` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['m12'] = array('type'=>'varchar');// `m12` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c01'] = array('type'=>'varchar');// `c01` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c02'] = array('type'=>'varchar');// `c02` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c03'] = array('type'=>'varchar');// `c03` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c04'] = array('type'=>'varchar');// `c04` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c05'] = array('type'=>'varchar');// `c05` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c06'] = array('type'=>'varchar');// `c06` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c07'] = array('type'=>'varchar');// `c07` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c08'] = array('type'=>'varchar');// `c08` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c09'] = array('type'=>'varchar');// `c09` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c10'] = array('type'=>'varchar');// `c10` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c11'] = array('type'=>'varchar');// `c11` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['c12'] = array('type'=>'varchar');// `c12` decimal(16,2) NOT NULL DEFAULT 0,
-			$expectedStruct['A_RECORD_CREATE_DATE'] = array('type'=>'varchar');// `A_RECORD_CREATE_DATE` varchar(30) NOT NULL,
+			$expectedStruct['ID_BILLING_USERS'] = array('type'=>'int', 'default_value'=>0);// `ID_BILLING_USERS` int(11) NOT NULL DEFAULT 0,
+			$expectedStruct['NAJEMCA'] = array('type'=>'varchar', 'max_length'=>'255', 'default_value'=>'');// `NAJEMCA` varchar(255) NOT NULL DEFAULT '',
+			$expectedStruct['T_TELBOX_NEIGHBOUR_IN'] = array('type'=>'varchar', 'max_length'=>'32', 'default_value'=>'');// `T_TELBOX_NEIGHBOUR_IN` varchar(32) NOT NULL DEFAULT '',
+			$expectedStruct['NR_LOKALU'] = array('type'=>'varchar', 'max_length'=>'32', 'default_value'=>'');// `NR_LOKALU` varchar(255) NOT NULL DEFAULT '',
+			$expectedStruct['ROK'] = array('type'=>'int');// `ROK` int(4) NOT NULL,
+			$expectedStruct['CZY_ROZLICZENIE'] = array('type'=>'enum', 'values'=>array('TAK','NIE'), 'default_value'=>'NIE');// `CZY_ROZLICZENIE` enum('TAK','NIE') NOT NULL DEFAULT 'NIE',
+			$expectedStruct['POW_CALK'] = array('type'=>'double');// `POW_CALK` double NOT NULL,
+			$expectedStruct['POW_LOKALU'] = array('type'=>'double');// `POW_LOKALU` double NOT NULL,
+			$expectedStruct['KOSZT_OD'] = array('type'=>'date');// `KOSZT_OD` datetime NOT NULL,
+			$expectedStruct['KOSZT_DO'] = array('type'=>'date');// `KOSZT_DO` datetime NOT NULL,
+			$expectedStruct['m01'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m01` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m02'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m02` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m03'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m03` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m04'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m04` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m05'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m05` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m06'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m06` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m07'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m07` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m08'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m08` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m09'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m09` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m10'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m10` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m11'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m11` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['m12'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `m12` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c01'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c01` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c02'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c02` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c03'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c03` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c04'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c04` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c05'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c05` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c06'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c06` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c07'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c07` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c08'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c08` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c09'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c09` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c10'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c10` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c11'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c11` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['c12'] = array('type'=>'decimal', 'num_precision'=>16, 'num_scale'=>2);// `c12` decimal(16,2) NOT NULL DEFAULT 0,
+			$expectedStruct['A_RECORD_CREATE_DATE'] = array('type'=>'datetime');// `A_RECORD_CREATE_DATE` varchar(30) NOT NULL,
 			$expectedStruct['A_RECORD_CREATE_AUTHOR'] = array('type'=>'varchar');// `A_RECORD_CREATE_AUTHOR` varchar(40) NOT NULL,
-			$expectedStruct['A_RECORD_UPDATE_DATE'] = array('type'=>'varchar');// `A_RECORD_UPDATE_DATE` varchar(30) NOT NULL,
+			$expectedStruct['A_RECORD_UPDATE_DATE'] = array('type'=>'datetime');// `A_RECORD_UPDATE_DATE` varchar(30) NOT NULL,
 			$expectedStruct['A_RECORD_UPDATE_AUTHOR'] = array('type'=>'varchar');// `A_RECORD_UPDATE_AUTHOR` varchar(40) NOT NULL,
-			$expectedStruct['A_STATUS'] = array('type'=>'varchar');// `A_STATUS` enum('WAITING','NORMAL','MONITOR','WARNING','OFF_SOFT','OFF_HARD','DELETED') NOT NULL DEFAULT 'WAITING',
+			$expectedStruct['A_STATUS'] = array('type'=>'enum', 'values'=>array('WAITING','NORMAL','MONITOR','WARNING','OFF_SOFT','OFF_HARD','DELETED'), 'default_value'=>'WAITING');// `A_STATUS` enum('WAITING','NORMAL','MONITOR','WARNING','OFF_SOFT','OFF_HARD','DELETED') NOT NULL DEFAULT 'WAITING',
 			$expectedStruct['A_CLASSIFIED'] = array('type'=>'varchar');// `A_CLASSIFIED` varchar(100) NOT NULL,
 			$expectedStruct['A_ADM_COMPANY'] = array('type'=>'varchar');// `A_ADM_COMPANY` varchar(100) NOT NULL,
-			$expectedStruct['key_id'] = array('type'=>'PRIMARY KEY');// PRIMARY KEY (`ID`)
+			$expectedStruct['key_id'] = array('type'=>'PRIMARY KEY', 'key_fields'=>array('ID'));// PRIMARY KEY (`ID`)
 
 			DBG::_(true, true, "sqlCreate - raw", $sqlCreate, __CLASS__, __FUNCTION__, __LINE__);
 			$sqlCreate = $pdo->showCreateStruct('ZALICZKI_NAJEMCOW', $expectedStruct, array('char_encoding'=>'latin2'));
 			DBG::_(true, true, "sqlCreate - generated", $sqlCreate, __CLASS__, __FUNCTION__, __LINE__);
-			$pdo->assertTableStruct('ZALICZKI_NAJEMCOW', $expectedStruct, array('char_encoding'=>'latin2'));
+			if(0){
+				$pdo->assertTableStruct('ZALICZKI_NAJEMCOW', $expectedStruct, array('char_encoding'=>'latin2'));
+			}
 			if(0){// force - drop/create
 				$pdo->exec("DROP TABLE IF EXISTS ZALICZKI_NAJEMCOW");
 				$pdo->exec($sqlCreate);