Skip to content

Commit b6baf30

Browse files
smakarovsmakarov
committed
test comment
1 parent f7b31b5 commit b6baf30

15 files changed

+516
-102
lines changed

‎_build/resolvers/resolve.tables.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
$modx->addPackage('sendex', $modelPath);
1414

1515
$manager = $modx->getManager();
16-
$objects = array();
16+
$objects = array(
17+
'sxNewsletter',
18+
'sxSubscriber',
19+
'sxQueue'
20+
);
1721
$schemaFile = MODX_CORE_PATH . 'components/sendex/model/schema/sendex.mysql.schema.xml';
1822
if (is_file($schemaFile)) {
1923
$schema = new SimpleXMLElement($schemaFile, 0, true);

‎core/components/sendex/model/schema/sendex.mysql.schema.xml

+63-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,73 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model package="sendex" baseClass="xPDOObject" platform="mysql" defaultEngine="MyISAM" phpdoc-package="sendex"
3-
version="1.1">
2+
<model package="sendex" baseClass="xPDOObject" platform="mysql" defaultEngine="MyISAM" phpdoc-package="sendex" version="1.1">
43

5-
<object class="SendexItem" table="sendex_items" extends="xPDOSimpleObject">
6-
<field key="name" dbtype="varchar" precision="100" phptype="string" null="false" default=""/>
7-
<field key="description" dbtype="text" phptype="text" null="true" default=""/>
8-
<field key="active" dbtype="tinyint" precision="1" phptype="boolean" null="true" default="1"/>
4+
<object class="sxNewsletter" table="sendex_newsletters" extends="xPDOSimpleObject">
5+
<field key="name" dbtype="varchar" precision="100" phptype="string" null="false" default="" />
6+
<field key="description" dbtype="text" phptype="text" null="true" default="" />
7+
<field key="active" dbtype="tinyint" precision="1" phptype="boolean" attributes="unsigned" null="true" default="1" />
8+
9+
<field key="template" dbtype="integer" precision="10" attributes="unsigned" phptype="integer" null="true" default="0" />
10+
<field key="snippet" dbtype="integer" precision="10" attributes="unsigned" phptype="integer" null="true" default="0" />
11+
<field key="image" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
12+
13+
<field key="email_subject" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
14+
<field key="email_from" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
15+
<field key="email_from_name" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
16+
<field key="email_reply" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
917

1018
<index alias="name" name="name" primary="false" unique="false" type="BTREE">
11-
<column key="name" length="" collation="A" null="false"/>
19+
<column key="name" length="" collation="A" null="false" />
1220
</index>
1321
<index alias="active" name="active" primary="false" unique="false" type="BTREE">
14-
<column key="active" length="" collation="A" null="false"/>
22+
<column key="active" length="" collation="A" null="false" />
23+
</index>
24+
25+
<composite alias="Subscribers" class="sxSubscriber" local="id" foreign="newsletter_id" cardinality="many" owner="local" />
26+
<aggregate alias="Template" class="modTemplate" local="template" foreign="id" cardinality="one" owner="foreign" />
27+
<aggregate alias="Snippet" class="modSnippet" local="snippet" foreign="id" cardinality="one" owner="foreign" />
28+
</object>
29+
30+
31+
<object class="sxSubscriber" table="sendex_subscribers" extends="xPDOSimpleObject">
32+
<field key="newsletter_id" dbtype="int" precision="10" phptype="integer" attributes="unsigned" null="false" default="0" />
33+
<field key="user_id" dbtype="int" precision="10" phptype="integer" attributes="unsigned" null="true" default="0" />
34+
<field key="email" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
35+
36+
<index alias="key" name="key" primary="false" unique="true" type="BTREE">
37+
<column key="newsletter_id" length="" collation="A" null="false" />
38+
<column key="user_id" length="" collation="A" null="false" />
39+
<column key="email" length="" collation="A" null="false" />
40+
</index>
41+
42+
<aggregate alias="Newsletter" class="sxNewsletter" local="newsletter_id" foreign="id" cardinality="one" owner="foreign" />
43+
<aggregate alias="User" class="modUser" local="user_id" foreign="id" cardinality="one" owner="foreign" />
44+
</object>
45+
46+
47+
<object class="sxQueue" table="sendex_queue" extends="xPDOSimpleObject">
48+
<field key="newsletter_id" dbtype="int" precision="10" phptype="integer" attributes="unsigned" null="false" default="0" />
49+
<field key="subscriber_id" dbtype="int" precision="10" phptype="integer" attributes="unsigned" null="true" default="0" />
50+
<field key="timestamp" dbtype="timestamp" phptype="timestamp" null="false" default="CURRENT_TIMESTAMP" />
51+
52+
<field key="email_to" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
53+
<field key="email_subject" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
54+
<field key="email_body" dbtype="text" phptype="string" null="true" default="" />
55+
<field key="email_from" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
56+
<field key="email_from_name" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
57+
<field key="email_reply" dbtype="varchar" precision="255" phptype="string" null="true" default="" />
58+
59+
<index alias="newsletter_id" name="newsletter_id" primary="false" unique="false" type="BTREE">
60+
<column key="newsletter_id" length="" collation="A" null="false" />
61+
</index>
62+
<index alias="user_id" name="user_id" primary="false" unique="false" type="BTREE">
63+
<column key="user_id" length="" collation="A" null="false" />
1564
</index>
65+
<index alias="timestamp" name="timestamp" primary="false" unique="false" type="BTREE">
66+
<column key="timestamp" length="" collation="A" null="false" />
67+
</index>
68+
69+
<aggregate alias="Newsletter" class="sxNewsletter" local="newsletter_id" foreign="id" cardinality="one" owner="foreign" />
70+
<aggregate alias="Subscriber" class="sxSubscriber" local="subscriber_id" foreign="id" cardinality="one" owner="foreign" />
1671
</object>
1772

1873
</model>

‎core/components/sendex/model/sendex/metadata.mysql.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
22

3-
$xpdo_meta_map = array(
4-
'xPDOSimpleObject' =>
5-
array(
6-
0 => 'SendexItem',
7-
),
3+
$xpdo_meta_map = array (
4+
'xPDOSimpleObject' =>
5+
array (
6+
0 => 'sxNewsletter',
7+
1 => 'sxSubscriber',
8+
2 => 'sxQueue',
9+
),
810
);

‎core/components/sendex/model/sendex/mysql/sendexitem.class.php

-6
This file was deleted.

‎core/components/sendex/model/sendex/mysql/sendexitem.map.inc.php

-74
This file was deleted.

‎core/components/sendex/model/sendex/mysql/sxnewsletter.class.php

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
require_once (dirname(dirname(__FILE__)) . '/sxnewsletter.class.php');
3+
class sxNewsletter_mysql extends sxNewsletter {}

‎core/components/sendex/model/sendex/mysql/sxnewsletter.map.inc.php

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<?php
2+
$xpdo_meta_map['sxNewsletter']= array (
3+
'package' => 'sendex',
4+
'version' => '1.1',
5+
'table' => 'sendex_newsletters',
6+
'extends' => 'xPDOSimpleObject',
7+
'fields' =>
8+
array (
9+
'name' => '',
10+
'description' => '',
11+
'active' => 1,
12+
'template' => 0,
13+
'snippet' => 0,
14+
'image' => '',
15+
'email_subject' => '',
16+
'email_from' => '',
17+
'email_from_name' => '',
18+
'email_reply' => '',
19+
),
20+
'fieldMeta' =>
21+
array (
22+
'name' =>
23+
array (
24+
'dbtype' => 'varchar',
25+
'precision' => '100',
26+
'phptype' => 'string',
27+
'null' => false,
28+
'default' => '',
29+
),
30+
'description' =>
31+
array (
32+
'dbtype' => 'text',
33+
'phptype' => 'text',
34+
'null' => true,
35+
'default' => '',
36+
),
37+
'active' =>
38+
array (
39+
'dbtype' => 'tinyint',
40+
'precision' => '1',
41+
'phptype' => 'boolean',
42+
'attributes' => 'unsigned',
43+
'null' => true,
44+
'default' => 1,
45+
),
46+
'template' =>
47+
array (
48+
'dbtype' => 'integer',
49+
'precision' => '10',
50+
'attributes' => 'unsigned',
51+
'phptype' => 'integer',
52+
'null' => true,
53+
'default' => 0,
54+
),
55+
'snippet' =>
56+
array (
57+
'dbtype' => 'integer',
58+
'precision' => '10',
59+
'attributes' => 'unsigned',
60+
'phptype' => 'integer',
61+
'null' => true,
62+
'default' => 0,
63+
),
64+
'image' =>
65+
array (
66+
'dbtype' => 'varchar',
67+
'precision' => '255',
68+
'phptype' => 'string',
69+
'null' => true,
70+
'default' => '',
71+
),
72+
'email_subject' =>
73+
array (
74+
'dbtype' => 'varchar',
75+
'precision' => '255',
76+
'phptype' => 'string',
77+
'null' => true,
78+
'default' => '',
79+
),
80+
'email_from' =>
81+
array (
82+
'dbtype' => 'varchar',
83+
'precision' => '255',
84+
'phptype' => 'string',
85+
'null' => true,
86+
'default' => '',
87+
),
88+
'email_from_name' =>
89+
array (
90+
'dbtype' => 'varchar',
91+
'precision' => '255',
92+
'phptype' => 'string',
93+
'null' => true,
94+
'default' => '',
95+
),
96+
'email_reply' =>
97+
array (
98+
'dbtype' => 'varchar',
99+
'precision' => '255',
100+
'phptype' => 'string',
101+
'null' => true,
102+
'default' => '',
103+
),
104+
),
105+
'indexes' =>
106+
array (
107+
'name' =>
108+
array (
109+
'alias' => 'name',
110+
'primary' => false,
111+
'unique' => false,
112+
'type' => 'BTREE',
113+
'columns' =>
114+
array (
115+
'name' =>
116+
array (
117+
'length' => '',
118+
'collation' => 'A',
119+
'null' => false,
120+
),
121+
),
122+
),
123+
'active' =>
124+
array (
125+
'alias' => 'active',
126+
'primary' => false,
127+
'unique' => false,
128+
'type' => 'BTREE',
129+
'columns' =>
130+
array (
131+
'active' =>
132+
array (
133+
'length' => '',
134+
'collation' => 'A',
135+
'null' => false,
136+
),
137+
),
138+
),
139+
),
140+
'composites' =>
141+
array (
142+
'Subscribers' =>
143+
array (
144+
'class' => 'sxSubscriber',
145+
'local' => 'id',
146+
'foreign' => 'newsletter_id',
147+
'cardinality' => 'many',
148+
'owner' => 'local',
149+
),
150+
),
151+
'aggregates' =>
152+
array (
153+
'Template' =>
154+
array (
155+
'class' => 'modTemplate',
156+
'local' => 'template',
157+
'foreign' => 'id',
158+
'cardinality' => 'one',
159+
'owner' => 'foreign',
160+
),
161+
'Snippet' =>
162+
array (
163+
'class' => 'modSnippet',
164+
'local' => 'snippet',
165+
'foreign' => 'id',
166+
'cardinality' => 'one',
167+
'owner' => 'foreign',
168+
),
169+
),
170+
);

‎core/components/sendex/model/sendex/mysql/sxqueue.class.php

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
require_once (dirname(dirname(__FILE__)) . '/sxqueue.class.php');
3+
class sxQueue_mysql extends sxQueue {}

0 commit comments

Comments
 (0)