Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 354765e

Browse files
skyhitskyhit
committed
merge with master
2 parents df292bf + a81d5d7 commit 354765e

File tree

5 files changed

+587
-13
lines changed

5 files changed

+587
-13
lines changed

‎db_scripts/test_eligibility.insert.sql

-12
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,6 @@ INSERT INTO project_info (project_id, project_info_type_id, value, create_user,
173173
VALUES (1110005, 26, "---", "132456", CURRENT, "132456", CURRENT);
174174

175175
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
176-
VALUES (1110001, 6, 3330333, "Not private", CURRENT, "132456", CURRENT);
177-
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
178-
VALUES (1110002, 6, 3330333, "Old logic - access allowed", CURRENT, "132456", CURRENT);
179-
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
180-
VALUES (1110003, 6, 3330333, "Old logic - access denied", CURRENT, "132456", CURRENT);
181-
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
182-
VALUES (1110004, 6, 3330333, "New logic - access allowed", CURRENT, "132456", CURRENT);
183-
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
184-
VALUES (1110005, 6, 3330333, "New logic - access denied", CURRENT, "132456", CURRENT);
185-
186-
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
187-
>>>>>>> upstream/dev
188176
VALUES (1110001, 79, "---", "132456", CURRENT, "132456", CURRENT);
189177
INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
190178
VALUES (1110002, 79, "---", "132456", CURRENT, "132456", CURRENT);

‎queries/check_is_related_with_challenge

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SELECT
44
FROM contest_eligibility ce
55
WHERE ce.contest_id = @challengeId@
66
) AS is_private
7-
, (SELECT
7+
, (SELECT
88
decode(max(ri.value), null, null, 1)
99
FROM resource r
1010
INNER JOIN resource_info ri ON ri.resource_id = r.resource_id AND ri.resource_info_type_id = 1

‎tc-api.iml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager">
4+
<content url="file://$MODULE_DIR$" />
5+
<orderEntry type="inheritedJdk" />
6+
<orderEntry type="sourceFolder" forTests="false" />
7+
<orderEntry type="library" name="tc-api node_modules" level="project" />
8+
</component>
9+
</module>

‎tc-api.ipr

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project version="4">
3+
<component name="CompilerConfiguration">
4+
<option name="DEFAULT_COMPILER" value="Javac" />
5+
<resourceExtensions />
6+
<wildcardResourcePatterns>
7+
<entry name="!?*.java" />
8+
<entry name="!?*.form" />
9+
<entry name="!?*.class" />
10+
<entry name="!?*.groovy" />
11+
<entry name="!?*.scala" />
12+
<entry name="!?*.flex" />
13+
<entry name="!?*.kt" />
14+
<entry name="!?*.clj" />
15+
</wildcardResourcePatterns>
16+
<annotationProcessing>
17+
<profile default="true" name="Default" enabled="false">
18+
<processorPath useClasspath="true" />
19+
</profile>
20+
</annotationProcessing>
21+
</component>
22+
<component name="CopyrightManager" default="" />
23+
<component name="JavaScriptLibraryMappings">
24+
<file url="file://$PROJECT_DIR$" libraries="{tc-api node_modules}" />
25+
</component>
26+
<component name="MavenImportPreferences">
27+
<option name="generalSettings">
28+
<MavenGeneralSettings>
29+
<option name="mavenHome" value="Bundled (Maven 3)" />
30+
</MavenGeneralSettings>
31+
</option>
32+
</component>
33+
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
34+
<OptionsSetting value="true" id="Add" />
35+
<OptionsSetting value="true" id="Remove" />
36+
<OptionsSetting value="true" id="Checkout" />
37+
<OptionsSetting value="true" id="Update" />
38+
<OptionsSetting value="true" id="Status" />
39+
<OptionsSetting value="true" id="Edit" />
40+
<ConfirmationsSetting value="0" id="Add" />
41+
<ConfirmationsSetting value="0" id="Remove" />
42+
</component>
43+
<component name="ProjectModuleManager">
44+
<modules>
45+
<module fileurl="file://$PROJECT_DIR$/tc-api.iml" filepath="$PROJECT_DIR$/tc-api.iml" />
46+
</modules>
47+
</component>
48+
<component name="ProjectRootManager" version="2" />
49+
<component name="VcsDirectoryMappings">
50+
<mapping directory="" vcs="Git" />
51+
</component>
52+
<component name="libraryTable">
53+
<library name="tc-api node_modules" type="javaScript">
54+
<properties>
55+
<option name="frameworkName" value="node_modules" />
56+
<sourceFilesUrls>
57+
<item url="file://$PROJECT_DIR$/node_modules" />
58+
</sourceFilesUrls>
59+
</properties>
60+
<CLASSES>
61+
<root url="file://$PROJECT_DIR$/node_modules" />
62+
</CLASSES>
63+
<SOURCES />
64+
</library>
65+
</component>
66+
<component name="masterDetails">
67+
<states>
68+
<state key="ProjectJDKs.UI">
69+
<settings>
70+
<last-edited>1.8</last-edited>
71+
<splitter-proportions>
72+
<option name="proportions">
73+
<list>
74+
<option value="0.2" />
75+
</list>
76+
</option>
77+
</splitter-proportions>
78+
</settings>
79+
</state>
80+
</states>
81+
</component>
82+
</project>

0 commit comments

Comments
 (0)