Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OHRM-941:Integrate Doctrine 2.6 for i18n related entities #10

Draft
wants to merge 2 commits into
base: 4.6
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 7 additions & 43 deletions symfony/config/doctrine/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ EmpLocations:
primary: true
location_id as locationId:
type: integer
primary: true
primary: true

EmpChildren:
tableName: hs_hr_emp_children
Expand All @@ -25,8 +25,8 @@ EmpChildren:
Employee:
local: emp_number
foreign: emp_number
type: one
type: one

EmpWorkExperience:
tableName: hs_hr_emp_work_experience
columns:
Expand All @@ -47,7 +47,7 @@ EmpWorkExperience:
local: emp_number
foreign: emp_number
type: one

Country:
tableName: hs_hr_country
columns:
Expand All @@ -73,7 +73,7 @@ Country:
local: cou_code
foreign: country
type: many

UniqueId:
tableName: hs_hr_unique_id
columns:
Expand All @@ -92,27 +92,7 @@ UniqueId:
field_name:
type: string(50)
notnull: true

Country:
tableName: hs_hr_country
columns:
cou_code:
type: string(2)
fixed: true
primary: true
name:
type: string(80)
default: ''
notnull: true
cou_name:
type: string(80)
default: ''
notnull: true
iso3:
type: string(3)
fixed: true
numcode: integer(2)


Province:
tableName: hs_hr_province
columns:
Expand All @@ -134,7 +114,7 @@ Province:
fixed: true
default: us
notnull: true

EmployeeSkill:
tableName: hs_hr_emp_skill
columns:
Expand Down Expand Up @@ -200,20 +180,4 @@ Payperiod:
local: payperiod_code
foreign: payperiod_code
type: many

CurrencyType:
tableName: hs_hr_currency_type
columns:
code:
type: integer(4)
default: '0'
notnull: true
currency_id:
type: string(3)
fixed: true
primary: true
currency_name:
type: string(70)
default: ''
notnull: true

6 changes: 4 additions & 2 deletions symfony/lib/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"psr/log": "^1.0",
"google/apiclient": "^2.0",
"bjeavons/zxcvbn-php": "^0.3",
"bshaffer/oauth2-server-php": "^1.11"
"bshaffer/oauth2-server-php": "^1.11",
"doctrine/orm": "2.6"
},
"require-dev": {
"codeception/codeception": "^2.2",
Expand All @@ -45,7 +46,8 @@
},
"autoload": {
"psr-4": {
"Orangehrm\\Rest\\":"../plugins/orangehrmRESTPlugin/lib"
"Orangehrm\\Rest\\":"../plugins/orangehrmRESTPlugin/lib",
"":"model/doctrine2"
}
}
}
Loading